Ubuntu

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

Proposed by Ubuntu Package Importer on 2011-09-02
Status: Rejected
Rejected by: Martin Pitt on 2011-09-08
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/nas/oneiric-201108112112
Merge into: lp:ubuntu/oneiric/nas
Diff against target: 67 lines (+27/-1) 3 files modified (has conflicts)
Text conflict in debian/changelog
Text conflict in debian/control
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/nas/oneiric-201108112112
Reviewer Review Type Date Requested Status
Didier Roche Disapprove on 2011-09-08
Ubuntu branches 2011-09-02 Pending
Review via email: mp+73922@code.launchpad.net

Description of the Change

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)

To post a comment you must log in.
Didier Roche (didrocks) wrote :

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

review: Disapprove
Didier Roche (didrocks) wrote :

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.

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-08-11 13:41:57 +0000
3+++ debian/changelog 2011-09-02 23:12:24 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 nas (1.9.2-8ubuntu1) oneiric; urgency=low
7
8 * Use -n for all gzip invocations, for multiarch. Closes: #637326.
9@@ -16,6 +17,26 @@
10
11 -- Steve McIntyre <93sam@debian.org> Wed, 10 Aug 2011 12:45:41 +0100
12
13+=======
14+nas (1.9.2-8ubuntu1) UNRELEASED; urgency=low
15+
16+ * Use -n for all gzip invocations, for multiarch. Closes: #637326.
17+ * Mark libaudio-dev Multi-Arch: same as well.
18+ * Install AuErrorDB to /usr/lib, not to a multiarch path, since it's
19+ arch-independent; however, libaudio is looking for it in /usr/lib/X11
20+ instead and has for some time, so there's still a bug here...
21+
22+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 11 Aug 2011 11:32:46 -0700
23+
24+nas (1.9.2-8) unstable; urgency=low
25+
26+ * Switch to multi-arch. Closes: #637326
27+ * Add rules for build-arch and build-indep, just depending on "build"
28+ for now - there's nothing major to gain from splitting them.
29+
30+ -- Steve McIntyre <93sam@debian.org> Wed, 10 Aug 2011 12:45:41 +0100
31+
32+>>>>>>> MERGE-SOURCE
33 nas (1.9.2-7) unstable; urgency=low
34
35 * Remove the first attempted fix for the link failure; the updated
36
37=== modified file 'debian/control'
38--- debian/control 2011-08-11 13:41:57 +0000
39+++ debian/control 2011-09-02 23:12:24 +0000
40@@ -1,9 +1,14 @@
41 Source: nas
42 Section: sound
43 Priority: optional
44+<<<<<<< TREE
45 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
46 XSBC-Original-Maintainer: Steve McIntyre <93sam@debian.org>
47 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)
48+=======
49+Maintainer: Steve McIntyre <93sam@debian.org>
50+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)
51+>>>>>>> MERGE-SOURCE
52 Standards-Version: 3.9.2.0
53
54 Package: libaudio2
55
56=== modified file 'debian/rules'
57--- debian/rules 2011-08-11 13:41:57 +0000
58+++ debian/rules 2011-09-02 23:12:24 +0000
59@@ -162,7 +162,7 @@
60 -chmod -Rv u+w debian/nas-bin/usr/share/man
61
62 -chmod -v 644 debian/nas/etc/nas/*
63- chmod -v 644 debian/libaudio2/usr/lib/AuErrorDB
64+ chmod -v 644 debian/libaudio2/usr/lib/$(DEB_HOST_MULTIARCH)/AuErrorDB
65 for dir in $(archpacs); do cp debian/copyright debian/$$dir/usr/share/doc/$$dir; done
66 # Standard package building stuff
67 debconf-updatepo

Subscribers

People subscribed via source and target branches

to all changes: