Merge lp:~logan/ubuntu/quantal/dpkg-cross/debian-merge into lp:ubuntu/quantal/dpkg-cross

[Logan Rosen]

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-17 14:36:22 +0000
+++ debian/changelog	2012-08-15 05:15:27 +0000
@@ -1,3 +1,27 @@
+dpkg-cross (2.6.7ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Cache ac_cv_func_malloc_0_nonnull=yes and
+      ac_cv_func_realloc_0_nonnull=yes globally.
+    - Handle datarootdir specially in .pc files; it should keep the original
+      prefix.
+    - Handle lines containing '${exec_prefix}/bin' specially in .pc files;
+      these are normally development tools, so should keep the original
+      prefix.  (For example, orbit_idl in ORBit-2.0.pc.)
+    - Applied patch from Thibaut Girka:
+      Assume multiarch if encoutering a /usr/include/$crosstype/ file too.
+      This fixes issues with arch-qualified include files being moved to
+      “doubly-qualified” paths.
+
+ -- Logan Rosen <[e-mail]>  Wed, 15 Aug 2012 01:10:10 -0400
+
+dpkg-cross (2.6.7) unstable; urgency=low
+
+  * Confine the postrm to only removing the config files
+    originally installed by dpkg-cross (Closes: #681755)
+
+ -- Neil Williams <[e-mail]>  Wed, 25 Jul 2012 20:50:50 +0100
+
 dpkg-cross (2.6.6ubuntu1) quantal; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2012-05-17 14:36:22 +0000
+++ debian/control	2012-08-15 05:15:27 +0000
@@ -1,7 +1,8 @@
 Source: dpkg-cross
 Section: utils
 Priority: extra
-Maintainer: Debian Embedded Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Embedded Group <[e-mail]>
 Uploaders: Wartan Hachaturow <[e-mail]>,
  Alexander Shishkin <[e-mail]>,
  Nikita V. Youshchenko <[e-mail]>,

=== modified file 'debian/postrm'
--- debian/postrm	2008-03-09 14:27:00 +0000
+++ debian/postrm	2012-08-15 05:15:27 +0000
@@ -22,7 +22,11 @@
     ;;
 
     purge)
-        rm -rf /etc/dpkg-cross
+        rm -rf /etc/dpkg-cross/cross-config*
+        rm -rf /etc/dpkg-cross/cmake/
+        rm -rf /etc/dpkg-cross/multiarch-cross.d/
+        rm -rf /etc/dpkg-cross/cross-compile.sample
+        rm -rf /etc/dpkg-cross/cross-compile
         if [ "$1" = "purge" ] && [ -e /usr/share/debconf/confmodule ]; then
             # Source debconf library.
             . /usr/share/debconf/confmodule