Groonga 9.0.1がリリースされたのでパッケージの更新を実施。
gbp import-orig --uscanでdebian/unstableブランチにインポートする。
% gbp import-orig --uscan gbp:info: Launching uscan... gpgv: 2019年03月28日 17時41分27秒 JSTに施された署名 gpgv: DSA鍵C97E4649A2051D0CEA1A73F972A7496B45499429を使用 gpgv: "groonga Key (groonga Official Signing Key) <packages@groonga.org>"からの正しい署名 uupdate: -> Copy to groonga_9.0.1-1.debian.tar.xz gbp:info: Using uscan downloaded tarball ../groonga_9.0.1.orig.tar.gz What is the upstream version? [9.0.1] gbp:info: ../groonga_9.0.1.orig.tar.gz already exists, moving to ../groonga_9.0.1.orig.tar.gz.1553868246 gbp:info: Importing '../groonga_9.0.1.orig.gbp.tar.gz' to branch 'upstream' (filtering out ['*egg.info', '.bzr', '.hg', '.hgtags', '.svn', 'CVS', '*/debian/*', 'debian/*'])... gbp:info: Source package is groonga gbp:info: Upstream version is 9.0.1 gbp:info: Replacing upstream source on 'debian/unstable' gbp:info: Successfully imported version 9.0.1 of ../groonga_9.0.1.orig.gbp.tar.gz gbp import-orig --uscan 44.59s user 2.88s system 93% cpu 50.783 total
debian/unstableブランチをpushする。
% git push Enumerating objects: 1827, done. Counting objects: 100% (1353/1353), done. Delta compression using up to 8 threads Compressing objects: 100% (864/864), done. Writing objects: 100% (877/877), 1.25 MiB | 3.88 MiB/s, done. Total 877 (delta 744), reused 0 (delta 0) remote: Resolving deltas: 100% (744/744), completed with 409 local objects. To salsa.debian.org:debian/groonga.git 468fbce..8b30499 debian/unstable -> debian/unstable
import-origでupstreamブランチも更新されているのでcheckoutしてpushしておく。
% git checkout upstream Switched to branch 'upstream' Your branch is ahead of 'origin/upstream' by 1 commit. (use "git push" to publish your local commits) % git push Total 0 (delta 0), reused 0 (delta 0) remote: remote: To create a merge request for upstream, visit: remote: https://salsa.debian.org/debian/groonga/merge_requests/new?merge_request%5Bsource_branch%5D=upstream remote: To salsa.debian.org:debian/groonga.git d1d3e5c..4ff374c upstream -> upstream
pristine-tarブランチも同様に更新する。
% git checkout pristine-tar Switched to branch 'pristine-tar' Your branch is ahead of 'origin/pristine-tar' by 1 commit. (use "git push" to publish your local commits) % git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 8 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 453.86 KiB | 15.65 MiB/s, done. Total 4 (delta 1), reused 0 (delta 0) remote: remote: To create a merge request for pristine-tar, visit: remote: https://salsa.debian.org/debian/groonga/merge_requests/new?merge_request%5Bsource_branch%5D=pristine-tar remote: To salsa.debian.org:debian/groonga.git 846fc24..56c36a2 pristine-tar -> pristine-tar
あとは、debian/unstableブランチに戻ってdebian/*を修正する。
% git checkout debian/unstable Switched to branch 'debian/unstable' Your branch is up to date with 'origin/debian/unstable'. % gbp dch gbp:info: Changelog last touched at '468fbceadd3ef9afbaceb9df842ba1ad8fada838'
gbp dchはエントリを追加するがUNRELEASEDになる。
diff --git a/debian/changelog b/debian/changelog index e62f6bf..3909010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +groonga (9.0.1-1) UNRELEASED; urgency=medium + + * New upstream version 9.0.1 + + -- Kentaro Hayashi <hayashi@clear-code.com> Fri, 29 Mar 2019 23:10:53 +0900 + groonga (9.0.0-1) unstable; urgency=medium * New upstream version 9.0.0
そういうときはdch -rでエントリを更新するとよい。
あとはパッケージのビルドに問題がないか確認する。
% gbp buildpackage --git-ignore-new
パッケージができたらpiupartsを流しておく。
% sudo piuparts -d sid -t build-area -m "http://ftp.jp.debian.org/debian main" -b /var/cache/pbuilder/unstable-amd64-base.tgz -l piuparts.log build-area/*.deb (略) 1m50.0s DEBUG: Removed directory tree at build-area/tmpG6UAGA 1m50.0s INFO: PASS: All tests. 1m50.0s INFO: piuparts run ends. sudo piuparts -d sid -t build-area -m "http://ftp.jp.debian.org/debian main" 62.53s user 19.37s system 74% cpu 1:50.26 total
問題なければソースパッケージを用意する。
debuild -S -sa dpkg-buildpackage -us -uc -ui -S -sa dpkg-buildpackage: info: source package groonga dpkg-buildpackage: info: source version 9.0.1-1 dpkg-buildpackage: info: source distribution unstable dpkg-buildpackage: info: source changed by Kentaro Hayashi <hayashi@clear-code.com> dpkg-source --before-build . dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: applying fix-nginx-FTBFS-on-kfreebsd.patch dpkg-source: info: applying remove-groonga-keyring-postrm.patch fakeroot debian/rules clean dh clean dh_clean dpkg-source -b . dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: info: building groonga using existing ./groonga_9.0.1.orig.tar.gz dpkg-source: info: building groonga using existing ./groonga_9.0.1.orig.tar.gz.asc dpkg-source: info: using patch list from debian/patches/series dpkg-source: warning: ignoring deletion of directory packages/apt/debian dpkg-source: info: building groonga in groonga_9.0.1-1.debian.tar.xz dpkg-source: info: building groonga in groonga_9.0.1-1.dsc dpkg-genbuildinfo --build=source dpkg-genchanges -sa --build=source >../groonga_9.0.1-1_source.changes dpkg-genchanges: info: including full source code in upload dpkg-source --after-build . dpkg-source: info: unapplying remove-groonga-keyring-postrm.patch dpkg-source: info: unapplying fix-nginx-FTBFS-on-kfreebsd.patch dpkg-buildpackage: info: full upload (original source is included) Now running lintian groonga_9.0.1-1_source.changes ... Finished running lintian. Now signing changes and any dsc files... signfile dsc groonga_9.0.1-1.dsc D92025640886D27D14A9EE02D22C1A883455D448 fixup_buildinfo groonga_9.0.1-1.dsc groonga_9.0.1-1_source.buildinfo signfile buildinfo groonga_9.0.1-1_source.buildinfo D92025640886D27D14A9EE02D22C1A883455D448 fixup_changes dsc groonga_9.0.1-1.dsc groonga_9.0.1-1_source.changes fixup_changes buildinfo groonga_9.0.1-1_source.buildinfo groonga_9.0.1-1_source.changes signfile changes groonga_9.0.1-1_source.changes D92025640886D27D14A9EE02D22C1A883455D448 Successfully signed dsc, buildinfo, changes files debuild -S -sa 36.27s user 2.09s system 80% cpu 47.935 total
あとは dput でアップロードする。
% dput groonga_9.0.1-1_source.changes Trying to upload package to ftp-master (ftp.upload.debian.org) Checking signature on .changes gpg: /home/kenhys/work/debian/groonga/groonga_9.0.1-1_source.changes: Valid signature from F7FB75C566ED20E3 Checking signature on .dsc gpg: /home/kenhys/work/debian/groonga/groonga_9.0.1-1.dsc: Valid signature from F7FB75C566ED20E3 Uploading to ftp-master (via ftp to ftp.upload.debian.org): Uploading groonga_9.0.1-1.dsc: done. Uploading groonga_9.0.1.orig.tar.gz: done. Uploading groonga_9.0.1.orig.tar.gz.asc: done. Uploading groonga_9.0.1-1.debian.tar.xz: done. Uploading groonga_9.0.1-1_source.buildinfo: done. Uploading groonga_9.0.1-1_source.changes: done. Successfully uploaded packages.
タグを打っておくことを忘れずに。
gbp buildpackage --git-tag-only --git-ignore-new dh clean dh_clean gbp:info: Tagging Debian package 9.0.1-1 as debian/9.0.1-1 in git % git push --tags Enumerating objects: 9, done. Counting objects: 100% (9/9), done. Delta compression using up to 8 threads Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 710 bytes | 710.00 KiB/s, done. Total 6 (delta 3), reused 0 (delta 0) To salsa.debian.org:debian/groonga.git * [new tag] debian/9.0.1-1 -> debian/9.0.1-1 * [new tag] upstream/9.0.1 -> upstream/9.0.1
