Merge lp:~ubuntu-branches/ubuntu/oneiric/nas/oneiric-201108112112 into lp:ubuntu/oneiric/nas

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/nas reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/nas/oneiric-201108112112. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

[Didier Roche-Tolomelli (didrocks)]

ok, missing a rev, was a valid one, the generated branch reflect the archive though

review: Disapprove

[Didier Roche-Tolomelli (didrocks)]

missing a revision, seems the importer skipped one.

review: Disapprove

Unmerged revisions

12. By Steve Langasek on 2011-08-11

merge latest version from unstable

11. By Steve Langasek on 2011-08-11

Build for multiarch.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-11 13:41:57 +0000
+++ debian/changelog	2011-09-02 23:12:24 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 nas (1.9.2-8ubuntu1) oneiric; urgency=low
 
   * Use -n for all gzip invocations, for multiarch.  Closes: #637326.
@@ -16,6 +17,26 @@
 
  -- Steve McIntyre <[e-mail]>  Wed, 10 Aug 2011 12:45:41 +0100
 
+=======
+nas (1.9.2-8ubuntu1) UNRELEASED; urgency=low
+
+  * Use -n for all gzip invocations, for multiarch.  Closes: #637326.
+  * Mark libaudio-dev Multi-Arch: same as well.
+  * Install AuErrorDB to /usr/lib, not to a multiarch path, since it's
+    arch-independent; however, libaudio is looking for it in /usr/lib/X11
+    instead and has for some time, so there's still a bug here...
+
+ -- Steve Langasek <[e-mail]>  Thu, 11 Aug 2011 11:32:46 -0700
+
+nas (1.9.2-8) unstable; urgency=low
+
+  * Switch to multi-arch. Closes: #637326
+  * Add rules for build-arch and build-indep, just depending on "build"
+    for now - there's nothing major to gain from splitting them.
+
+ -- Steve McIntyre <[e-mail]>  Wed, 10 Aug 2011 12:45:41 +0100
+
+>>>>>>> MERGE-SOURCE
 nas (1.9.2-7) unstable; urgency=low
 
   * Remove the first attempted fix for the link failure; the updated
 
=== modified file 'debian/control'
--- debian/control	2011-08-11 13:41:57 +0000
+++ debian/control	2011-09-02 23:12:24 +0000
@@ -1,9 +1,14 @@
 Source: nas
 Section: sound
 Priority: optional
+<<<<<<< TREE
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Steve McIntyre <[e-mail]>
 Build-Depends: autotools-dev, libxau-dev, libsm-dev, libice-dev, libx11-dev, libxt-dev, libxaw7-dev, xutils-dev, bison, flex, file, po-debconf, dpkg-dev (>= 1.16.0)
+=======
+Maintainer: Steve McIntyre <[e-mail]>
+Build-Depends: autotools-dev, libxau-dev, libsm-dev, libice-dev, libx11-dev, libxt-dev, libxaw7-dev, xutils-dev, bison, flex, file, po-debconf, dpkg-dev (>= 1.16.0)
+>>>>>>> MERGE-SOURCE
 Standards-Version: 3.9.2.0
 
 Package: libaudio2
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-11 13:41:57 +0000
+++ debian/rules	2011-09-02 23:12:24 +0000
@@ -162,7 +162,7 @@
 	-chmod -Rv u+w debian/nas-bin/usr/share/man
 
 	-chmod -v 644 debian/nas/etc/nas/* 
-	chmod -v 644 debian/libaudio2/usr/lib/AuErrorDB
+	chmod -v 644 debian/libaudio2/usr/lib/$(DEB_HOST_MULTIARCH)/AuErrorDB
 	for dir in $(archpacs); do cp debian/copyright debian/$$dir/usr/share/doc/$$dir; done
 	# Standard package building stuff
 	debconf-updatepo