Package: gtk-vector-screenshot
Version: 0.3.2-1
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: origin-ubuntu raring ubuntu-patch
Hi,
I'm forwarding a patch from Ubuntu which you might consider including.
In order to reduce the number of patches on our GTK+3 package, we've
been assessing which ones can be removed. One patch we carry, which is
also carried in Debian, is to have a 'fallback' directory for gtk
modules, which is /usr/lib/gtk-3.0. There are just a few packages
installing into this directory; if we can get them all using MA then we
could also remove this patch in Debian too.
http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/061_multiarch_module_fallback.patch?revision=34401&view=markup
The attached patch installes the modules into the MA locations. It's not
a full multiarch conversion though, due to the binary and the Xsession
script. You'll need to split the package to realise that, but I don't
know if it's worth it.
Cheers,
Iain
diff -Nru gtk-vector-screenshot-0.3.2/debian/changelog gtk-vector-screenshot-0.3.2/debian/changelog
diff -Nru gtk-vector-screenshot-0.3.2/debian/control gtk-vector-screenshot-0.3.2/debian/control
--- gtk-vector-screenshot-0.3.2/debian/control 2011-06-30 09:29:24.000000000 +0100
+++ gtk-vector-screenshot-0.3.2/debian/control 2012-11-12 13:12:14.000000000 +0000
@@ -4,8 +4,8 @@
Section: gnome
Priority: optional
Build-Depends:
- cdbs,
- debhelper (>= 7),
+ cdbs (>= 0.4.93~),
+ debhelper (>= 8.1.3~),
pkg-config,
libgtk-3-dev,
libgtk2.0-dev,
diff -Nru gtk-vector-screenshot-0.3.2/debian/rules gtk-vector-screenshot-0.3.2/debian/rules
--- gtk-vector-screenshot-0.3.2/debian/rules 2011-06-24 14:53:08.000000000 +0100
+++ gtk-vector-screenshot-0.3.2/debian/rules 2012-11-12 11:46:36.000000000 +0000
@@ -3,9 +3,11 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
common-install-arch::
find $(DEB_DESTDIR) -name "*.la" -delete
-DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/gtk-2.0/modules
-DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/gtk-3.0/modules
+DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/modules
+DEB_DH_MAKESHLIBS_ARGS_ALL += --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/gtk-3.0/modules
