On Wed, Apr 30, 2014 at 04:14:37PM +0200, Jelmer Vernooij wrote:
Hi Michael,
Hi Jelmer,
[..]
3. move libpytalloc-util.so.2 into its own libtalloc2-python (or
similar) package
I think this is the most reasonable option, though it's a pity we'd have to
package something so small separately.
[..]
I'm happy to work on a patch to get rid of the python-talloc
dependency and unblock the multiarch upgrade, but I would like to hear
from you what option you prefer.
Hope this helps,
It did, thanks a bunch! Attached is a small patch for option 3 that
seperates the libpytalloc-util.so.2 into a new libtalloc2-pylibs
package.
Feedback, especially on the package name would be great as I would
like to apply this on Ubuntu as well and don't want to diverge on the
packagename of course :)
Cheers,
Michael
diff -Nru talloc-2.1.0/debian/changelog talloc-2.1.0/debian/changelog
--- talloc-2.1.0/debian/changelog 2014-04-21 14:47:47.0 +0200
+++ talloc-2.1.0/debian/changelog 2014-05-05 08:10:02.0 +0200
@@ -1,3 +1,12 @@
+talloc (2.1.0-3) unstable; urgency=low
+
+ * debian/control:
+- move libpytalloc-util.so.2 into its own library package
+ to support multiarch upgrades of e.g. libsmbclient
+ (LP: #1308657)
+
+ -- Michael Vogt michael.v...@ubuntu.com Mon, 05 May 2014 08:07:41 +0200
+
talloc (2.1.0-2) unstable; urgency=medium
* Change maintainer to Samba Debian maintainers.
diff -Nru talloc-2.1.0/debian/control talloc-2.1.0/debian/control
--- talloc-2.1.0/debian/control 2014-04-21 14:47:47.0 +0200
+++ talloc-2.1.0/debian/control 2014-05-05 08:23:54.0 +0200
@@ -42,6 +42,20 @@
.
This package contains the development files.
+Package: libtalloc2-pylibs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: libs
+Breaks: python-talloc ( 2.1.0-3)
+Replaces: python-talloc ( 2.1.0-3)
+Description: hierarchical pool based memory allocator - Python helper library
+ A hierarchical pool based memory allocator with destructors. It uses
+ reference counting to determine when memory should be freed.
+ .
+ This package contains the shared libraries for Python support.
+
Package: python-talloc
Pre-Depends: ${misc:Pre-Depends}
Architecture: any
diff -Nru talloc-2.1.0/debian/libtalloc2-pylibs.install
talloc-2.1.0/debian/libtalloc2-pylibs.install
--- talloc-2.1.0/debian/libtalloc2-pylibs.install 1970-01-01
01:00:00.0 +0100
+++ talloc-2.1.0/debian/libtalloc2-pylibs.install 2014-05-05
08:14:53.0 +0200
@@ -0,0 +1 @@
+usr/lib/*/libpytalloc-util.so.*
diff -Nru talloc-2.1.0/debian/libtalloc2-pylibs.symbols
talloc-2.1.0/debian/libtalloc2-pylibs.symbols
--- talloc-2.1.0/debian/libtalloc2-pylibs.symbols 1970-01-01
01:00:00.0 +0100
+++ talloc-2.1.0/debian/libtalloc2-pylibs.symbols 2014-05-05
08:14:44.0 +0200
@@ -0,0 +1,11 @@
+libpytalloc-util.so.2 #PACKAGE# #MINVER#
+ PYTALLOC_UTIL_2.0.6@PYTALLOC_UTIL_2.0.6 2.0.6
+ PYTALLOC_UTIL_2.0.7@PYTALLOC_UTIL_2.0.7 2.0.7
+ PYTALLOC_UTIL_2.0.8@PYTALLOC_UTIL_2.0.8 2.0.8
+ PYTALLOC_UTIL_2.1.0@PYTALLOC_UTIL_2.1.0 2.1.0
+ pytalloc_CObject_FromTallocPtr@PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_Check@PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_GetObjectType@PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_reference_ex@PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_steal@PYTALLOC_UTIL_2.0.6 2.0.6
+ pytalloc_steal_ex@PYTALLOC_UTIL_2.0.6 2.0.6
diff -Nru talloc-2.1.0/debian/python-talloc.install
talloc-2.1.0/debian/python-talloc.install
--- talloc-2.1.0/debian/python-talloc.install 2014-04-21 14:47:47.0
+0200
+++ talloc-2.1.0/debian/python-talloc.install 2014-05-05 08:14:12.0
+0200
@@ -1,2 +1 @@
usr/lib/python*/*-packages/talloc.so
-usr/lib/*/libpytalloc-util.so.*
diff -Nru talloc-2.1.0/debian/python-talloc.symbols
talloc-2.1.0/debian/python-talloc.symbols
--- talloc-2.1.0/debian/python-talloc.symbols 2014-04-21 14:47:47.0
+0200
+++ talloc-2.1.0/debian/python-talloc.symbols 2014-05-05 08:14:36.0
+0200
@@ -1,13 +1,2 @@
-libpytalloc-util.so.2 #PACKAGE# #MINVER#
- PYTALLOC_UTIL_2.0.6@PYTALLOC_UTIL_2.0.6 2.0.6
- PYTALLOC_UTIL_2.0.7@PYTALLOC_UTIL_2.0.7 2.0.7
- PYTALLOC_UTIL_2.0.8@PYTALLOC_UTIL_2.0.8 2.0.8
- PYTALLOC_UTIL_2.1.0@PYTALLOC_UTIL_2.1.0 2.1.0
- pytalloc_CObject_FromTallocPtr@PYTALLOC_UTIL_2.0.6 2.0.6
- pytalloc_Check@PYTALLOC_UTIL_2.0.6 2.0.6
- pytalloc_GetObjectType@PYTALLOC_UTIL_2.0.6 2.0.6
- pytalloc_reference_ex@PYTALLOC_UTIL_2.0.6 2.0.6
- pytalloc_steal@PYTALLOC_UTIL_2.0.6 2.0.6
- pytalloc_steal_ex@PYTALLOC_UTIL_2.0.6 2.0.6
talloc.so #PACKAGE# #MINVER#
inittalloc@Base 2.0.6