Attached it the NMU diff for libsigc++-2.0/2.2.10-0.2. I uploaded it to
DELAYED/3.
Bastian
--
Actual war is a very messy business. Very, very messy business.
-- Kirk, "A Taste of Armageddon", stardate 3193.0
diff -Nru libsigc++-2.0-2.2.10/debian/changelog
libsigc++-2.0-2.2.10/debian/changelog
--- libsigc++-2.0-2.2.10/debian/changelog 2012-03-08 20:23:33.000000000
+0000
+++ libsigc++-2.0-2.2.10/debian/changelog 2012-06-16 17:36:24.000000000
+0000
@@ -1,3 +1,12 @@
+libsigc++-2.0 (2.2.10-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support multi-arch: (closes: #651024)
+ - Mark libsigc++-2.0-0c2a and libsigc++-2.0-dev as same.
+ - Adjust debhelper build-dependency.
+
+ -- Bastian Blank <[email protected]> Sat, 16 Jun 2012 17:36:21 +0000
+
libsigc++-2.0 (2.2.10-0.1) unstable; urgency=low
* Non-maintainer upload.
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 2012-03-08 20:20:53.000000000 +0000
+++ libsigc++-2.0-2.2.10/debian/control 2012-06-16 17:03:33.000000000 +0000
@@ -3,17 +3,19 @@
Priority: optional
Maintainer: Daniel Burrows <[email protected]>
Standards-Version: 3.9.1
-Build-Depends: debhelper (>=8.0.0), m4, g++ (>= 3:3.2.0), autoconf,
automake1.10, mm-common
+Build-Depends: debhelper (>= 8.1.3), m4, g++ (>= 3:3.2.0), autoconf,
automake1.10, mm-common
Build-Conflicts: autoconf2.13, automake1.4
Vcs-Git: git://git.debian.org/git/collab-maint/libsigc++-2.0.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/libsigc++-2.0.git;a=summary
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
@@ -26,10 +28,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 2012-03-08
20:20:53.000000000 +0000
+++ libsigc++-2.0-2.2.10/debian/libsigc++-2.0-dev.install 2012-06-16
16:56:20.000000000 +0000
@@ -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 2012-03-08
20:20:53.000000000 +0000
+++ libsigc++-2.0-2.2.10/debian/libsigc++-2.0.soname.install 2012-06-16
16:56:20.000000000 +0000
@@ -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 2012-03-08 20:20:53.000000000 +0000
+++ libsigc++-2.0-2.2.10/debian/rules 2012-06-16 16:56:20.000000000 +0000
@@ -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
