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

[Ubuntu Package Importer]

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)

Unmerged revisions

26. By Serge Hallyn on 2014-03-27

actually remove .a file from libcgmanager-dev.install

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

25. By Serge Hallyn on 2014-03-27

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

24. By Serge Hallyn on 2014-03-27

install libcgmanager.so

23. By Serge Hallyn on 2014-03-27

* 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 on 2014-03-26

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

21. By Serge Hallyn on 2014-03-25

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

=== 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 @@
+<<<<<<< TREE
 cgmanager (0.23-0ubuntu2) trusty; urgency=medium
 
   * debian/control: fix description of cgmanager-utils package.
@@ -7,6 +8,20 @@
 
  -- Serge Hallyn <[e-mail]>  Tue, 25 Mar 2014 10:15:14 -0500
 
+=======
+cgmanager (0.23-0ubuntu2) trusty; urgency=medium
+
+  * debian/control: fix description of cgmanager-utils package.
+  * debian/*.upstart: hard-code /sbin/ into the exec paths to avoid
+    accidentally running old binaries not shipped with the package.
+  * don't ship a static library
+    - cherrypick 0001-set-ac_disable_static.patch from upstream
+    - debian/libcgmanager-dev.install: remove .a file
+    - debian/libcgmanager0.install: add the .so file (not just its links)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 25 Mar 2014 10:15:14 -0500
+
+>>>>>>> MERGE-SOURCE
 cgmanager (0.23-0ubuntu1) trusty; urgency=medium
 
   * Pull upstream release v0.23

=== 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 @@
-usr/lib/*/libcgmanager.a
 usr/lib/*/pkgconfig/libcgmanager.pc
 usr/include/cgmanager
 usr/lib/*/libcgmanager.so

=== 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 @@
-usr/lib/*/libcgmanager.so.*
+usr/lib/*/libcgmanager.so*

=== 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 @@
+From 0c9fd823e1f6b6fa4b7782aa3261ae925ebca2fb Mon Sep 17 00:00:00 2001
+From: Serge Hallyn <[e-mail]>
+Date: Thu, 27 Mar 2014 16:07:58 -0500
+Subject: [PATCH 1/1] set ac_disable_static
+
+Signed-off-by: Serge Hallyn <[e-mail]>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index ca458d1..a65d502 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,6 +3,7 @@
+ AC_PREREQ(2.61)
+ AC_INIT([cgmanager], [0.23], [[e-mail]])
+ 
++AC_DISABLE_STATIC
+ AC_GNU_SOURCE
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([Makefile libcgmanager.pc.in cgmanager.spec])
+-- 
+1.9.1
+

=== 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 @@
+0001-set-ac_disable_static.patch