debian/changelog

+exo (0.12.2-2) UNRELEASED; urgency=medium
+
+  * drop chrpath calls, not needed anymore
+  * d/control: suggests sensible-utils
+  * add patch to use /u/b/perl directly as interpreter for exo-compose-mail-1
+  * d/control: drop obsolete Breaks/Replaces
+  * move exo-compose-mail to arch:all libexo-helpers package
+  * d/control: drop Lionel Le Folgoc from uploaders, thanks to him
+  * switch to compat 10
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 08 Aug 2018 17:20:08 +0200
+
 exo (0.12.2-1) unstable; urgency=medium
 
   * add gbp.conf following DEP-14

debian/compat

-9
+10

debian/control

@@ -2,11 +2,8 @@ Source: exo
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
-Uploaders: Yves-Alexis Perez <corsac@debian.org>,
-           Lionel Le Folgoc <mrpouit@gmail.com>
-Build-Depends: chrpath,
-               debhelper (>= 9),
-               dh-autoreconf,
+Uploaders: Yves-Alexis Perez <corsac@debian.org>
+Build-Depends: debhelper (>= 10),
                dpkg-dev (>= 1.16.1),
                gtk-doc-tools,
                intltool,
@@ -123,7 +120,7 @@ Architecture: all
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libexo-0.3-0 (<< 0.3.104-3)
+Suggests: sensible-utils
 Description: libexo common files
  libexo is a library for Xfce that contains a bunch of additional widgets and
  a framework for editable toolbars (an improved version of the framework
@@ -140,7 +137,9 @@ Section: libs
 Architecture: all
 Multi-arch: foreign
 Depends: libexo-common, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libexo-0.3-0 (<< 0.3.104-3), libexo-common (<< 0.6.2-3)
+Breaks: libexo-1-0 (<< 0.12.2-2)
+Replaces: libexo-1-0 (<< 0.12.2-2)
+Suggests: sensible-utils
 Description: helpers for the exo library
  libexo is a library for Xfce that contains a bunch of additional widgets and
  a framework for editable toolbars (an improved version of the framework

debian/libexo-1-0.install

 usr/lib/*/libexo-1*.so.*
-usr/lib/*/xfce4/exo-1/exo-compose-mail-1
 usr/lib/*/xfce4/exo-1/exo-helper-1
 usr/share/locale/*/*/exo-1.mo
 usr/share/pixmaps/exo-1

debian/libexo-helpers.install

 usr/share/xfce4
+usr/lib/*/xfce4/exo-1/exo-compose-mail-1 usr/share/xfce4/exo-1/

debian/patches/0001-use-u-b-perl-instead-of-env-as-interpreter-path.patch

+From: Yves-Alexis Perez <corsac@debian.org>
+Date: Wed, 8 Aug 2018 13:10:29 +0200
+Subject: use /u/b/perl instead of env as interpreter path
+
+---
+ exo-helper/helpers/exo-compose-mail-1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/exo-helper/helpers/exo-compose-mail-1 b/exo-helper/helpers/exo-compose-mail-1
+index fead65c..b98a0d6 100755
+--- a/exo-helper/helpers/exo-compose-mail-1
++++ b/exo-helper/helpers/exo-compose-mail-1
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #
+ # exo-compose-mail-1 - Perl script to parse mailto:-URIs and invoke the
+ #                      various included MailReaders with the appropriate

debian/patches/series

+0001-use-u-b-perl-instead-of-env-as-interpreter-path.patch

debian/rules

@@ -12,11 +12,11 @@ EXO2_SONAME=libexo-$(EXO2_LIBNAME)-$(EXO_SOVERSION)
 MSGFMT = /usr/bin/msgfmt --endianness little
 
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@
 
 override_dh_autoreconf:
 	mkdir -p m4
-	NOCONFIGURE=1 dh_autoreconf xdt-autogen
+	dh_autoreconf
 
 override_dh_auto_configure:
 	MSGFMT="$(MSGFMT)" dh_auto_configure -- --disable-gtk-doc --disable-silent-rules --enable-gtk3
@@ -27,18 +27,16 @@ override_dh_install:
 		-e 's/TerminalEmulator=.*/TerminalEmulator=debian-x-terminal-emulator/' \
 		debian/tmp/etc/xdg/xfce4/helpers.rc
 
-	chrpath -d -k debian/tmp/usr/bin/exo-csource \
-		debian/tmp/usr/bin/exo-desktop-item-edit \
-		debian/tmp/usr/bin/exo-open \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/exo-$(EXO_LIBNAME)/exo-helper-$(EXO_LIBNAME) \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexo-$(EXO_LIBNAME).so.* \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexo-$(EXO2_LIBNAME).so.*
-
 	# Create a muttng helper from the mutt one
 	sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \
 		<debian/tmp/usr/share/xfce4/helpers/mutt.desktop \
 		>debian/tmp/usr/share/xfce4/helpers/muttng.desktop
 
+	# Drop multi-arch path from mail helpers since we install the perl script
+	# exo-compose-mail-1 in a non-multiarch directory (/u/s/xfce4/exo-1)
+	sed -i -e '/X-XFCE-CommandsWithParameter=.*exo-compose-mail-1/ s#lib/$(DEB_HOST_MULTIARCH)#share#' \
+		debian/tmp/usr/share/xfce4/helpers/*.desktop
+
 	dh_install -X .la
 
 override_dh_missing: