Package: cairomm
Version: 1.10.0-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Hello -

Please find attached a patch to cairomm 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.

Since libcairomm-1.0-dev contains no build-time-generated include
files or arch-dependent scripts/executables, it can be safely marked
as Multi-Arch: same, so this patch does so. Because many of its direct
and indirect dependencies have not yet been transitioned for
multiarch, libcairomm-1.0-dev will not currently be multiarch
co-installable. This is fine, though, and if all of the dependencies
were ever to be transitioned for multiarch, the libcairomm -dev
package would immediately become multiarch co-installable.

Typically the biggest outstanding blocker to multiarch transitions is
.la files with non-empty dependency_libs lines. I don't have access to
lintian.debian.org, but I checked all files listed in
http://lintian.ubuntuwire.org/tags/non-empty-dependency_libs-in-la-file.html
(http://paste.ubuntu.com/766579/) and cairomm isn't listed anywhere,
so this transition should be safe now by that metric.

Thanks for your consideration,
 - 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 cairomm-1.10.0/debian/control cairomm-1.10.0/debian/control
--- cairomm-1.10.0/debian/control	2011-05-17 09:45:51.000000000 -0700
+++ cairomm-1.10.0/debian/control	2011-12-11 12:12:37.000000000 -0800
@@ -3,15 +3,17 @@
 Priority: optional
 Maintainer: Dave Beckett <daj...@debian.org>
 Uploaders: Danilo Piazzalunga <danilopia...@gmail.com>
-Build-Depends: debhelper (>= 5), cdbs, libcairo2-dev (>= 1.10.0), libsigc++-2.0-dev, gnome-pkg-tools
+Build-Depends: debhelper (>= 8.1.3~), cdbs (>= 0.4.93~), libcairo2-dev (>= 1.10.0), libsigc++-2.0-dev, gnome-pkg-tools
 Standards-Version: 3.9.2
 Homepage: http://cairographics.org/cairomm/
 
 Package: libcairomm-1.0-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libcairomm-1.0-1 (= ${binary:Version}), libcairo2-dev (>= 1.10.0), ${misc:Depends}, libsigc++-2.0-dev
 Suggests: libcairomm-1.0-doc
+Multi-Arch: same
 Description: C++ wrappers for Cairo (development files)
  cairomm provides C++ bindings for the Cairo graphics library,
  a multi-platform library providing anti-aliased vector-based
@@ -24,8 +26,10 @@
 Package: libcairomm-1.0-1
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libcairomm-1.0-0
+Multi-Arch: same
 Description: C++ wrappers for Cairo (shared libraries)
  cairomm provides C++ bindings for the Cairo graphics library,
  a multi-platform library providing anti-aliased vector-based
diff -Nru cairomm-1.10.0/debian/libcairomm-1.0-1.install cairomm-1.10.0/debian/libcairomm-1.0-1.install
--- cairomm-1.10.0/debian/libcairomm-1.0-1.install	2010-04-20 13:40:07.000000000 -0700
+++ cairomm-1.10.0/debian/libcairomm-1.0-1.install	2011-12-10 18:18:49.000000000 -0800
@@ -1 +1 @@
-debian/tmp/usr/lib/libcairomm-1.0.so.*
+debian/tmp/usr/lib/*/libcairomm-1.0.so.*
diff -Nru cairomm-1.10.0/debian/libcairomm-1.0-dev.install cairomm-1.10.0/debian/libcairomm-1.0-dev.install
--- cairomm-1.10.0/debian/libcairomm-1.0-dev.install	2010-04-30 19:40:38.000000000 -0700
+++ cairomm-1.10.0/debian/libcairomm-1.0-dev.install	2011-12-10 18:18:37.000000000 -0800
@@ -1,9 +1,9 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib/libcairomm-1.0*.so
-debian/tmp/usr/lib/libcairomm-1.0*.a
-debian/tmp/usr/lib/libcairomm-1.0*.la
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/cairomm-1.0
+debian/tmp/usr/lib/*/libcairomm-1.0*.so
+debian/tmp/usr/lib/*/libcairomm-1.0*.a
+debian/tmp/usr/lib/*/libcairomm-1.0*.la
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/cairomm-1.0
 examples/README usr/share/doc/libcairomm-1.0-dev/examples
 examples/surfaces/*.cc usr/share/doc/libcairomm-1.0-dev/examples/surfaces
 examples/text/*.cc usr/share/doc/libcairomm-1.0-dev/examples/text
diff -Nru cairomm-1.10.0/debian/rules cairomm-1.10.0/debian/rules
--- cairomm-1.10.0/debian/rules	2011-05-17 09:46:36.000000000 -0700
+++ cairomm-1.10.0/debian/rules	2011-12-10 18:16:44.000000000 -0800
@@ -5,7 +5,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 
 # We want .a
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 # Doxygen cannot handle compressed tag files
 DEB_COMPRESS_EXCLUDE := .tag

Reply via email to