Merge lp:~zyga/checkbox/fix-1307980-checkbox-ng into lp:~checkbox-dev/checkbox/ppa-packaging-checkbox-ng

[Zygmunt Krynicki]

[Sylvain Pineau (sylvain-pineau)]

+1 for compatibility with old releases

review: Approve

[lp:~zyga/checkbox/fix-1307980-checkbox-ng]

4. By Zygmunt Krynicki on 2014-04-16

"automatic merge by tarmac [r=sylvain-pineau][bug=1307980][author=zkrynicki]"

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-04 18:54:26 +0000
+++ debian/changelog	2014-04-16 12:25:19 +0000
@@ -1,8 +1,39 @@
-checkbox-ng (0.3~dev) UNRELEASED; urgency=medium
-
+checkbox-ng (0.4~dev) UNRELEASED; urgency=medium
+
+  * fork of Debian packaging at for PPA-specific builds
+  * synchronize with Debian packaging 
+  * debian/control: don't depend on dh-python
+  * debian/control: build-depend on python3-distutils-extra for i18n
+  * debian/control: manually depend on stuff that used to be created by
+    ${python3:Depends} 
+  * debian/rules: don't use pybuild, do everything manually
+  * debian/rules: don't use --with sphinxdoc as that doesn't work with a
+    custom theme
+  * debian/rules: build i18n catalogs
+  * debian/*.install: install everything manually
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 09 Apr 2014 18:34:16 +0200
+
+checkbox-ng (0.3-2) UNRELEASED; urgency=medium
+
+  * Add build dependency on python3-requests
+
+ -- Zygmunt Krynicki <[e-mail]>  Wed, 09 Apr 2014 18:34:16 +0200
+
+checkbox-ng (0.3-1) unstable; urgency=medium
+
+  [ Zygmunt Krynicki ]
+  * New upstream release: https://launchpad.net/checkbox-ng/14.04/0.3 
   * debian/control: make python3-checkbox-ng, checkbox-ng and checkbox-service
     all depend on one version of themselves. LP: #1298284
-  * fork of Debian packaging at 0.2.2-2 (unreleased) for PPA-specific builds
+  * debian/control: depend on latest plainbox 
+  * debian/upstream/signing-key.asc: Use armoured gpg keys to avoid having to
+    keep binary files in Debian packaging. Also, replace that with my key
+    since I made the 0.3 release upstream.
+  * debian/source/include-binaries: no longer needed 
+
+  [ Piotr Ożarowski ]
+  * debian/watch: add support for dev releases
 
  -- Zygmunt Krynicki <[e-mail]>  Thu, 27 Mar 2014 11:18:14 +0100
 

=== added file 'debian/checkbox-ng.install'
--- debian/checkbox-ng.install	1970-01-01 00:00:00 +0000
+++ debian/checkbox-ng.install	2014-04-16 12:25:19 +0000
@@ -0,0 +1,4 @@
+usr/bin/canonical-certification-server
+usr/bin/canonical-driver-test-suite-cli
+usr/bin/checkbox
+usr/bin/checkbox-cli

=== modified file 'debian/control'
--- debian/control	2014-04-04 18:54:26 +0000
+++ debian/control	2014-04-16 12:25:19 +0000
@@ -1,19 +1,22 @@
 Source: checkbox-ng
 Section: utils
 Priority: optional
-Maintainer: Sylvain Pineau <[e-mail]>
-Uploaders: Debian Python Modules Team <[e-mail]>
+Maintainer: Checkbox Developers <[e-mail]> 
+Uploaders: Sylvain Pineau <[e-mail]>,
+           Zygmunt Krynicki <[e-mail]>,
+           Debian Python Modules Team <[e-mail]>
 Build-Depends:
  debhelper (>= 9),
- dh-python,
  python3-all,
+ python3-checkbox-support (>= 0.2),
  python3-dbus,
+ python3-distutils-extra,
  python3-docutils,
  python3-gi,
- python3-plainbox (>= 0.5.1),
- python3-checkbox-support (>= 0.2~dev),
+ python3-plainbox (>= 0.5.3),
+ python3-requests (>= 1.0),
  python3-setuptools,
- python3-sphinx
+ python3-sphinx,
 Standards-Version: 3.9.5
 X-Python3-Version: >= 3.2
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/checkbox-ng/trunk/
@@ -22,7 +25,11 @@
 
 Package: checkbox-ng
 Architecture: all
-Depends: python3-checkbox-ng (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ python3,
+ python3-checkbox-ng (= ${binary:Version}),
+ python3:any (>= 3.2),
 Replaces: checkbox (<< 0.17.6-0ubuntu1)
 Breaks: checkbox (<< 0.17.6-0ubuntu1)
 Description: PlainBox based test runner
@@ -34,7 +41,11 @@
 
 Package: checkbox-ng-service
 Architecture: all
-Depends: checkbox-ng (= ${binary:Version}), python3-dbus, python3-gi, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ checkbox-ng (= ${binary:Version}),
+ python3-dbus,
+ python3-gi,
 Description: CheckBox D-Bus service
  CheckBoxNG is a hardware testing tool useful for certifying laptops,
  desktops and servers. It is a new version of CheckBox that is built
@@ -44,11 +55,12 @@
 
 Package: python3-checkbox-ng
 Architecture: all
-Depends: python3-plainbox (>= 0.5),
-         python3-checkbox-support (>= 0.2~dev),
-         python3-requests (>= 1.0),
-         ${misc:Depends},
-         ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ python3-checkbox-support (>= 0.2),
+ python3-plainbox (>= 0.5.3),
+ python3-requests (>= 1.0),
+ python3:any (>= 3.2),
 Description: PlainBox based test runner (Python 3 library)
  CheckBoxNG is a hardware testing tool useful for certifying laptops,
  desktops and servers. It is a new version of CheckBox that is built

=== added file 'debian/python3-checkbox-ng.install'
--- debian/python3-checkbox-ng.install	1970-01-01 00:00:00 +0000
+++ debian/python3-checkbox-ng.install	2014-04-16 12:25:19 +0000
@@ -0,0 +1,3 @@
+checkbox-ng/build/mo/* usr/share/locale 
+usr/lib/python3/dist-packages/checkbox_ng-*.egg-info
+usr/lib/python3/dist-packages/checkbox_ng/

=== modified file 'debian/rules'
--- debian/rules	2014-03-27 12:35:43 +0000
+++ debian/rules	2014-04-16 12:25:19 +0000
@@ -1,25 +1,25 @@
 #!/usr/bin/make -f
-export PYBUILD_NAME=checkbox-ng
 export LANG=
 export LANGUAGE=
+export http_proxy=http://127.0.0.1:9
+PPA_DISPLACEMENT=checkbox-ng
 
 %:
-	dh $@ --with=python3,sphinxdoc --buildsystem=pybuild --sourcedirectory=checkbox-ng
+	dh $@ --with=python3 --sourcedirectory=$(PPA_DISPLACEMENT)
 
-# Build sphinx html documentation. Generate manual pages for checkbox-ng
-# console_scripts
 override_dh_auto_build:
-	dh_auto_build --buildsystem=pybuild
-	cd checkbox-ng && python3 setup.py build_sphinx
-	cd checkbox-ng && python3 setup.py build_sphinx -b man
-
-# Override dh_install to ensure that console_scripts are in the
-# checkbox-ng package and not in the python3-checkbox-ng package.
-override_dh_install:
-	dh_install
-	mkdir -p debian/checkbox-ng/usr/bin
-	mv debian/python3-checkbox-ng/usr/bin/canonical* debian/checkbox-ng/usr/bin
-	mv debian/python3-checkbox-ng/usr/bin/checkbox* debian/checkbox-ng/usr/bin
-
-override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3
+	cd $(PPA_DISPLACEMENT) && python3 setup.py build
+	cd $(PPA_DISPLACEMENT) && python3 setup.py build_i18n -m
+	cd $(PPA_DISPLACEMENT) && python3 setup.py build_sphinx -b html
+	cd $(PPA_DISPLACEMENT) && python3 setup.py build_sphinx -b man
+
+override_dh_auto_test:
+	cd $(PPA_DISPLACEMENT) && python3 setup.py test
+
+override_dh_auto_install:
+	cd $(PPA_DISPLACEMENT) && python3 setup.py install \
+		--force --root=$(CURDIR)/debian/tmp \
+		--no-compile -O0 --install-layout=deb 
+
+override_dh_auto_clean:
+	cd $(PPA_DISPLACEMENT) && python3 setup.py clean

=== removed file 'debian/source/include-binaries'
--- debian/source/include-binaries	2014-03-27 12:35:43 +0000
+++ debian/source/include-binaries	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/upstream-signing-key.pgp

=== added directory 'debian/upstream'
=== removed file 'debian/upstream-signing-key.pgp'
Binary files debian/upstream-signing-key.pgp	2014-03-27 12:35:43 +0000 and debian/upstream-signing-key.pgp	1970-01-01 00:00:00 +0000 differ
=== added file 'debian/upstream/signing-key.asc'
--- debian/upstream/signing-key.asc	1970-01-01 00:00:00 +0000
+++ debian/upstream/signing-key.asc	2014-04-16 12:25:19 +0000
@@ -0,0 +1,42 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+xxGS57/Nmfbij8UuxgkLtw==
+=4Jty
+-----END PGP PUBLIC KEY BLOCK-----

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2014-04-16 12:25:19 +0000
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/\.?(dev|rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ \
+    http://pypi.python.org/packages/source/c/checkbox-ng/checkbox-ng-(.*)\.tar\.gz