Kenji Okimoto
null+****@clear*****
Fri Mar 31 13:49:39 JST 2017
Kenji Okimoto 2017-03-31 13:49:39 +0900 (Fri, 31 Mar 2017) New Revision: 49b170c7621c1c77115224d7a69ab5d1464687a2 https://github.com/milter-manager/milter-manager/commit/49b170c7621c1c77115224d7a69ab5d1464687a2 Message: Drop Ubuntu 12.04 LTS (Precise Pangolin) support Modified files: doc/install-to-ubuntu.rd doc/install-to-ubuntu.rd.ja package/apt/build-in-clean-room.sh package/ubuntu/Makefile.am Modified: doc/install-to-ubuntu.rd (+0 -1) =================================================================== --- doc/install-to-ubuntu.rd 2017-02-24 17:05:20 +0900 (780f026) +++ doc/install-to-ubuntu.rd 2017-03-31 13:49:39 +0900 (1d7b742) @@ -26,7 +26,6 @@ install milter manager by APT from the PPA. Here are supported Ubuntu versions: - * 12.04 LTS Precise Pangolin * 14.04 LTS Trusty Tahr * 16.04 LTS Xenial Xerus * 16.10 Yakkety Yak Modified: doc/install-to-ubuntu.rd.ja (+0 -1) =================================================================== --- doc/install-to-ubuntu.rd.ja 2017-02-24 17:05:20 +0900 (b045fde) +++ doc/install-to-ubuntu.rd.ja 2017-03-31 13:49:39 +0900 (1ec6b4c) @@ -25,7 +25,6 @@ Ubuntu向けのmilter managerのAPTリポジトリは サポートしているUbuntuのバージョン: - * 12.04 LTS Precise Pangolin * 14.04 LTS Trusty Tahr * 16.04 LTS Xenial Xerus * 16.10 Yakkety Yak Modified: package/apt/build-in-clean-room.sh (+1 -20) =================================================================== --- package/apt/build-in-clean-room.sh 2017-02-24 17:05:20 +0900 (ebd32c7) +++ package/apt/build-in-clean-room.sh 2017-03-31 13:49:39 +0900 (e84980f) @@ -68,7 +68,7 @@ build_by_pbuilder() OPTS+=( --basetgz "$basetgz" ) OPTS+=( --aptcache "$aptcache_dir" ) case $code_name in - precise|trusty|xenial|yakkety) + trusty|xenial|yakkety) OPTS+=( --components 'main universe' ) MIRROR=http://jp.archive.ubuntu.com/ubuntu OPTS+=( --mirror "$MIRROR" ) @@ -100,25 +100,6 @@ build_by_pbuilder() ) run cp -rp ${source_dir}/package/debian $builddir/${PACKAGE}-${VERSION}/ - case $code_name in - precise) - sed -i \ - -e 's/ruby (>= 1:1.9.3)/ruby1.9.1 (>= 1.9.1)/g' \ - -e 's/ruby-dev (>= 1:1.9.3)/ruby1.9.1-dev (>= 1.9.1)/g' \ - -e '/ruby-gnome2-dev/d' \ - -e '/ruby-glib2/d' \ - -e '/dh-systemd/d' \ - $builddir/${PACKAGE}-${VERSION}/debian/control - sed -i \ - -e '/--enable-ruby-milter/i \\t\t--with-ruby=/usr/bin/ruby1.9.1 \\' \ - -e 's/ruby -rrbconfig/ruby1.9.1 -rrbconfig/g' \ - -e 's/ --with=systemd//' \ - $builddir/${PACKAGE}-${VERSION}/debian/rules - sed -i -e 's,^# ,,' $builddir/${PACKAGE}-${VERSION}/debian/ruby-milter-core.install - ;; - *) - ;; - esac ( cd $builddir/${PACKAGE}-${VERSION} && \ run_sudo pdebuild \ --pbuilder pbuilder --buildresult ../../${pool_dir}/ \ Modified: package/ubuntu/Makefile.am (+0 -26) =================================================================== --- package/ubuntu/Makefile.am 2017-02-24 17:05:20 +0900 (d6638ef) +++ package/ubuntu/Makefile.am 2017-03-31 13:49:39 +0900 (0aa7796) @@ -18,32 +18,6 @@ upload: source ensure-launchpad-configuration --debian-directory '$(srcdir)/../debian/' \ --pgp-sign-key '$(LAUNCHPAD_UPLOADER_PGP_KEY)' -upload: upload-precise -upload-precise: source ensure-launchpad-configuration - rm -rf precise - mkdir -p precise - cp -r '$(srcdir)/../debian/' precise/ - sed -i \ - -e 's/ruby (>= 1:1.9.3)/ruby1.9.1 (>= 1.9.1)/g' \ - -e 's/ruby-dev (>= 1:1.9.3)/ruby1.9.1-dev (>= 1.9.1)/g' \ - -e '/ruby-gnome2-dev/d' \ - -e '/ruby-glib2/d' \ - -e '/dh-systemd/d' \ - precise/debian/control - sed -i \ - -e '/--enable-ruby-milter/i \\t\t--with-ruby=/usr/bin/ruby1.9.1 \\' \ - -e 's/ruby -rrbconfig/ruby1.9.1 -rrbconfig/g' \ - -e 's/ --with=systemd//' \ - precise/debian/rules - sed -i -e 's,^# ,,' precise/debian/ruby-milter-core.install - ./upload.rb \ - --package '$(PACKAGE)' \ - --version '$(VERSION)' \ - --source-archive '$(SOURCE)' \ - --code-names 'precise' \ - --debian-directory 'precise/debian' \ - --pgp-sign-key '$(LAUNCHPAD_UPLOADER_PGP_KEY)' - source: $(SOURCE) $(SOURCE): -------------- next part -------------- An HTML attachment was scrubbed...ダウンロード
