Source: atk1.0 Version: 1.32.0-2 Tags: patch User: [email protected] Usertags: origin-ubuntu oneiric ubuntu-patch
Hi folks, Please find attached a patch to atk1.0 to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been applied and is being used successfully in Ubuntu 11.04, and should be safe to apply in Debian now that multiarch has been bootstrapped there. Would be great if you could apply this patch to the Debian package, so we can whittle away ia32-libs for wheezy. :) Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [email protected] [email protected]
=== modified file 'debian/control' --- debian/control 2011-02-01 15:58:03 +0000 +++ debian/control 2011-03-18 18:14:17 +0000 @@ -11,11 +11,11 @@ Uploaders: David Weinehall <[email protected]>, Debian GNOME Maintainers <[email protected]>, Emilio Pozuelo Monfort <[email protected]>, Josselin Mouette <[email protected]>, Laurent Bigonville <[email protected]>, Mario Lang <[email protected]>, Sebastian Dröge <[email protected]> Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/atk1.0 -Build-Depends: debhelper (>= 5.0.22), +Build-Depends: debhelper (>= 8.1.3), pkg-config, libglib2.0-dev (>= 2.0.0), gnome-pkg-tools (>= 0.10), - cdbs (>= 0.4.41), + cdbs (>= 0.4.93), gtk-doc-tools, docbook-xml, autotools-dev, @@ -32,6 +32,8 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libatk1.0-data (= ${source:Version}) +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Description: The ATK accessibility toolkit ATK is a toolkit providing accessibility interfaces for applications or other toolkits. By implementing these interfaces, those other toolkits or @@ -60,6 +62,7 @@ Section: misc Architecture: all Depends: ${misc:Depends} +Multi-Arch: foreign Description: Common files for the ATK accessibility toolkit ATK is a toolkit providing accessibility interfaces for applications or other toolkits. By implementing these interfaces, those other toolkits or @@ -96,6 +99,7 @@ Depends: ${misc:Depends}, libatk1.0-0 (= ${binary:Version}) Replaces: libatk1.0-0 (<< 1.11.4-3) +Multi-Arch: same Description: The ATK libraries and debugging symbols ATK is a toolkit providing accessibility interfaces for applications or other toolkits. By implementing these interfaces, those other toolkits or === modified file 'debian/control.in' --- debian/control.in 2011-02-01 15:58:03 +0000 +++ debian/control.in 2011-03-18 18:14:11 +0000 @@ -6,11 +6,11 @@ Uploaders: @GNOME_TEAM@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/atk1.0 -Build-Depends: debhelper (>= 5.0.22), +Build-Depends: debhelper (>= 8.1.3), pkg-config, libglib2.0-dev (>= 2.0.0), gnome-pkg-tools (>= 0.10), - cdbs (>= 0.4.41), + cdbs (>= 0.4.93), gtk-doc-tools, docbook-xml, autotools-dev, @@ -27,6 +27,8 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libatk1.0-data (= ${source:Version}) +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Description: The ATK accessibility toolkit ATK is a toolkit providing accessibility interfaces for applications or other toolkits. By implementing these interfaces, those other toolkits or @@ -55,6 +57,7 @@ Section: misc Architecture: all Depends: ${misc:Depends} +Multi-Arch: foreign Description: Common files for the ATK accessibility toolkit ATK is a toolkit providing accessibility interfaces for applications or other toolkits. By implementing these interfaces, those other toolkits or @@ -91,6 +94,7 @@ Depends: ${misc:Depends}, libatk1.0-0 (= ${binary:Version}) Replaces: libatk1.0-0 (<< 1.11.4-3) +Multi-Arch: same Description: The ATK libraries and debugging symbols ATK is a toolkit providing accessibility interfaces for applications or other toolkits. By implementing these interfaces, those other toolkits or === modified file 'debian/gir1.2-atk-1.0.install' --- debian/gir1.2-atk-1.0.install 2010-12-11 19:19:52 +0000 +++ debian/gir1.2-atk-1.0.install 2011-03-18 09:23:48 +0000 @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/girepository-1.0/ +debian/tmp/usr/lib/*/girepository-1.0/ usr/lib === modified file 'debian/libatk1.0-0.install' --- debian/libatk1.0-0.install 2004-12-12 23:36:47 +0000 +++ debian/libatk1.0-0.install 2011-03-18 09:06:14 +0000 @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/lib*.so.* +debian/tmp/usr/lib/*/lib*.so.* === modified file 'debian/libatk1.0-dev.install' --- debian/libatk1.0-dev.install 2010-11-22 19:38:00 +0000 +++ debian/libatk1.0-dev.install 2011-03-18 09:06:25 +0000 @@ -1,6 +1,6 @@ -debian/tmp/usr/lib/*.la -debian/tmp/usr/lib/*.a -debian/tmp/usr/lib/*.so -debian/tmp/usr/lib/pkgconfig/ +debian/tmp/usr/lib/*/*.la +debian/tmp/usr/lib/*/*.a +debian/tmp/usr/lib/*/*.so +debian/tmp/usr/lib/*/pkgconfig/ debian/tmp/usr/include debian/tmp/usr/share/gir-1.0 === modified file 'debian/libatk1.0-udeb.install' --- debian/libatk1.0-udeb.install 2007-04-26 10:05:00 +0000 +++ debian/libatk1.0-udeb.install 2011-03-18 09:06:39 +0000 @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/lib*.so.* +debian/tmp/usr/lib/*/lib*.so.* usr/lib === modified file 'debian/rules' --- debian/rules 2011-02-01 15:58:03 +0000 +++ debian/rules 2011-03-18 09:10:46 +0000 @@ -12,7 +12,7 @@ LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed # build static stuff: -DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --enable-static --enable-introspection +DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --enable-static --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) SHLIB_VERSION := 1.32.0 DEB_DH_MAKESHLIBS_ARGS_libatk1.0-0 += -V"libatk1.0-0 (>= $(SHLIB_VERSION))" --add-udeb="libatk1.0-udeb"
signature.asc
Description: Digital signature
