[Pkg-xfce-commits] [Git][xfce-team/desktop/exo][debian/master] 8 commits: drop chrpath calls, not needed anymore

Wed Aug 8 16:24:09 BST 2018

Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / exo


Commits:
a0bbc19c by Yves-Alexis Perez at 2018-08-08T07:20:39Z
drop chrpath calls, not needed anymore

- - - - -
0b4cf73c by Yves-Alexis Perez at 2018-08-08T11:11:28Z
d/control: suggests sensible-utils

- - - - -
3dfab137 by Yves-Alexis Perez at 2018-08-08T11:11:49Z
add patch to use /u/b/perl directly as interpreter for exo-compose-mail-1

- - - - -
f8869ba7 by Yves-Alexis Perez at 2018-08-08T13:15:44Z
d/control: drop obsolete Breaks/Replaces

- - - - -
5a73fee6 by Yves-Alexis Perez at 2018-08-08T14:50:18Z
move exo-compose-mail to arch:all libexo-helpers package

move to a architecture-independant path since it's a perl script, and
put it along the .desktop helpers file

- - - - -
34a55bff by Yves-Alexis Perez at 2018-08-08T14:51:26Z
d/control: drop Lionel Le Folgoc from uploaders, thanks to him

- - - - -
a91857fa by Yves-Alexis Perez at 2018-08-08T15:19:32Z
switch to compat 10

drop parallel and autoreconf addons, now handled by dh 10

- - - - -
ce545e69 by Yves-Alexis Perez at 2018-08-08T15:23:19Z
update changelog

- - - - -


8 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/libexo-1-0.install
- debian/libexo-helpers.install
- + debian/patches/0001-use-u-b-perl-instead-of-env-as-interpreter-path.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 at 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
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,8 @@ Source: exo
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <debian-xfce at lists.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>,
-           Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: chrpath,
-               debhelper (>= 9),
-               dh-autoreconf,
+Uploaders: Yves-Alexis Perez <corsac at 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
=====================================
--- a/debian/libexo-1-0.install
+++ b/debian/libexo-1-0.install
@@ -1,5 +1,4 @@
 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
=====================================
--- a/debian/libexo-helpers.install
+++ b/debian/libexo-helpers.install
@@ -1 +1,2 @@
 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
=====================================
--- /dev/null
+++ b/debian/patches/0001-use-u-b-perl-instead-of-env-as-interpreter-path.patch
@@ -0,0 +1,18 @@
+From: Yves-Alexis Perez <corsac at 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
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-use-u-b-perl-instead-of-env-as-interpreter-path.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/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:



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/exo/compare/133a5dec66f2ba8fc7cec9011db3ebdf70813eee...ce545e69edbb7c1e8920019cb44c5e6b318a9a1c

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/exo/compare/133a5dec66f2ba8fc7cec9011db3ebdf70813eee...ce545e69edbb7c1e8920019cb44c5e6b318a9a1c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20180808/17e25d1d/attachment-0001.html>
