diff -Nru thunar-archive-plugin-0.3.0/debian/changelog thunar-archive-plugin-0.3.0/debian/changelog --- thunar-archive-plugin-0.3.0/debian/changelog 2011-06-18 21:20:37.000000000 +0000 +++ thunar-archive-plugin-0.3.0/debian/changelog 2011-10-28 08:53:55.000000000 +0000 @@ -1,3 +1,25 @@ +thunar-archive-plugin (0.3.0-4) unstable; urgency=low + + [ Lionel Le Folgoc ] + * debian/compat: use mode 9. + * debian/control: + - add myself to Uploaders. + - drop build-dep on hardening-includes. + - bump debhelper build-dep to 8.9.4 for dh9 compat mode. + * debian/rules: + - switch hardening to use dh9 mode + - use multi-arch path in various rules. + * debian/patches/02_support-non-multiarch-wrappers.patch: support wrappers + installed in /usr/lib/$triplet and /usr/lib, to hopefully migrate smoothly + t-a-p files to multiarch path over time without breakage. Closes: #644252 + + [ Yves-Alexis Perez ] + * debian/copyright: + - fix copyright information for debian folder. + - adjust text on license location. + + -- Yves-Alexis Perez Fri, 28 Oct 2011 10:53:54 +0200 + thunar-archive-plugin (0.3.0-3) unstable; urgency=low * debian/rules: diff -Nru thunar-archive-plugin-0.3.0/debian/compat thunar-archive-plugin-0.3.0/debian/compat --- thunar-archive-plugin-0.3.0/debian/compat 2009-11-11 14:17:43.000000000 +0000 +++ thunar-archive-plugin-0.3.0/debian/compat 2011-10-11 20:55:01.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru thunar-archive-plugin-0.3.0/debian/control thunar-archive-plugin-0.3.0/debian/control --- thunar-archive-plugin-0.3.0/debian/control 2011-04-24 10:55:09.000000000 +0000 +++ thunar-archive-plugin-0.3.0/debian/control 2011-10-11 20:55:01.000000000 +0000 @@ -2,10 +2,11 @@ Section: xfce Priority: optional Maintainer: Debian Xfce Maintainers -Uploaders: Yves-Alexis Perez -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, - intltool, libthunarx-2-dev, libexo-1-dev, hardening-includes, - xfce4-dev-tools, libtool, gtk-doc-tools +Uploaders: Yves-Alexis Perez , + Lionel Le Folgoc +Build-Depends: debhelper (>= 8.9.4), autotools-dev, pkg-config, + intltool, libthunarx-2-dev, libexo-1-dev, xfce4-dev-tools, libtool, + gtk-doc-tools Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-archive-plugin/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-archive-plugin/ diff -Nru thunar-archive-plugin-0.3.0/debian/copyright thunar-archive-plugin-0.3.0/debian/copyright --- thunar-archive-plugin-0.3.0/debian/copyright 2011-04-02 14:09:55.000000000 +0000 +++ thunar-archive-plugin-0.3.0/debian/copyright 2011-10-28 08:52:42.000000000 +0000 @@ -3,7 +3,9 @@ Upstream-Contact: Jannis Pohlmann Source: http://thunar.xfce.org/pwiki/projects/thunar-archive-plugin -Files: de bi +Files: debian/* +Copyright: © 2006-2011 Debian Xfce Maintainers +License: GPL-2+ Files: autogen.sh thunar-archive-plugin/tap-backend.c @@ -23,6 +25,10 @@ Copyright: 2006-2001 Yves-Alexis Perez License: GPL-2+ -On Debian systems, the complete text of the GNU Library General Public License -can be found in `/usr/share/common-licenses/LGPL'. The complete text of the GNU -General Public License can be found in `/usr/share/common-licenses/GPL'. +License: GPL-2+ + On Debian systems, the complete text of the GNU General Public License can be + found in `/usr/share/common-licenses/GPL'. + +License: LGPL-2+ + On Debian systems, the complete text of the GNU Library General Public + License can be found in `/usr/share/common-licenses/LGPL'. diff -Nru thunar-archive-plugin-0.3.0/debian/patches/02_support-non-multiarch-wrappers.patch thunar-archive-plugin-0.3.0/debian/patches/02_support-non-multiarch-wrappers.patch --- thunar-archive-plugin-0.3.0/debian/patches/02_support-non-multiarch-wrappers.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunar-archive-plugin-0.3.0/debian/patches/02_support-non-multiarch-wrappers.patch 2011-10-11 20:55:01.000000000 +0000 @@ -0,0 +1,36 @@ +From ef6aac27a1c5d49036fa218af149eaab6c599097 Mon Sep 17 00:00:00 2001 +From: Lionel Le Folgoc +Date: Tue, 11 Oct 2011 22:08:00 +0200 +Subject: Look for wrappers in {non-,}multiarch LIBEXECDIRs + +This will let a multiarch enabled t-a-p find wrappers installed into the old +wrappers' directory (both /usr/lib/$triplet and /usr/lib). +--- + thunar-archive-plugin/tap-backend.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/thunar-archive-plugin/tap-backend.c b/thunar-archive-plugin/tap-backend.c +index ebe379c..012bda9 100644 +--- a/thunar-archive-plugin/tap-backend.c ++++ b/thunar-archive-plugin/tap-backend.c +@@ -377,6 +377,17 @@ tap_backend_mime_wrapper (GAppInfo *mime_application) + filename = NULL; + } + ++ /* Try to find wrappers in non-multiarch LIBEXECDIR */ ++ if (filename == NULL) ++ { ++ filename = g_strdup_printf ("/usr/lib/thunar-archive-plugin" G_DIR_SEPARATOR_S "%s.tap", base_name); ++ if (!g_file_test (filename, G_FILE_TEST_IS_EXECUTABLE)) ++ { ++ g_free (filename); ++ filename = NULL; ++ } ++ } ++ + /* cleanup */ + g_free (base_name); + +-- +1.7.7 + diff -Nru thunar-archive-plugin-0.3.0/debian/patches/series thunar-archive-plugin-0.3.0/debian/patches/series --- thunar-archive-plugin-0.3.0/debian/patches/series 2011-04-24 10:55:09.000000000 +0000 +++ thunar-archive-plugin-0.3.0/debian/patches/series 2011-10-11 20:55:01.000000000 +0000 @@ -1 +1,2 @@ 01_fix-missing-links.patch +02_support-non-multiarch-wrappers.patch diff -Nru thunar-archive-plugin-0.3.0/debian/rules thunar-archive-plugin-0.3.0/debian/rules --- thunar-archive-plugin-0.3.0/debian/rules 2011-04-24 10:55:09.000000000 +0000 +++ thunar-archive-plugin-0.3.0/debian/rules 2011-10-11 20:55:01.000000000 +0000 @@ -1,22 +1,19 @@ #!/usr/bin/make -f -include /usr/share/hardening-includes/hardening.make -CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1 -CFLAGS+=$(HARDENING_CFLAGS) +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs +export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow -export CFLAGS LDFLAGS +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_configure: NOCONFIGURE=1 xdt-autogen - dh_auto_configure -- --libexecdir=/usr/lib/ + dh_auto_configure override_dh_makeshlibs: - dh_makeshlibs -n -X /usr/lib/thunarx-2/ + dh_makeshlibs -n -X /usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2/ override_dh_install: - rm -rf debian/thunar-archive-plugin/usr/lib/thunarx-2/*.la + rm -rf debian/thunar-archive-plugin/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2/*.la dh_install --fail-missing %: