Merge lp:~ubuntu-branches/ubuntu/natty/debhelper/natty-201103250238 into lp:ubuntu/natty/debhelper

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/debhelper now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/debhelper/natty-201103250238. A merge should be performed if necessary.

Unmerged revisions

86. By Steve Langasek on 2011-03-15

tidy up the changelog

85. By Steve Langasek on 2011-03-15

releasing version 8.1.2ubuntu3

84. By Steve Langasek on 2011-03-15

Revert the patch for env variable expansion based on feedback from Joey
Hess. It appears this patch is not as far along the path to upstream
inclusion as I thought it was; sorry for the confusion, Joey.

83. By Steve Langasek on 2011-03-15

releasing version 8.1.2ubuntu2

82. By Steve Langasek on 2011-03-15

bump dpkg-dev build-dep to the *real* final Ubuntu version

81. By Steve Langasek on 2011-03-15

bump the env var expansion to compat level 9; we don't need it except for
multiarch and it's not committed upstream yet, so don't press our luck

80. By Steve Langasek on 2011-03-15

update dpkg-dev dependency to final Ubuntu multiarch version

79. By Steve Langasek on 2011-03-15

fix up changelog for upload to natty

78. By Steve Langasek on 2011-03-12

Merge upstream refinements to the multiarch patch.

77. By Steve Langasek on 2011-03-11

releasing version 8.1.2ubuntu1+multiarch.3

=== modified file 'debhelper.pod'
--- debhelper.pod	2011-03-21 15:59:12 +0000
+++ debhelper.pod	2011-03-28 07:18:48 +0000
@@ -503,6 +503,22 @@
 
 =back
 
+=item v9
+
+This compatability level is still open for development; use with caution.
+
+Changes from v8 are:
+
+=over 8
+
+=item - 
+
+Multiarch support. In particular, B<dh_auto_configure> passes
+multiarch directories to autoconf in --libdir and --libexecdir,
+while B<dh_makeshlibs> detects packages containing multiarch
+directories and sets a Pre-Dependency on multiarch-support in
+${misc:Pre-Depends}
+
 =item v8
 
 This is the recommended mode of operation.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-21 15:59:12 +0000
+++ debian/changelog	2011-03-28 07:18:48 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 debhelper (8.1.2ubuntu4) natty; urgency=low
 
   * debhelper.pod: v9 info was added in the wrong place by mistake; move it
@@ -34,6 +35,37 @@
 
  -- Steve Langasek <[e-mail]>  Mon, 14 Mar 2011 20:20:18 -0700
 
+=======
+debhelper (8.1.2ubuntu3) natty; urgency=low
+
+  * Revert the patch for env variable expansion based on feedback from Joey
+    Hess.  It appears this patch is not as far along the path to upstream
+    inclusion as I thought it was; sorry for the misunderstanding, Joey.
+
+ -- Steve Langasek <[e-mail]>  Tue, 15 Mar 2011 13:12:50 -0700
+
+debhelper (8.1.2ubuntu2) natty; urgency=low
+
+  * multiarch support.  FFe LP: #733501.
+  * merge changes from upstream git:
+    - Started work on Debhelper v9. It is still experimental, and more
+      changes may be added to that mode.
+    - Support multiarch in v9. Thanks, Steve Langasek. Closes: #617761
+    - dh_auto_configure: Support multiarch in v9 by passing multiarch
+      directories to --libdir and --libexecdir.
+    - dh_makeshlibs: Detect packages using multiarch directories and
+      make ${misc:Pre-Depends} expand to multiarch-support.
+    - Depend on dpkg-dev (>= 1.16.0) for multiarch support. Note to
+      backporters: If you remove that dependency, debhelper will fall back
+      to not doing multiarch stuff in v9 mode, which is probably what you
+      want.
+  * Add Daniel Silverstone's patch to give us env variable expansions in
+    .install/.link files, needed in order to let us use DEB_HOST_MULTIARCH
+    without cumbersome .in files everywhere.  Closes: #614731.
+
+ -- Steve Langasek <[e-mail]>  Mon, 14 Mar 2011 20:20:18 -0700
+
+>>>>>>> MERGE-SOURCE
 debhelper (8.1.2ubuntu1) natty; urgency=low
 
   * Merge with Debian (LP: #719150); remaining changes: