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

[Zygmunt Krynicki]

  * 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/rules: run autoreconf -i in the provider src/ directory

[lp:~zyga/checkbox/ppa-packaging-plainbox-provider-resource-generic]

4. By Zygmunt Krynicki on 2014-04-04

"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

5. By Zygmunt Krynicki on 2014-04-10

* Automatic PPA build
* 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/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

Unmerged revisions

5. By Zygmunt Krynicki on 2014-04-10

* Automatic PPA build
* 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/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

4. By Zygmunt Krynicki on 2014-04-04

"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

3. By Zygmunt Krynicki on 2014-04-02

"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

2. By Zygmunt Krynicki on 2014-03-27

* debian/rules: remove C sources and headers from jobs directory that get
  shipped with the final package
* debian/control: build-depend on libnl-3-dev and libnl-genl3-dev
* debian/control: depend on libnl-3-200 and libnl-genl-3-200 (needed by
  80211_resource). Not happy that it doesn't get picked up by shlib
  dependencies.

1. By Zygmunt Krynicki on 2014-03-27

Initial import

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-04-04 18:36:53 +0000
@@ -0,0 +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 
+  * 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
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 27 Mar 2014 13:41:47 +0100
+
+plainbox-provider-resource-generic (0.2-2) unstable; urgency=low
+
+  * Patch the plainbox-resources.provider file to add the version number,
+    required by plainbox >= 0.5.
+
+ -- Sylvain Pineau <[e-mail]>  Tue, 28 Jan 2014 13:23:22 +0100
+
+plainbox-provider-resource-generic (0.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #735187)
+
+ -- Sylvain Pineau <[e-mail]>  Mon, 13 Jan 2014 15:27:48 +0100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-04-04 18:36:53 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-04-04 18:36:53 +0000
@@ -0,0 +1,59 @@
+Source: plainbox-provider-resource-generic
+Section: utils
+Priority: optional
+Maintainer: Sylvain Pineau <[e-mail]>
+Uploaders: Debian Python Modules Team <[e-mail]>
+Build-Depends:
+ autoconf,
+ automake,
+ debhelper (>= 9),
+ intltool,
+ libnl-3-dev,
+ libnl-genl-3-dev,
+ pkg-config,
+ 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/
+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,
+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
+ alongside with PlainBox.
+ .
+ Jobs are smallest units of testing that can be performed by PlainBox.
+ All jobs have an unique name. There are many types of jobs, some are fully
+ automated others are fully manual.
+ .
+ Resources are collections of key-value data sets that are generated by
+ special resource jobs. They are extensively used to indicate hardware or
+ software dependencies. For example a bluetooth test may indicate it
+ requires bluetooth hardware and appropriate software packages installed.
+
+Package: plainbox-provider-resource-desktop
+Architecture: all
+Depends: plainbox-provider-resource-generic
+Recommends: gconf2, x11-xserver-utils, xinput
+Description: CheckBox desktop resource jobs provider
+ This package provides the desktop resource jobs. It is used together
+ alongside with PlainBox.
+ .
+ Jobs are smallest units of testing that can be performed by PlainBox.
+ All jobs have an unique name. There are many types of jobs, some are fully
+ automated others are fully manual.
+ .
+ Resources are collections of key-value data sets that are generated by
+ special resource jobs. They are extensively used to indicate hardware or
+ software dependencies. For example a bluetooth test may indicate it
+ requires bluetooth hardware and appropriate software packages installed.
+ .
+ NOTE: this is an empty metapackage

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-04-04 18:36:53 +0000
@@ -0,0 +1,21 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: plainbox-provider-resource-generic
+Source: https://launchpad.net/checkbox
+
+Files: *
+Copyright: Copyright 2007-2013 Canonical Ltd.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3,
+ 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
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian-based systems the full text of the GPL, version 3, can be found at
+ /usr/share/common-licenses/GPL-3.

=== added directory 'debian/patches'
=== added file 'debian/patches/provider_version.patch'
--- debian/patches/provider_version.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/provider_version.patch	2014-04-04 18:36:53 +0000
@@ -0,0 +1,11 @@
+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

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-04-04 18:36:53 +0000
@@ -0,0 +1,1 @@
+provider_version.patch

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-04-04 18:36:53 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+PPA_DISPLACEMENT=providers/plainbox-provider-resource-generic
+
+%:
+	dh $@ --sourcedirectory=$(PPA_DISPLACEMENT)
+
+override_dh_auto_clean:
+	cd $(PPA_DISPLACEMENT) && python3 manage.py clean
+
+override_dh_auto_configure:
+	cd $(PPA_DISPLACEMENT)/src && autoreconf -i
+
+override_dh_auto_build:
+	cd $(PPA_DISPLACEMENT) && python3 manage.py build
+	cd $(PPA_DISPLACEMENT) && python3 manage.py i18n
+
+override_dh_auto_test:
+	cd $(PPA_DISPLACEMENT) && python3 manage.py validate 
+
+override_dh_auto_install:
+	cd $(PPA_DISPLACEMENT) && python3 manage.py install \
+		--prefix=/usr --layout=unix --root=$(CURDIR)/debian/plainbox-provider-resource-generic/

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-04-04 18:36:53 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== added file 'debian/source/include-binaries'
--- debian/source/include-binaries	1970-01-01 00:00:00 +0000
+++ debian/source/include-binaries	2014-04-04 18:36:53 +0000
@@ -0,0 +1,1 @@
+debian/upstream-signing-key.pgp

=== added file 'debian/upstream-signing-key.pgp'
Binary files debian/upstream-signing-key.pgp	1970-01-01 00:00:00 +0000 and debian/upstream-signing-key.pgp	2014-04-04 18:36:53 +0000 differ