[debian-devel:18365] RFS: bzr-upload, bzr-search bzr-stats

[Koichi Akabe <vbkaisetsu@xxxxxxxxx>]

こんにちは。あかべです。
いつもお世話になっております。

先日、bzr-upload、bzr-search、bzr-stats の3パッケージを ITA しました。
bzr-upload と bzr-search は testing のフリーズ中なので experimental に
入れたいと思っていますが、 bzr-stats については bzr 2.6 との互換性の問題
の修正が含まれているので、 unstable に入れたいと思っています。どなたかス
ポンサーになっていただけませんか？

http://mentors.debian.net/debian/pool/main/b/bzr-upload/bzr-upload_1.1.0-3~exp1.dsc
http://mentors.debian.net/debian/pool/main/b/bzr-search/bzr-search_1.7.0~bzr94-2~exp1.dsc
http://mentors.debian.net/debian/pool/main/b/bzr-stats/bzr-stats_0.1.0+bzr51-1.dsc

3パッケージとも、DMアップロードを有効にしています。
それぞれのパッケージの前バージョンからの debian/ 以下の差分を添付しまし
た。

よろしくお願いします。

-- 
Koichi Akabe
  vbkaisetsu at {gmail.com, debian.or.jp}

diff -urN debian/changelog bzr-upload-1.1.0/debian/changelog
--- debian/changelog	2012-05-29 07:12:57.000000000 +0900
+++ bzr-upload-1.1.0/debian/changelog	2012-08-28 20:43:03.316193535 +0900
@@ -1,3 +1,22 @@
+bzr-upload (1.1.0-3~exp1) experimental; urgency=low
+
+  * New maintainer (Closes: #668269)
+  * debian/compat
+   - up to 9
+  * debian/rules
+   - change build command for dh9
+  * debian/control
+   - remove half broken Build-Depends: bzr (<< 2.4.0~beta1-2)
+   - update X-Python-Version to 2.6 or later to follow bzr package
+   - update debhelper version to 9.0.0
+   - enable DM upload
+  * debian/copyright
+   - merge contents of same field
+   - remove undefined fields: Debianized-Date and Debianized-By
+   - fix wrong Source
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx>  Tue, 28 Aug 2012 09:19:44 +0900
+
 bzr-upload (1.1.0-2) unstable; urgency=low
 
   * Orphan package.
diff -urN debian/compat bzr-upload-1.1.0/debian/compat
--- debian/compat	2011-03-11 19:48:59.000000000 +0900
+++ bzr-upload-1.1.0/debian/compat	2012-08-28 09:35:58.928319583 +0900
@@ -1 +1 @@
-7
+9
diff -urN debian/control bzr-upload-1.1.0/debian/control
--- debian/control	2012-05-29 07:12:57.000000000 +0900
+++ bzr-upload-1.1.0/debian/control	2012-08-28 20:38:37.924202906 +0900
@@ -1,14 +1,17 @@
 Source: bzr-upload
 Section: vcs
 Priority: optional
-Maintainer: Maintainer: Debian QA Group <packages@qa.debian.org>
-Homepage: https://launchpad.net/bzr-upload
+Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
+Uploaders: Koichi Akabe <vbkaisetsu@xxxxxxxxx>
 Build-Depends-Indep: python-paramiko, python-testtools
 Build-Conflicts: bzr-hg
-Build-Depends: bzr (<< 2.6.0), bzr (>= 2.2~), debhelper (>= 7.0.50~), python (>= 2.6.6-3), python-bzrlib.tests | bzr (<< 2.4.0~beta1-2)
+Build-Depends: bzr (<< 2.6.0), bzr (>= 2.2~), debhelper (>= 9.0.0), python (>= 2.6.6-3), python-bzrlib.tests
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.4
-Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-upload/unstable/
+X-Python-Version: >= 2.6
+Homepage: https://launchpad.net/bzr-upload
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-bazaar/bzr-upload/unstable
+Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzr-upload/unstable/files
+DM-Upload-Allowed: yes
 
 Package: bzr-upload
 Architecture: all
diff -urN debian/copyright bzr-upload-1.1.0/debian/copyright
--- debian/copyright	2012-03-15 12:00:02.000000000 +0900
+++ bzr-upload-1.1.0/debian/copyright	2012-08-28 09:15:18.564363380 +0900
@@ -1,9 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: bzr-upload
 Upstream-Contact: Vincent Ladeuil <v.ladeuil@xxxxxxx>
-Debianized-By: Jelmer Vernooij <jelmer@xxxxxxxxx>
-Debianized-Date: Sa 14. Jun 17:41:27 CEST 2008
-Source: http://launchpad.net/bzr-loom
+Source: https://launchpad.net/bzr-upload
 
 Files: *
 Comment:
@@ -12,27 +10,12 @@
   Martin Albisetti <argentina@xxxxxxxxx>
 Copyright: 2008 Canonical Ltd
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St,
- Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GPL can be found in
- /usr/share/common-licenses/GPL-2
 
 Files: debian/*
 Copyright: 2008 Jelmer Vernooij <jelmer@debian.org>
 License: GPL-2+
+
+License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
diff -urN debian/rules bzr-upload-1.1.0/debian/rules
--- debian/rules	2011-03-11 19:48:59.000000000 +0900
+++ bzr-upload-1.1.0/debian/rules	2012-08-28 09:35:40.184320245 +0900
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 --buildsystem=python_distutils $*
+	dh "$@" --with python2 --buildsystem=python_distutils
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:

diff -urN debian/changelog bzr-search-1.7.0~bzr94/debian/changelog
--- debian/changelog	2012-05-29 07:33:26.000000000 +0900
+++ bzr-search-1.7.0~bzr94/debian/changelog	2012-08-28 15:51:17.355524453 +0900
@@ -1,3 +1,21 @@
+bzr-search (1.7.0~bzr94-2~exp1) experimental; urgency=low
+
+  * New maintainer (Closes: #668262)
+  * debian/compat
+   - up to 9
+  * debian/rules
+   - add get-orig-source target
+   - change build command for dh9
+  * debian/control
+   - remove half broken Build-Depends: bzr (<< 2.4.0~beta1-2)
+   - update X-Python-Version to 2.6 or later to follow bzr package
+   - update debhelper version to 9.0.0
+   - update Standards-Version to 3.9.3
+  * debian/copyright
+   - change to machine readable format
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx>  Tue, 28 Aug 2012 15:51:07 +0900
+
 bzr-search (1.7.0~bzr94-1) unstable; urgency=low
 
   * New upstream snapshot.
diff -urN debian/compat bzr-search-1.7.0~bzr94/debian/compat
--- debian/compat	2011-03-11 21:24:43.000000000 +0900
+++ bzr-search-1.7.0~bzr94/debian/compat	2012-08-28 09:45:13.000000000 +0900
@@ -1 +1 @@
-7
+9
diff -urN debian/control bzr-search-1.7.0~bzr94/debian/control
--- debian/control	2012-05-29 07:33:26.000000000 +0900
+++ bzr-search-1.7.0~bzr94/debian/control	2012-08-28 20:39:11.140201734 +0900
@@ -1,15 +1,15 @@
 Source: bzr-search
 Section: vcs
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
+Uploaders: Koichi Akabe <vbkaisetsu@xxxxxxxxx>
+Build-Depends-Indep: python-bzrlib.tests, bzr (>= 1.7~), python-testtools
+Build-Depends: debhelper (>= 9.0.0), python (>= 2.6.6-3)
+Standards-Version: 3.9.3
+X-Python-Version: >= 2.6
 Homepage: https://launchpad.net/bzr-search
-Build-Depends-Indep: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2),
-                     bzr (>= 1.7~),
-                     python-testtools
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3)
-Standards-Version: 3.9.2
-X-Python-Version: >= 2.4
-Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-search/unstable/
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-bazaar/bzr-search/unstable
+Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzr-search/unstable/files
 DM-Upload-Allowed: yes
 
 Package: bzr-search
diff -urN debian/copyright bzr-search-1.7.0~bzr94/debian/copyright
--- debian/copyright	2009-11-27 02:19:32.000000000 +0900
+++ bzr-search-1.7.0~bzr94/debian/copyright	2012-08-28 09:15:42.000000000 +0900
@@ -1,25 +1,31 @@
-This package was debianized by Jelmer Vernooij
-<jelmer@xxxxxxxxx> on Di 1. Jul 15:50:10 CEST 2008.
-
-It was downloaded from http://launchpad.net/bzr-search
-The tarball was created by running:
-
-bzr export bzr-search-0.0.1~bzr25.tar.gz http://launchpad.net/bzr-search
-
-Copyright (C) 2008 Robert Collins <robertc@xxxxxxxxxxxxxxxxx>
-
-License:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2 as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License with
-the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-if not, write to the Free Software Foundation, Inc., 51 Franklin St,
-Fifth Floor, Boston, MA 02110-1301, USA.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: bzr-search
+Source: https://launchpad.net/bzr-search
+
+Files: *
+Copyright: 2008 Robert Collins <robertc@xxxxxxxxxxxxxxxxx>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2008 Jelmer Vernooij <jelmer@debian.org>
+           2012 Koichi Akabe <vbkaisetsu@xxxxxxxxx>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License with
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the full text of the GPL can be found in
+ /usr/share/common-licenses/GPL-2
diff -urN debian/rules bzr-search-1.7.0~bzr94/debian/rules
--- debian/rules	2011-03-11 21:24:43.000000000 +0900
+++ bzr-search-1.7.0~bzr94/debian/rules	2012-08-28 15:50:53.091525309 +0900
@@ -1,9 +1,18 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 --buildsystem=python_distutils $*
+	dh "$@" --with python2 --buildsystem=python_distutils
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 	BZR_PLUGINS_AT=search@$(CURDIR) /usr/bin/bzr selftest -s bp.search
 endif
+
+PACKAGE = bzr-search
+SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+BZR_REVISION := $(shell echo $(SRC_VERSION) | awk -F"~" '{ print $$2 }' | sed 's/bzr//' )
+TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+.PHONY: get-orig-source
+get-orig-source:
+	bzr export $(TARBALL) -r $(BZR_REVISION) "lp:bzr-search"
+	echo "  "$(TARBALL)" created; move it to the right destination to build the package"

diff -urN debian/changelog bzr-stats-0.1.0+bzr51/debian/changelog
--- debian/changelog	2012-05-29 07:50:34.000000000 +0900
+++ bzr-stats-0.1.0+bzr51/debian/changelog	2012-08-28 20:41:08.068197605 +0900
@@ -1,3 +1,23 @@
+bzr-stats (0.1.0+bzr51-1) unstable; urgency=low
+
+  * New maintainer (Closes: #668919)
+  * New upstream snapshot
+   + fix compatibility with bzr 2.6 (LP: #1040560)
+  * debian/compat
+   - up to 9
+  * debian/rules
+   - add get-orig-source target
+   - change build command for dh9
+  * debian/control
+   - remove half broken Build-Depends: bzr (<< 2.4.0~beta1-2)
+   - update X-Python-Version to 2.6 or later to follow bzr package
+   - update debhelper version to 9.0.0
+  * debian/copyright
+   - merge contents of same field
+   - remove undefined fields: Debianized-Date and Debianized-By
+
+ -- Koichi Akabe <vbkaisetsu@xxxxxxxxx>  Tue, 28 Aug 2012 15:57:29 +0900
+
 bzr-stats (0.1.0+bzr48-2) unstable; urgency=low
 
   * Orphan package.
diff -urN debian/compat bzr-stats-0.1.0+bzr51/debian/compat
--- debian/compat	2012-05-29 07:50:34.000000000 +0900
+++ bzr-stats-0.1.0+bzr51/debian/compat	2012-08-28 09:30:33.536331073 +0900
@@ -1 +1 @@
-7
+9
diff -urN debian/control bzr-stats-0.1.0+bzr51/debian/control
--- debian/control	2012-05-29 07:50:34.000000000 +0900
+++ bzr-stats-0.1.0+bzr51/debian/control	2012-08-28 20:51:08.416176406 +0900
@@ -1,16 +1,15 @@
 Source: bzr-stats
 Section: vcs
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends-Indep: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2),
-                     bzr (>= 1.13~),
-                     python-subunit,
-                     python-testtools
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3)
+Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
+Uploaders: Koichi Akabe <vbkaisetsu@xxxxxxxxx>
+Build-Depends-Indep: python-bzrlib.tests, bzr (>= 1.13~), python-subunit, python-testtools
+Build-Depends: debhelper (>= 9.0.0), python (>= 2.6.6-3)
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.4
-Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-stats/unstable
+X-Python-Version: >= 2.6
 Homepage: http://launchpad.net/bzr-stats
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-bazaar/bzr-stats/unstable
+Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzr-stats/unstable/files
 DM-Upload-Allowed: yes
 
 Package: bzr-stats
diff -urN debian/copyright bzr-stats-0.1.0+bzr51/debian/copyright
--- debian/copyright	2012-05-29 07:50:34.000000000 +0900
+++ bzr-stats-0.1.0+bzr51/debian/copyright	2012-08-28 09:15:30.268362967 +0900
@@ -1,39 +1,25 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: bzr-stats
 Upstream-Contact: Bazaar Developers <bazaar@xxxxxxxxxxxxxxxxxxx>
-Source: https://launchpad.net/bzr-stats/
-
-Files: debian/*
-Comment:
- This package was debianized by Jelmer Vernooij <jelmer@xxxxxxxxx> on Wed Oct
- 24 13:31:13 CET 2007.
-Copyright: Jelmer Vernooij <jelmer@debian.org>
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St,
- Fifth Floor, Boston, MA 02110-1301, USA.
+Source: https://launchpad.net/bzr-stats
 
 Files: *
 Comment:
  Upstream authors:
- Jelmer Vernooij <jelmer@xxxxxxxxx>
- John Arbash Meinel <john@xxxxxxxxxxxxxxxxx>
- Russ Brown <pickscrape@xxxxxxxxx>
- Lukáš Lalinský <lalinsky@xxxxxxxxx>
- Wesley J. Landaker <wjlanda@xxxxxxxxxx>
+  Jelmer Vernooij <jelmer@xxxxxxxxx>
+  John Arbash Meinel <john@xxxxxxxxxxxxxxxxx>
+  Russ Brown <pickscrape@xxxxxxxxx>
+  Lukáš Lalinský <lalinsky@xxxxxxxxx>
+  Wesley J. Landaker <wjlanda@xxxxxxxxxx>
 Copyright: 2007-2012 Canonical Ltd
-Copyright: 2008-2010 Jelmer Vernooij <jelmer@xxxxxxxxx>
+           2008-2010 Jelmer Vernooij <jelmer@xxxxxxxxx>
+License: GPL-2+
+
+Files: debian/*
+Copyright: Jelmer Vernooij <jelmer@debian.org>
+           Koichi Akabe <vbkaisetsu@xxxxxxxxx>
+License: GPL-2+
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -urN debian/rules bzr-stats-0.1.0+bzr51/debian/rules
--- debian/rules	2012-05-29 07:50:34.000000000 +0900
+++ bzr-stats-0.1.0+bzr51/debian/rules	2012-08-28 15:49:43.011527784 +0900
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 --buildsystem=python_distutils $*
+	dh "$@" --with python2 --buildsystem=python_distutils
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -12,3 +12,12 @@
 	$(CONCURRENCY) BZR_PLUGINS_AT=stats@$(CURDIR) /usr/bin/bzr selftest -s bp.stats \
 	    -v --parallel=fork
 endif
+
+PACKAGE = bzr-stats
+SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+BZR_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$2 }' | sed 's/bzr//' )
+TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.bz2
+.PHONY: get-orig-source
+get-orig-source:
+	bzr export $(TARBALL) -r $(BZR_REVISION) "lp:bzr-stats"
+	echo "  "$(TARBALL)" created; move it to the right destination to build the package"