Package: libsigc++-2.0
Version: 2.2.9-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
Hello -
Please find attached a patch to libsigc++-2.0 to transition it to use
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>. This patch should
be safe to apply in Debian now that multiarch has been bootstrapped.
Thanks,
- Evan
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libsigc++-2.0-2.2.10/debian/control libsigc++-2.0-2.2.10/debian/control
--- libsigc++-2.0-2.2.10/debian/control 2011-08-24 08:47:30.000000000 -0700
+++ libsigc++-2.0-2.2.10/debian/control 2011-12-04 12:48:42.000000000 -0800
@@ -11,10 +11,12 @@
Package: libsigc++-2.0-0c2a
Section: libs
+Pre-Depends: multiarch-support
Depends: ${misc:Depends}, ${shlibs:Depends}
Conflicts: libsigc++-1.9-0, libsigc++-2.0-0, libsigc++-2.0-0c2
Replaces: libsigc++-1.9-0, libsigc++-2.0-0, libsigc++-2.0-0c2
Architecture: any
+Multi-Arch: same
Description: type-safe Signal Framework for C++ - runtime
This library implements a full callback system for use in widget
libraries, abstract interfaces, and general programming. It provides
@@ -27,10 +29,12 @@
Package: libsigc++-2.0-dev
Section: libdevel
+Pre-Depends: multiarch-support
Conflicts: libsigc++-1.9-dev
Replaces: libsigc++-1.9-dev
Depends: libsigc++-2.0-${Soname} (= ${binary:Version}), pkg-config, ${misc:Depends}
Suggests: libsigc++-2.0-doc
+Multi-Arch: same
Architecture: any
Description: type-safe Signal Framework for C++ - development files
This library implements a full callback system for use in widget
diff -Nru libsigc++-2.0-2.2.10/debian/libsigc++-2.0-dev.install libsigc++-2.0-2.2.10/debian/libsigc++-2.0-dev.install
--- libsigc++-2.0-2.2.10/debian/libsigc++-2.0-dev.install 2011-08-24 08:47:30.000000000 -0700
+++ libsigc++-2.0-2.2.10/debian/libsigc++-2.0-dev.install 2011-11-29 15:02:02.000000000 -0800
@@ -1,6 +1,6 @@
usr/include
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/*.so
-usr/lib/pkgconfig
-usr/lib/sigc++-2.0
+usr/lib/*/*.a
+usr/lib/*/*.la
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
+usr/lib/*/sigc++-2.0
diff -Nru libsigc++-2.0-2.2.10/debian/libsigc++-2.0.soname.install libsigc++-2.0-2.2.10/debian/libsigc++-2.0.soname.install
--- libsigc++-2.0-2.2.10/debian/libsigc++-2.0.soname.install 2011-08-24 08:47:30.000000000 -0700
+++ libsigc++-2.0-2.2.10/debian/libsigc++-2.0.soname.install 2011-11-29 14:56:37.000000000 -0800
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff -Nru libsigc++-2.0-2.2.10/debian/rules libsigc++-2.0-2.2.10/debian/rules
--- libsigc++-2.0-2.2.10/debian/rules 2011-08-24 08:47:30.000000000 -0700
+++ libsigc++-2.0-2.2.10/debian/rules 2011-11-29 15:23:18.000000000 -0800
@@ -18,6 +18,7 @@
else
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# Which automake version to use.
AUTOMAKE_VERSION=1.10
@@ -100,7 +101,7 @@
ACLOCAL=$(ACLOCAL) AUTOMAKE=$(AUTOMAKE) autoreconf
test -d builddir || mkdir builddir
- cd builddir && ../configure --prefix=/usr --enable-shared --enable-static $(CROSS)
+ cd builddir && ../configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --enable-shared --enable-static $(CROSS)
touch config-stamp
