diff -Nru cairomm-1.10.0/debian/changelog cairomm-1.10.0/debian/changelog --- cairomm-1.10.0/debian/changelog 2011-05-23 18:49:32.000000000 -0700 +++ cairomm-1.10.0/debian/changelog 2011-12-11 12:11:11.000000000 -0800 @@ -1,3 +1,14 @@ +cairomm (1.10.0-1ubuntu1) precise; urgency=low + + * Convert to multiarch (LP: #902899): + - Pass --libdir with multiarch path to configure + - Adjust .install files to refer to /usr/lib subdirs + - Add multiarch Pre-Depends + - Bump debhelper and cdbs build-deps for ${misc:Pre-Depends} and + $(DEB_HOST_MULTIARCH) support, respectively + + -- Evan Broder Sat, 10 Dec 2011 18:18:25 -0800 + cairomm (1.10.0-1) unstable; urgency=low * New upstream release (Closes: #625523) 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-10 18:18:58.000000000 -0800 @@ -1,17 +1,20 @@ Source: cairomm Section: libs Priority: optional -Maintainer: Dave Beckett +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Dave Beckett Uploaders: Danilo Piazzalunga -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 +27,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