Merge lp:~lool/linaro-image-tools/brown-paper-bag-0.4.1.0.4.1

4 files changed, 25 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 01c55a7..8e6a544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+linaro-image-tools (0.4.1) natty; urgency=low
+
+  * Brown paperbag release.
+  * Sort files in commands ran by linaro_media_create.rootfs.move_contents()
+    as this breaks the testsuite on some filesystems.
+  * Disable pkgbinarymangler when running the testsuite as it might cause some
+    stderr output which confuses it.
+  * Uppercase Python in python-linaro-media-create long description.
+  * Drop util-linux from Depends as it's Essential.
+  * Update Build-Deps for testsuite requirements (qemu-kvm for qemu-img,
+    u-boot | uboot-mkimage for mkimage and command-not-found for
+    CommandNotFound) and recommend command-not-found to locate the package of
+    missing commands.
+
+ -- Loïc Minier <loic.minier@linaro.org>  Wed, 19 Jan 2011 19:32:38 +0100
+
 linaro-image-tools (0.4) natty; urgency=low
 
   IMPORTANT: this version of linaro-image-tools breaks support for 10.05
diff --git a/debian/control b/debian/control
index 89e5587..27a8a4a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,10 @@ Build-Depends: debhelper (>= 7.0.50~),
                python-apt,
                python-parted,
                python-testtools (>> 0.9.5),
-               python-argparse
+               python-argparse,
+               qemu-kvm,
+               command-not-found,
+               u-boot-tools | uboot-mkimage
 Standards-Version: 3.9.1
 Maintainer: Linaro Developers <linaro-dev@lists.linaro.org>
 Vcs-Bzr: http://bazaar.launchpad.net/~linaro-maintainers/linaro-image-tools/linaro-image-tools
@@ -18,7 +21,6 @@ XS-Python-Version: >= 2.5
 Package: linaro-image-tools
 Architecture: all
 Depends: ${misc:Depends},
-         util-linux,
          parted,
          uuid-runtime,
          dosfstools,
@@ -32,7 +34,8 @@ Depends: ${misc:Depends},
          python-parted
 Recommends: qemu-kvm-extras-static,
             qemu-kvm,
-            btrfs-tools
+            btrfs-tools,
+            command-not-found
 Description: collection of tools to work with Linaro images
  This package offers a set of tools for use with Linaro images.
  .
@@ -61,5 +64,5 @@ Description: Python library for the creation of Linaro bootable media
  Linaro images are generated by combining generic tarballs with
  hardware-specific packs (hwpacks).
  .
- This package provides a python library to generate Linaro images and write
+ This package provides a Python library to generate Linaro images and write
  them to SD cards or image files that you can be boot in QEMU.
diff --git a/debian/rules b/debian/rules
index ab9d151..6de0895 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@
 override_dh_auto_test:
 	# XXX: The test-suite currently fails on Lucid. What can we do about
 	# it?
-	python -m testtools.run tests.test_suite
+	NO_PKG_MANGLE=1 python -m testtools.run tests.test_suite
diff --git a/linaro_media_create/rootfs.py b/linaro_media_create/rootfs.py
index 3c8a721..8faf825 100644
--- a/linaro_media_create/rootfs.py
+++ b/linaro_media_create/rootfs.py
@@ -79,7 +79,7 @@ def move_contents(from_, root_disk):
     assert os.path.isdir(from_), "%s is not a directory" % from_
     files = glob.glob(os.path.join(from_, '*'))
     mv_cmd = ['mv']
-    mv_cmd.extend(files)
+    mv_cmd.extend(sorted(files))
     mv_cmd.append(root_disk)
     cmd_runner.run(mv_cmd, as_root=True).wait()