Merge lp:~zyga/checkbox/ppa-packaging-plainbox-provider-resource-generic into lp:~checkbox-dev/checkbox/ppa-packaging-plainbox-provider-resource-generic

[Zygmunt Krynicki]

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-04 18:35:41 +0000
+++ debian/changelog	2014-04-10 10:22:53 +0000
@@ -1,19 +1,29 @@
-plainbox-provider-resource-generic (0.3~dev) UNRELEASED; urgency=medium
-
-  * fork of Debian packaging at 0-2-2 for PPA-specific builds
-  * debian/control: build-depend on libnl-3-dev and libnl-genl3-dev
-  * debian/control: build-depend on python3-plainbox >= 0.5.3 and intltools
-    for manage.py build and manage.py i18n 
-  * debian/control: build depend on pkg-config and auto{conf,make}
-  * debian/control: no longer build-depend on dh-python, python3-all and
-    python3-distutils-extra 
+plainbox-provider-resource-generic (0.4~dev) UNRELEASED; urgency=medium
+
+  * Automatic PPA build
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 10 Apr 2014 12:13:50 +0200
+
+plainbox-provider-resource-generic (0.3-1) unstable; urgency=medium
+
+  * New upstream release. List of bugfixes:
+    https://launchpad.net/plainbox-provider-resource/14.04/0.3
+  * debian/watch: look for new releases on launchpad
+  * debian/control: make plainbox-provider-resource-generic arch=any as it
+    builds C source for one provider-specific executable now, also depend on
+    autotools, intltool and two netlink libraries
+  * debian/rules: stop using pybuild and use manage.py
+    {i18n,build,install,validate} instead. The build rule also regenerates.
+    autotools scripts that are present in the tarball.
   * debian/control: drop X-Python3-Version 
-  * debian/control: fix typo in ${shlibs:Depends}
-  * debian/control: indicate that plainbox-provider-resource-desktop is a
-    metapackage
-  * debian/rules: run autoreconf -i in the provider src/ directory
+  * debian/patches: drop (no longer needed)
+  * 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 
+  * Stop being a python3 module, move to from DPMT to PAPT
 
- -- Zygmunt Krynicki <[e-mail]>  Thu, 27 Mar 2014 13:41:47 +0100
+ -- Zygmunt Krynicki <[e-mail]>  Mon, 07 Apr 2014 14:12:51 +0200
 
 plainbox-provider-resource-generic (0.2-2) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2014-04-04 18:35:41 +0000
+++ debian/control	2014-04-10 10:22:53 +0000
@@ -1,8 +1,10 @@
 Source: plainbox-provider-resource-generic
 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]>,
+           Python Applications Packaging Team <[e-mail]>
 Build-Depends:
  autoconf,
  automake,
@@ -11,20 +13,20 @@
  libnl-3-dev,
  libnl-genl-3-dev,
  pkg-config,
+ python3,
  python3-plainbox (>= 0.5.3),
 Standards-Version: 3.9.5
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/plainbox-provider-resource-generic/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/plainbox-provider-resource-generic/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/plainbox-provider-resource-generic/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/plainbox-provider-resource-generic/trunk/
 Homepage: http://launchpad.net/checkbox
 
 Package: plainbox-provider-resource-generic
 Architecture: any
 Depends:
  ${misc:Depends},
- ${python3:Depends},
  ${shlibs:Depends},
  python3 (>= 3.2),
- python3-checkbox-support,
+ python3-checkbox-support (>= 0.2),
 Recommends: dmidecode, dpkg (>= 1.13), lsb-release, wodim
 Description: CheckBox generic resource jobs provider
  This package provides the generic resource jobs. It is used together
@@ -41,7 +43,7 @@
 
 Package: plainbox-provider-resource-desktop
 Architecture: all
-Depends: plainbox-provider-resource-generic
+Depends: plainbox-provider-resource-generic (= ${binary:Version})
 Recommends: gconf2, x11-xserver-utils, xinput
 Description: CheckBox desktop resource jobs provider
  This package provides the desktop resource jobs. It is used together

=== modified file 'debian/copyright'
--- debian/copyright	2014-03-27 12:44:52 +0000
+++ debian/copyright	2014-04-10 10:22:53 +0000
@@ -19,3 +19,22 @@
  .
  On Debian-based systems the full text of the GPL, version 3, can be found at
  /usr/share/common-licenses/GPL-3.
+
+Files: src/80211_resource.c
+Copyright: 2014, Sylvain Pineau <[e-mail]>
+           2007-2012, Johannes Berg
+           2007, Andy Lutomirski
+           2007, Mike Kershaw
+           2008-2010, Luis R. Rodriguez
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

=== removed directory 'debian/patches'
=== removed file 'debian/patches/provider_version.patch'
--- debian/patches/provider_version.patch	2014-03-27 12:44:52 +0000
+++ debian/patches/provider_version.patch	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Description: Add the provider version for compatibility with plainbox >= 0.5
-Author: Sylvain Pineau <[e-mail]>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/plainbox-resources.provider
-+++ b/plainbox-resources.provider
-@@ -2,3 +2,4 @@
- name = 2013.com.canonical:plainbox-resources
- location = /usr/lib/plainbox-providers-1/plainbox-resources/
- description = PlainBox resources provider
-+version = 1.0

=== removed file 'debian/patches/series'
--- debian/patches/series	2014-03-27 12:44:52 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-provider_version.patch

=== modified file 'debian/rules'
--- debian/rules	2014-04-04 18:35:41 +0000
+++ debian/rules	2014-04-10 10:22:53 +0000
@@ -19,4 +19,5 @@
 
 override_dh_auto_install:
 	cd $(PPA_DISPLACEMENT) && python3 manage.py install \
-		--prefix=/usr --layout=unix --root=$(CURDIR)/debian/plainbox-provider-resource-generic/
+		--prefix=/usr --layout=unix \
+		--root=$(CURDIR)/debian/plainbox-provider-resource-generic/

=== removed file 'debian/source/include-binaries'
--- debian/source/include-binaries	2014-03-27 12:44:52 +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:44:52 +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-10 10:22:53 +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-----