diff -Nru atkmm1.6-2.22.6/debian/changelog atkmm1.6-2.22.6/debian/changelog --- atkmm1.6-2.22.6/debian/changelog 2011-11-16 17:28:12.000000000 -0800 +++ atkmm1.6-2.22.6/debian/changelog 2011-12-10 02:46:11.000000000 -0800 @@ -1,3 +1,14 @@ +atkmm1.6 (2.22.6-1ubuntu1) precise; urgency=low + + * Convert to multiarch: + - 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 02:46:11 -0800 + atkmm1.6 (2.22.6-1) unstable; urgency=low * New upstream release. diff -Nru atkmm1.6-2.22.6/debian/control atkmm1.6-2.22.6/debian/control --- atkmm1.6-2.22.6/debian/control 2011-11-16 17:30:23.000000000 -0800 +++ atkmm1.6-2.22.6/debian/control 2011-12-10 02:47:01.000000000 -0800 @@ -6,14 +6,15 @@ Source: atkmm1.6 Section: libs Priority: optional -Maintainer: Krzysztof Klimonda +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Krzysztof Klimonda Uploaders: Debian GNOME Maintainers , Deng Xiyue , Michael Biebl DM-Upload-Allowed: yes Homepage: http://www.gtkmm.org/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/atkmm1.6 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/atkmm1.6 -Build-Depends: cdbs (>= 0.4.51), - debhelper (>= 8), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.11), libglibmm-2.4-dev (>= 2.24.0), libatk1.0-dev (>= 1.12.0), @@ -23,6 +24,7 @@ Package: libatkmm-1.6-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libatkmm-1.6-1 (= ${binary:Version}), @@ -31,6 +33,7 @@ Suggests: libatkmm-1.6-doc Breaks: libgtkmm-2.4-dev (<< 1:2.22.0) Replaces: libgtkmm-2.4-dev (<< 1:2.22.0) +Multi-Arch: same Description: C++ wrappers for ATK accessibility toolkit (development files) Atkmm is a C++ interface for ATK, accessibility toolkit used by Gtk+ library. It provides a familiar interface for C++ programmers to add accessibility @@ -40,10 +43,12 @@ Package: libatkmm-1.6-1 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: libgtkmm-2.4-1c2a (<< 1:2.22.0) Replaces: libgtkmm-2.4-1c2a (<< 1:2.22.0) +Multi-Arch: same Description: C++ wrappers for ATK accessibility toolkit (shared libraries) Atkmm is a C++ interface for ATK, accessibility toolkit used by Gtk+ library. It provides a familiar interface for C++ programmers to add accessibility @@ -55,11 +60,13 @@ Section: debug Priority: extra Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libatkmm-1.6-1 (= ${binary:Version}) Breaks: libgtkmm-2.4-dbg (<< 1:2.22.0) Replaces: libgtkmm-2.4-dbg (<< 1:2.22.0) +Multi-Arch: same Description: C++ wrappers for ATK accessibility toolkit (debug symbols) Atkmm is a C++ interface for ATK, accessibility toolkit used by Gtk+ library. It provides a familiar interface for C++ programmers to add accessibility diff -Nru atkmm1.6-2.22.6/debian/control.in atkmm1.6-2.22.6/debian/control.in --- atkmm1.6-2.22.6/debian/control.in 2011-11-16 17:23:21.000000000 -0800 +++ atkmm1.6-2.22.6/debian/control.in 2011-12-10 02:46:58.000000000 -0800 @@ -1,14 +1,15 @@ Source: atkmm1.6 Section: libs Priority: optional -Maintainer: Krzysztof Klimonda +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Krzysztof Klimonda Uploaders: @GNOME_TEAM@ DM-Upload-Allowed: yes Homepage: http://www.gtkmm.org/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/atkmm1.6 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/atkmm1.6 -Build-Depends: cdbs (>= 0.4.51), - debhelper (>= 8), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.11), libglibmm-2.4-dev (>= 2.24.0), libatk1.0-dev (>= 1.12.0), @@ -18,6 +19,7 @@ Package: libatkmm-1.6-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libatkmm-1.6-1 (= ${binary:Version}), @@ -26,6 +28,7 @@ Suggests: libatkmm-1.6-doc Breaks: libgtkmm-2.4-dev (<< 1:2.22.0) Replaces: libgtkmm-2.4-dev (<< 1:2.22.0) +Multi-Arch: same Description: C++ wrappers for ATK accessibility toolkit (development files) Atkmm is a C++ interface for ATK, accessibility toolkit used by Gtk+ library. It provides a familiar interface for C++ programmers to add accessibility @@ -35,10 +38,12 @@ Package: libatkmm-1.6-1 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: libgtkmm-2.4-1c2a (<< 1:2.22.0) Replaces: libgtkmm-2.4-1c2a (<< 1:2.22.0) +Multi-Arch: same Description: C++ wrappers for ATK accessibility toolkit (shared libraries) Atkmm is a C++ interface for ATK, accessibility toolkit used by Gtk+ library. It provides a familiar interface for C++ programmers to add accessibility @@ -50,11 +55,13 @@ Section: debug Priority: extra Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libatkmm-1.6-1 (= ${binary:Version}) Breaks: libgtkmm-2.4-dbg (<< 1:2.22.0) Replaces: libgtkmm-2.4-dbg (<< 1:2.22.0) +Multi-Arch: same Description: C++ wrappers for ATK accessibility toolkit (debug symbols) Atkmm is a C++ interface for ATK, accessibility toolkit used by Gtk+ library. It provides a familiar interface for C++ programmers to add accessibility diff -Nru atkmm1.6-2.22.6/debian/libatkmm-1.6-1.install atkmm1.6-2.22.6/debian/libatkmm-1.6-1.install --- atkmm1.6-2.22.6/debian/libatkmm-1.6-1.install 2011-11-16 17:18:27.000000000 -0800 +++ atkmm1.6-2.22.6/debian/libatkmm-1.6-1.install 2011-12-10 02:45:05.000000000 -0800 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru atkmm1.6-2.22.6/debian/libatkmm-1.6-dev.install atkmm1.6-2.22.6/debian/libatkmm-1.6-dev.install --- atkmm1.6-2.22.6/debian/libatkmm-1.6-dev.install 2011-11-16 17:22:36.000000000 -0800 +++ atkmm1.6-2.22.6/debian/libatkmm-1.6-dev.install 2011-12-10 02:45:02.000000000 -0800 @@ -1,4 +1,4 @@ usr/include -usr/lib/atkmm-1.6 -usr/lib/lib*.so -usr/lib/pkgconfig +usr/lib/*/atkmm-1.6 +usr/lib/*/lib*.so +usr/lib/*/pkgconfig diff -Nru atkmm1.6-2.22.6/debian/rules atkmm1.6-2.22.6/debian/rules --- atkmm1.6-2.22.6/debian/rules 2011-11-16 17:22:51.000000000 -0800 +++ atkmm1.6-2.22.6/debian/rules 2011-12-10 02:44:49.000000000 -0800 @@ -14,4 +14,5 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"