Merge lp:~james-w/linaro-image-tools/hwpack-packaging into lp:linaro-image-tools/11.11

[James Westby]

Hi,

This adds the hardware pack code the the packaging, so that everyone
can make use of it.

I added a second package for the library to comply better with the
python policy.

The setup.py is very minimal, but it's all that's really needed for this.

Thanks,

James

[Guilherme Salgado (salgado)]

This looks good to me (although I'm no packaging expert), but I think we need to add python-argparse to python-hwpack's Build-Depends and Depends, no? Without that I wasn't able to build

review: Approve (code)

[James Westby (james-w)]

On Mon, 27 Sep 2010 17:23:39 -0000, Guilherme Salgado <email address hidden> wrote:
> Review: Approve code
> This looks good to me (although I'm no packaging expert), but I think
> we need to add python-argparse to python-hwpack's Build-Depends and
> Depends, no? Without that I wasn't able to build

Good point, I missed it because of a misplaced grep.

Thanks,

James

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2010-09-24 20:41:47 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native=True

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-15 23:44:53 +0000
+++ debian/changelog	2010-09-24 20:41:47 +0000
@@ -11,8 +11,7 @@
     itself can run as non-root as intended.
 
   [ James Westby ]
-  * Add a linaro-hwpack-creation script for the creation of hardware packs.
-    Not yet installed in the binary packages.
+  * Add a linaro-hwpack-create script for the creation of hardware packs.
 
  -- Steve Langasek <[e-mail]>  Tue, 14 Sep 2010 17:01:49 -0700
 

=== modified file 'debian/control'
--- debian/control	2010-09-07 08:52:42 +0000
+++ debian/control	2010-09-24 20:41:47 +0000
@@ -1,10 +1,11 @@
 Source: linaro-image-tools
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~), python-all, python-apt, python-testtools
 Standards-Version: 3.9.1
 Maintainer: Linaro Developers <[e-mail]>
 Vcs-Bzr: 
+XS-Python-Version: >=2.5
 
 Package: linaro-image-tools
 Architecture: all
@@ -13,10 +14,22 @@
          uuid-runtime,
          wget,
          uboot-mkimage,
-         realpath
+         realpath,
+         python,
+         python-hwpack
 Description: collection of tools to work with Linaro images
  This package offers a set of tools for use with Linaro images.
  .
  The provided linaro-media-create command allows writing Linaro images
  to a SD card, or generating an image file which you can boot in QEMU.
 
+Package: python-hwpack
+Architecture: all
+Section: python
+Depends: ${python:Depends}, python-apt, ${misc:Depends}
+Description: python library for the creation of hardware packs
+ Hardware packs allow for the distribution of packages to be combined with
+ an image to create a root filesystem at a later date.
+ .
+ This package provides a python library to aid with the creation of hardware
+ packs.

=== modified file 'debian/linaro-image-tools.install'
--- debian/linaro-image-tools.install	2010-08-31 20:50:14 +0000
+++ debian/linaro-image-tools.install	2010-09-24 20:41:47 +0000
@@ -1,1 +1,3 @@
 linaro-media-create usr/bin
+linaro-hwpack-install usr/bin
+linaro-hwpack-create usr/bin

=== added file 'debian/python-hwpack.install'
--- debian/python-hwpack.install	1970-01-01 00:00:00 +0000
+++ debian/python-hwpack.install	2010-09-24 20:41:47 +0000
@@ -0,0 +1,1 @@
+usr/lib/python*/dist-packages/hwpack

=== modified file 'debian/rules'
--- debian/rules	2010-08-31 20:50:14 +0000
+++ debian/rules	2010-09-24 20:41:47 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $*
+	dh --buildsystem=python_distutils --with-addon=python-support $*
 
+override_dh_auto_test:
+	python -m testtools.run hwpack.tests.test_suite

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2010-09-24 20:41:47 +0000
@@ -0,0 +1,24 @@
+from distutils.core import setup
+import os
+import subprocess
+
+
+def get_version():
+    proc = subprocess.Popen(
+        ["dpkg-parsechangelog"],
+        cwd=os.path.abspath(os.path.dirname(__file__)),
+        stdout=subprocess.PIPE)
+    output, _ = proc.communicate()
+    version = None
+    for line in output.split("\n"):
+        if line.startswith("Version: "):
+            version = line.split(" ", 1)[1].strip()
+    assert version is not None, (
+        "Couldn't determine version number from debian changelog")
+
+
+setup(
+        name="hwpack",
+        version=get_version(),
+        packages=["hwpack"],
+     )