diff -Nru cgmanager-0.24/debian/changelog cgmanager-0.24/debian/changelog
--- cgmanager-0.24/debian/changelog	2014-03-31 19:01:45.000000000 +0000
+++ cgmanager-0.24/debian/changelog	2014-04-02 21:20:36.000000000 +0000
@@ -1,3 +1,19 @@
+cgmanager (0.24-0ubuntu2) trusty; urgency=medium
+
+  [ Serge Hallyn ]
+  * move libraries from /usr/lib into /lib (LP: #1301544)
+  * debian/control:
+    - remove ${shlibs:Depends} from cgmanager-utils, cgmanager-tests and
+      libcgmanager-devel
+  * Makefile.am:
+    - add -shared to AM_LDFLAGS
+    - add AM_LDFLAGS to libcgmanager's ldflags
+
+  [ Stéphane Graber ]
+  * Add adt support.
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Wed, 02 Apr 2014 13:59:03 -0500
+
 cgmanager (0.24-0ubuntu1) trusty; urgency=medium
 
   * Sync upstream relase v0.24
diff -Nru cgmanager-0.24/debian/control cgmanager-0.24/debian/control
--- cgmanager-0.24/debian/control	2014-03-31 18:49:40.000000000 +0000
+++ cgmanager-0.24/debian/control	2014-04-02 19:55:15.000000000 +0000
@@ -17,6 +17,7 @@
 Standards-Version: 3.9.5
 Homepage: http://cgmanager.linuxcontainers.org/
 Vcs-Git: git://github.com/cgmanager/cgmanager
+XS-Testsuite: autopkgtest
 
 Package: cgmanager
 Architecture: any
@@ -32,7 +33,7 @@
 
 Package: cgmanager-utils
 Architecture: any
-Depends: cgmanager, dbus, ${shlibs:Depends}, ${misc:Depends}
+Depends: cgmanager, dbus, ${misc:Depends}
 Description: Central cgroup manager daemon (utilities)
  cgmanager provides a central cgroup manager daemon and a
  per-namespace manager proxy, allowing users and programs
@@ -42,7 +43,7 @@
 
 Package: cgmanager-tests
 Architecture: any
-Depends: cgmanager, ${shlibs:Depends}, ${misc:Depends}
+Depends: cgmanager, ${misc:Depends}
 Description: Central cgroup manager daemon (tests)
  cgmanager provides a central cgroup manager daemon and a
  per-namespace manager proxy, allowing users and programs
@@ -65,8 +66,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${misc:Depends},
  libcgmanager0  (= ${binary:Version}),
  libdbus-1-dev,
  libnih-dbus-dev
diff -Nru cgmanager-0.24/debian/libcgmanager0.install cgmanager-0.24/debian/libcgmanager0.install
--- cgmanager-0.24/debian/libcgmanager0.install	2014-03-31 18:49:40.000000000 +0000
+++ cgmanager-0.24/debian/libcgmanager0.install	2014-04-02 18:58:48.000000000 +0000
@@ -1 +1 @@
-usr/lib/*/libcgmanager.so.*
+lib/*/libcgmanager.so.*
diff -Nru cgmanager-0.24/debian/libcgmanager-dev.install cgmanager-0.24/debian/libcgmanager-dev.install
--- cgmanager-0.24/debian/libcgmanager-dev.install	2014-03-31 18:49:40.000000000 +0000
+++ cgmanager-0.24/debian/libcgmanager-dev.install	2014-04-02 21:33:08.000000000 +0000
@@ -1,4 +1,3 @@
-usr/lib/*/libcgmanager.a
 usr/lib/*/pkgconfig/libcgmanager.pc
 usr/include/cgmanager
 usr/lib/*/libcgmanager.so
diff -Nru cgmanager-0.24/debian/patches/makefile-shared cgmanager-0.24/debian/patches/makefile-shared
--- cgmanager-0.24/debian/patches/makefile-shared	1970-01-01 00:00:00.000000000 +0000
+++ cgmanager-0.24/debian/patches/makefile-shared	2014-04-02 19:39:28.000000000 +0000
@@ -0,0 +1,22 @@
+Index: cgmanager-0.24/Makefile.am
+===================================================================
+--- cgmanager-0.24.orig/Makefile.am	2014-04-02 14:31:41.000000000 -0500
++++ cgmanager-0.24/Makefile.am	2014-04-02 14:39:25.059601582 -0500
+@@ -9,7 +9,7 @@ LIBCGMANAGER_VERSION_DOTTED = $(VERSION_
+ 
+ AM_CFLAGS = -Wall -ggdb -D_GNU_SOURCE -DSBINDIR=\"$(SBINDIR)\"
+ AM_CFLAGS += $(DBUS_CFLAGS) $(NIH_CFLAGS) $(NIH_DBUS_CFLAGS)
+-AM_LDFLAGS = $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS)
++AM_LDFLAGS = $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS) -shared
+ client_files_OUTPUTS = cgmanager-client.c cgmanager-client.h
+ manager_files_OUTPUTS = org.linuxcontainers.cgmanager.c org.linuxcontainers.cgmanager.h
+ 
+@@ -81,7 +81,7 @@ libcgmanager_la_SOURCES = \
+ 	org.linuxcontainers.cgmanager.xml
+ libcgmanager_la_CFLAGS = -fPIC -DPIC $(DBUS_CFLAGS) $(NIH_CFLAGS) $(NIH_DBUS_CFLAGS)
+ libcgmanager_la_LDFLAGS = -E \
+-	-version-info $(LIBCGMANAGER_VERSION)
++	-version-info $(LIBCGMANAGER_VERSION) $(AM_LDFLAGS)
+ libcgmanager_la_LIBADD = \
+ 	$(DBUS_LIBS) $(NIH_CFLAGS) $(NIH_DBUS_CFLAGS)
+ 
diff -Nru cgmanager-0.24/debian/patches/series cgmanager-0.24/debian/patches/series
--- cgmanager-0.24/debian/patches/series	2014-03-31 18:49:40.000000000 +0000
+++ cgmanager-0.24/debian/patches/series	2014-04-02 19:34:38.000000000 +0000
@@ -0,0 +1 @@
+makefile-shared
diff -Nru cgmanager-0.24/debian/rules cgmanager-0.24/debian/rules
--- cgmanager-0.24/debian/rules	2014-03-31 18:49:40.000000000 +0000
+++ cgmanager-0.24/debian/rules	2014-04-02 21:20:17.000000000 +0000
@@ -21,6 +21,14 @@
 	dh_auto_configure -- --exec-prefix=
 
 override_dh_install:
+	mkdir -p $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)
+	mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcgmanager.so.* \
+		$(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/
+	for i in $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcgmanager.so ; do \
+		dest=$$(readlink $$i) ; \
+		rm -f $$i ; \
+		ln -s /lib/$(DEB_HOST_MULTIARCH)/$$dest $$i ; \
+	done
 	dh_install
 	dh_installinit -pcgmanager --name=cgmanager
 	dh_installinit -pcgmanager --name=cgproxy
diff -Nru cgmanager-0.24/debian/tests/control cgmanager-0.24/debian/tests/control
--- cgmanager-0.24/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ cgmanager-0.24/debian/tests/control	2014-04-02 19:47:33.000000000 +0000
@@ -0,0 +1,3 @@
+Tests: exercise
+Depends: cgmanager, dbus, @
+Restrictions: needs-root allow-stderr
diff -Nru cgmanager-0.24/debian/tests/exercise cgmanager-0.24/debian/tests/exercise
--- cgmanager-0.24/debian/tests/exercise	1970-01-01 00:00:00.000000000 +0000
+++ cgmanager-0.24/debian/tests/exercise	2014-04-02 19:47:56.000000000 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+cd /usr/share/cgmanager/tests/
+./runtests.sh