Ubuntu
cgmanager package

Merge lp:~ubuntu-branches/ubuntu/trusty/cgmanager/trusty-201403280200 into lp:ubuntu/trusty/cgmanager

  1. Trusty (14.04)
  2. trusty-201403280200
  3. Merge into trusty
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/trusty/cgmanager/trusty-201403280200
Merge into: lp:ubuntu/trusty/cgmanager
Diff against target: 81 lines (+42/-2) (has conflicts)
5 files modified
debian/changelog (+15/-0)
debian/libcgmanager-dev.install (+0/-1)
debian/libcgmanager0.install (+1/-1)
debian/patches/0001-set-ac_disable_static.patch (+25/-0)
debian/patches/series (+1/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/trusty/cgmanager/trusty-201403280200
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+213183@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/trusty/cgmanager reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/cgmanager/trusty-201403280200. 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

26. By Serge Hallyn

actually remove .a file from libcgmanager-dev.install

(i'd done it in another tree, not this one)

25. By Serge Hallyn

debian/libcgmanager0.install: add the .so file (not just its links)

24. By Serge Hallyn

install libcgmanager.so

23. By Serge Hallyn

* don't ship a static library
  - cherrypick 0001-set-ac_disable_static.patch from upstream
  - debian/libcgmanager-dev.install: remove .a file

22. By Serge Hallyn

debian/*.upstart: hard-code /sbin/ into the exec paths to avoid
accidentally running old binaries not shipped with the package.

21. By Serge Hallyn

debian/control: fix description of cgmanager-utils package.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-25 10:15:14 +0000
+++ debian/changelog 2014-03-28 02:09:21 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1cgmanager (0.23-0ubuntu2) trusty; urgency=medium2cgmanager (0.23-0ubuntu2) trusty; urgency=medium
23
3 * debian/control: fix description of cgmanager-utils package.4 * debian/control: fix description of cgmanager-utils package.
@@ -7,6 +8,20 @@
78
8 -- Serge Hallyn <serge.hallyn@ubuntu.com> Tue, 25 Mar 2014 10:15:14 -05009 -- Serge Hallyn <serge.hallyn@ubuntu.com> Tue, 25 Mar 2014 10:15:14 -0500
910
11=======
12cgmanager (0.23-0ubuntu2) trusty; urgency=medium
13
14 * debian/control: fix description of cgmanager-utils package.
15 * debian/*.upstart: hard-code /sbin/ into the exec paths to avoid
16 accidentally running old binaries not shipped with the package.
17 * don't ship a static library
18 - cherrypick 0001-set-ac_disable_static.patch from upstream
19 - debian/libcgmanager-dev.install: remove .a file
20 - debian/libcgmanager0.install: add the .so file (not just its links)
21
22 -- Serge Hallyn <serge.hallyn@ubuntu.com> Tue, 25 Mar 2014 10:15:14 -0500
23
24>>>>>>> MERGE-SOURCE
10cgmanager (0.23-0ubuntu1) trusty; urgency=medium25cgmanager (0.23-0ubuntu1) trusty; urgency=medium
1126
12 * Pull upstream release v0.2327 * Pull upstream release v0.23
1328
=== modified file 'debian/libcgmanager-dev.install'
--- debian/libcgmanager-dev.install 2014-03-25 10:15:14 +0000
+++ debian/libcgmanager-dev.install 2014-03-28 02:09:21 +0000
@@ -1,4 +1,3 @@
1usr/lib/*/libcgmanager.a
2usr/lib/*/pkgconfig/libcgmanager.pc1usr/lib/*/pkgconfig/libcgmanager.pc
3usr/include/cgmanager2usr/include/cgmanager
4usr/lib/*/libcgmanager.so3usr/lib/*/libcgmanager.so
54
=== modified file 'debian/libcgmanager0.install'
--- debian/libcgmanager0.install 2014-01-20 18:46:11 +0000
+++ debian/libcgmanager0.install 2014-03-28 02:09:21 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/libcgmanager.so.*1usr/lib/*/libcgmanager.so*
22
=== added file 'debian/patches/0001-set-ac_disable_static.patch'
--- debian/patches/0001-set-ac_disable_static.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/0001-set-ac_disable_static.patch 2014-03-28 02:09:21 +0000
@@ -0,0 +1,25 @@
1From 0c9fd823e1f6b6fa4b7782aa3261ae925ebca2fb Mon Sep 17 00:00:00 2001
2From: Serge Hallyn <serge.hallyn@ubuntu.com>
3Date: Thu, 27 Mar 2014 16:07:58 -0500
4Subject: [PATCH 1/1] set ac_disable_static
5
6Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
7---
8 configure.ac | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/configure.ac b/configure.ac
12index ca458d1..a65d502 100644
13--- a/configure.ac
14+++ b/configure.ac
15@@ -3,6 +3,7 @@
16 AC_PREREQ(2.61)
17 AC_INIT([cgmanager], [0.23], [cgmanager-devel@lists.linuxcontainers.org])
18
19+AC_DISABLE_STATIC
20 AC_GNU_SOURCE
21 AC_CONFIG_HEADERS([config.h])
22 AC_CONFIG_FILES([Makefile libcgmanager.pc.in cgmanager.spec])
23--
241.9.1
25
026
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-03-24 11:56:04 +0000
+++ debian/patches/series 2014-03-28 02:09:21 +0000
@@ -0,0 +1,1 @@
10001-set-ac_disable_static.patch

Subscribers

People subscribed via source and target branches

to all changes: