Import plainbox-provider-checkbox 0.4-1debian-0.4-1

13 files changed, 114 insertions, 53 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index db2aaf4..d2eb42b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-57e9773c83f7aa6bfe39fe58fdf74e98c41e4a00
-57e9773c83f7aa6bfe39fe58fdf74e98c41e4a00
-2ef1fab33646738dae926c2eb41c70fa3e96afdc
-2ef1fab33646738dae926c2eb41c70fa3e96afdc
-plainbox-provider-checkbox_0.3.orig.tar.gz
-04971cea9371ba91db647dbe66b005c0655e15f3
-1151018
+cbbe2fe63a1b22f6d0873bfe11ff3e834a1a883c
+cbbe2fe63a1b22f6d0873bfe11ff3e834a1a883c
+cbbe2fe63a1b22f6d0873bfe11ff3e834a1a883c
+cbbe2fe63a1b22f6d0873bfe11ff3e834a1a883c
+plainbox-provider-checkbox_0.4.orig.tar.gz
+043eb921dd899afee2844ee6da374e28b2363803
+1154183
diff --git a/debian/changelog b/debian/changelog
index 97778d6..29c59b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+plainbox-provider-checkbox (0.4-1) unstable; urgency=medium
+
+ * New upstream release. List of bugfixes:
+ https://launchpad.net/plainbox-provider-checkbox/14.04/0.4
+ * debian/watch: look for new releases on launchpad
+ * debian/rules: stop using pybuild and use manage.py
+ {i18n,build,install,validate} instead. This also drops dependency on
+ python3-distutils-extra and replaces that with intltool
+ * debian/control: drop X-Python3-Version
+ * debian/control: make plainbox-provider-checkbox depend on python and
+ python2.7 (for some scripts) rather than suggesting them.
+ * 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/lintian-overrides: add an override for warning about no
+ source for flash movie with reference to a bug report that discusses that
+ issue.
+ * debian/source/include-binaries: drop (no longer needed)
+ * debian/patches: drop (no longer needed)
+ * debian/plainbox-provider-checkbox.lintian-overrides: drop (no longer
+ needed)
+ * Stop being a python3 module, move to from DPMT to PAPT
+
+ -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Mon, 07 Apr 2014 19:00:31 +0200
+
 plainbox-provider-checkbox (0.3-2) unstable; urgency=low
 
 * Patch the checkbox.provider file to add the version number, required by
diff --git a/debian/control b/debian/control
index 283fa12..8364ba3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,31 @@
 Source: plainbox-provider-checkbox
 Section: utils
 Priority: optional
-Maintainer: Sylvain Pineau <sylvain.pineau@canonical.com>
-Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Maintainer: Checkbox Developers <checkbox-dev@lists.launchpad.net> 
+Uploaders: Sylvain Pineau <sylvain.pineau@canonical.com>,
+ Zygmunt Krynicki <zygmunt.krynicki@canonical.com>,
+ Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 Build-Depends:
 debhelper (>= 9),
 dh-python,
- python3-all,
- python3-distutils-extra
+ intltool,
+ python (>= 2.7),
+ python3,
+ python3-plainbox (>= 0.5.3),
 Standards-Version: 3.9.5
-X-Python3-Version: >= 3.2
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/plainbox-provider-checkbox/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/plainbox-provider-checkbox/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/plainbox-provider-checkbox/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/plainbox-provider-checkbox/trunk/
 Homepage: http://launchpad.net/checkbox
 
 Package: plainbox-provider-checkbox
 Architecture: any
-Depends: plainbox-provider-resource-generic,
- python3 (>= 3.2),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ plainbox-provider-resource-generic (>= 0.3),
+ python (>= 2.7),
+ python2.7,
+ python3,
 Recommends: gir1.2-gst-plugins-base-1.0,
 gir1.2-gstreamer-1.0,
 gstreamer1.0-plugins-good,
@@ -43,7 +49,6 @@ Suggests: bonnie++,
 nmap,
 obexd-client,
 obexftp,
- python (>= 2.7),
 render-bench,
 smartmontools,
 sox,
diff --git a/debian/copyright b/debian/copyright
index 694d84a..3f4f674 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,7 @@ License: GPL-3
 On Debian-based systems the full text of the GPL, version 3, can be found at
 /usr/share/common-licenses/GPL-3.
 
-Files: provider_bin/alsa_info
+Files: bin/alsa_info
 Copyright: Copyright (C) 2007 Free Software Foundation.
 License: GPL-2
 This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ License: GPL-2
 On Debian-based systems the full text of the GPL, version 2, can be found at
 /usr/share/common-licenses/GPL-2.
 
-Files: provider_bin/camera_test
+Files: bin/camera_test
 Copyright:
 Copyright 2008-2012 Canonical Ltd.
 .
@@ -67,7 +67,7 @@ License: GPL-3
 On Debian-based systems the full text of the GPL, version 3, can be found at
 /usr/share/common-licenses/GPL-3.
 
-Files: provider_bin/graphics_driver
+Files: bin/graphics_driver
 Copyright: Copyright (C) 2010-2012 Bryce W. Harrington All Rights Reserved.
 License: MIT
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -88,7 +88,7 @@ License: MIT
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-Files: provider_bin/mm-test
+Files: bin/mm-test
 Copyright:
 Copyright (C) 2008 Novell, Inc.
 Copyright (C) 2009 Red Hat, Inc.
@@ -110,7 +110,7 @@ License: GPL-2
 On Debian-based systems the full text of the GPL, version 2, can be found at
 /usr/share/common-licenses/GPL-2.
 
-Files: provider_bin/threaded_memtest.c
+Files: src/threaded_memtest.c
 Copyright: Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
 License: GPL-2
 This program is free software; you can redistribute it and/or modify
diff --git a/debian/patches/provider_version.patch b/debian/patches/provider_version.patch
deleted file mode 100644
index e6f045e..0000000
--- a/debian/patches/provider_version.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 57e9773c83f7aa6bfe39fe58fdf74e98c41e4a00 Mon Sep 17 00:00:00 2001
-From: Sylvain Pineau <sylvain.pineau@canonical.com>
-Date: Tue, 28 Jan 2014 13:20:39 +0100
-Subject: Add the provider version for compatibility with plainbox >= 0.5
-
-Patch-Name: provider_version.patch
----
- checkbox.provider | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/checkbox.provider b/checkbox.provider
-index 5e311f4..abb789f 100644
---- a/checkbox.provider
-+++ b/checkbox.provider
-@@ -2,3 +2,4 @@
- name = 2013.com.canonical:checkbox
- location = /usr/lib/plainbox-providers-1/checkbox/
- description = CheckBox provider
-+version = 1.0
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 20f3544..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-provider_version.patch
diff --git a/debian/plainbox-provider-checkbox.lintian-overrides b/debian/plainbox-provider-checkbox.lintian-overrides
deleted file mode 100644
index 49397fd..0000000
--- a/debian/plainbox-provider-checkbox.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# image files are very specific to the application, they don't belong in /usr/share
-plainbox-provider-checkbox binary: image-file-in-usr-lib
diff --git a/debian/rules b/debian/rules
index aa33166..2101f1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,19 @@
 #!/usr/bin/make -f
-export PYBUILD_NAME=plainbox-provider-checkbox
 
 %:
-	dh $@ --with=python3 --buildsystem=pybuild
+	dh $@
+
+override_dh_auto_clean:
+	python3 manage.py clean
+
+override_dh_auto_build:
+	python3 manage.py build
+	python3 manage.py i18n
+
+override_dh_auto_test:
+	python3 manage.py validate 
 
 override_dh_auto_install:
-	dh_auto_install
-	rm -rf debian/*/usr/lib/python3*/dist-packages/*.egg-info
-	rm -rf debian/*/usr/lib/plainbox-providers-1/checkbox/bin/*.c
+	python3 manage.py install \
+	--prefix=/usr --layout=unix \
+	--root=$(CURDIR)/debian/plainbox-provider-checkbox/
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index 95a390b..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/upstream-signing-key.pgp
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..f031478
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1303919 
+plainbox-provider-checkbox source: source-is-missing
diff --git a/debian/upstream-signing-key.pgp b/debian/upstream-signing-key.pgp
deleted file mode 100644
index e77a036..0000000
--- a/debian/upstream-signing-key.pgp
+++ /dev/null
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..0e7f561
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,42 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+xxGS57/Nmfbij8UuxgkLtw==
+=4Jty
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 446a7b3..381d299 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
- http://pypi.python.org/packages/source/p/plainbox-provider-checkbox/plainbox-provider-checkbox-(.*)\.tar\.gz
+ http://launchpad.net/plainbox-provider-checkbox/+download/ \
+ https://launchpad\.net/plainbox-provider-checkbox/.*/.*/\+download/2013\.com\.canonical\.certification.checkbox-(.*).tar.gz