Merge lp:~ubuntu-branches/ubuntu/vivid/libsynthesis/vivid-201501071725 into lp:ubuntu/vivid/libsynthesis

Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/vivid/libsynthesis/vivid-201501071725
Merge into: lp:ubuntu/vivid/libsynthesis
Diff against target: 43 lines (+18/-0) (has conflicts)
2 files modified
debian/changelog (+15/-0)
debian/rules (+3/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/vivid/libsynthesis/vivid-201501071725
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+245771@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/vivid/libsynthesis reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/vivid/libsynthesis/vivid-201501071725. 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.

Unmerged revisions

17. By Ken VanDine

Make dh_makeshlibs generate a versioned shlibs file (Closes: #768990)

16. By Ken VanDine

releasing package libsynthesis version 3.4.0.47.5-0ubuntu1

15. By Ken VanDine

New upstream release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-01-06 12:08:51 +0000
3+++ debian/changelog 2015-01-07 17:33:25 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 libsynthesis (3.4.0.47.5-0ubuntu2) vivid; urgency=medium
7
8 * No-change rebuild for new libical
9@@ -10,6 +11,20 @@
10
11 -- Ken VanDine <ken.vandine@canonical.com> Tue, 04 Nov 2014 15:07:42 -0500
12
13+=======
14+libsynthesis (3.4.0.47.5-0ubuntu1) vivid; urgency=medium
15+
16+ * New upstream release.
17+
18+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 04 Nov 2014 15:07:42 -0500
19+
20+libsynthesis (3.4.0.47.4-2) unstable; urgency=medium
21+
22+ * Make dh_makeshlibs generate a versioned shlibs file (Closes: #768990)
23+
24+ -- Tino Mettler <tino+debian@tikei.de> Wed, 12 Nov 2014 10:09:55 +0100
25+
26+>>>>>>> MERGE-SOURCE
27 libsynthesis (3.4.0.47.4-1) unstable; urgency=medium
28
29 * New upstream release
30
31=== modified file 'debian/rules'
32--- debian/rules 2014-11-04 15:07:42 +0000
33+++ debian/rules 2015-01-07 17:33:25 +0000
34@@ -19,6 +19,9 @@
35 override_dh_strip:
36 dh_strip --dbg-package=libsynthesis-dbg
37
38+override_dh_makeshlibs:
39+ dh_makeshlibs -V
40+
41 PATCH_EXPORT_SCRIPT=/usr/share/gitpkg/hooks/quilt-patches-deb-export-hook
42 export-patches:
43 [ ! -r debian/patches ] || \

Subscribers

People subscribed via source and target branches

to all changes: