r50073 - in /packages/unstable/gnome-multi-writer/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Sep 4 14:12:39 UTC 2016
Author: biebl
Date: Sun Sep 4 14:12:39 2016
New Revision: 50073
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50073
Log:
Replace makefile.in_not_rm.patch and path_to_probe.patch with proper
patches that can be upstreamed.
Added:
packages/unstable/gnome-multi-writer/debian/patches/0001-build-Don-t-remove-NEWS-and-ChangeLog-on-distclean.patch
packages/unstable/gnome-multi-writer/debian/patches/0002-build-move-gnome-multi-writer-probe-to-libexecdir.patch
Removed:
packages/unstable/gnome-multi-writer/debian/patches/makefile.in_not_rm.patch
packages/unstable/gnome-multi-writer/debian/patches/path_to_probe.patch
Modified:
packages/unstable/gnome-multi-writer/debian/changelog
packages/unstable/gnome-multi-writer/debian/control
packages/unstable/gnome-multi-writer/debian/control.in
packages/unstable/gnome-multi-writer/debian/patches/series
packages/unstable/gnome-multi-writer/debian/rules
Modified: packages/unstable/gnome-multi-writer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-multi-writer/debian/changelog?rev=50073&op=diff
==============================================================================
--- packages/unstable/gnome-multi-writer/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-multi-writer/debian/changelog [utf-8] Sun Sep 4 14:12:39 2016
@@ -4,14 +4,14 @@
* Stop patching the generated man pages, upstream groff nowadays renders
both - and \- as HYPHEN-MINUS.
* Drop hard-coded Depends on libgl1-mesa-glx.
- * Drop override for dh_auto_configure, we want the additional compile
- warnings enabled by default.
* Update Build-Depends as per configure.ac:
- Add gobject-introspection, appstream-util and replace itstool with
yelp-tools. Those are required for running autoreconf.
- Add libgudev-1.0-dev and libpolkit-gobject-1-dev.
- Build-depend on autoconf-archive instead of gnome-common
(Closes: #829940)
+ * Replace makefile.in_not_rm.patch and path_to_probe.patch with proper
+ patches that can be upstreamed.
-- Michael Biebl <biebl at debian.org> Sun, 04 Sep 2016 14:22:46 +0200
Modified: packages/unstable/gnome-multi-writer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-multi-writer/debian/control?rev=50073&op=diff
==============================================================================
--- packages/unstable/gnome-multi-writer/debian/control [utf-8] (original)
+++ packages/unstable/gnome-multi-writer/debian/control [utf-8] Sun Sep 4 14:12:39 2016
@@ -10,6 +10,7 @@
Build-Depends: autoconf-archive,
autotools-dev,
debhelper (>= 9),
+ dh-autoreconf,
gnome-pkg-tools,
docbook-utils,
intltool (>= 0.50.0),
Modified: packages/unstable/gnome-multi-writer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-multi-writer/debian/control.in?rev=50073&op=diff
==============================================================================
--- packages/unstable/gnome-multi-writer/debian/control.in [utf-8] (original)
+++ packages/unstable/gnome-multi-writer/debian/control.in [utf-8] Sun Sep 4 14:12:39 2016
@@ -6,6 +6,7 @@
Build-Depends: autoconf-archive,
autotools-dev,
debhelper (>= 9),
+ dh-autoreconf,
gnome-pkg-tools,
docbook-utils,
intltool (>= 0.50.0),
Added: packages/unstable/gnome-multi-writer/debian/patches/0001-build-Don-t-remove-NEWS-and-ChangeLog-on-distclean.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-multi-writer/debian/patches/0001-build-Don-t-remove-NEWS-and-ChangeLog-on-distclean.patch?rev=50073&op=file
==============================================================================
--- packages/unstable/gnome-multi-writer/debian/patches/0001-build-Don-t-remove-NEWS-and-ChangeLog-on-distclean.patch (added)
+++ packages/unstable/gnome-multi-writer/debian/patches/0001-build-Don-t-remove-NEWS-and-ChangeLog-on-distclean.patch [utf-8] Sun Sep 4 14:12:39 2016
@@ -0,0 +1,31 @@
+From 13e6a90315553ec3f401578903e771f7b622129f Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sun, 4 Sep 2016 15:48:52 +0200
+Subject: [PATCH 1/2] build: Don't remove NEWS and ChangeLog on distclean
+
+Those should only be removed on 'maintainer-clean'. See
+https://www.gnu.org/prep/standards/html_node/Standard-Targets.html
+---
+ Makefile.am | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 041377b..43f6946 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -37,12 +37,6 @@ MAINTAINERCLEANFILES = \
+ $(srcdir)/gnome-multi-writer-*.tar.* \
+ `find "$(srcdir)" -type f -name Makefile.in -print`
+
+-distclean-local:
+- if test $(srdcir) = .; then :; else \
+- rm -f ChangeLog; \
+- rm -f NEWS; \
+- fi
+-
+ ChangeLog:
+ @echo Creating $@
+ @if test -d "$(srcdir)/.git"; then \
+--
+2.9.3
+
Added: packages/unstable/gnome-multi-writer/debian/patches/0002-build-move-gnome-multi-writer-probe-to-libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-multi-writer/debian/patches/0002-build-move-gnome-multi-writer-probe-to-libexecdir.patch?rev=50073&op=file
==============================================================================
--- packages/unstable/gnome-multi-writer/debian/patches/0002-build-move-gnome-multi-writer-probe-to-libexecdir.patch (added)
+++ packages/unstable/gnome-multi-writer/debian/patches/0002-build-move-gnome-multi-writer-probe-to-libexecdir.patch [utf-8] Sun Sep 4 14:12:39 2016
@@ -0,0 +1,61 @@
+From 80345116cb54d1ad40062bec1d526f133d83ba87 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sun, 4 Sep 2016 16:03:59 +0200
+Subject: [PATCH 2/2] build: move gnome-multi-writer-probe to libexecdir
+
+gnome-multi-writer-probe is a helper binary which is not supposed to be
+run directly by the user, so move it to libexecdir.
+---
+ configure.ac | 1 +
+ src/Makefile.am | 7 +++++--
+ src/gmw-main.c | 2 +-
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 51869bb..f5dba56 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -122,6 +122,7 @@ echo "
+
+ prefix: ${prefix}
+ datadir: ${datadir}
++ libexecdir: ${libexecdir}
+ compiler: ${CC}
+ cflags: ${CFLAGS}
+ cppflags: ${CPPFLAGS}
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 756f99b..8084a1f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -9,10 +9,13 @@ AM_CPPFLAGS = \
+ $(UDISKS_CFLAGS) \
+ -DG_LOG_DOMAIN=\"GnomeMultiWriter\" \
+ -DG_USB_API_IS_SUBJECT_TO_CHANGE \
+- -DLOCALEDIR=\""$(localedir)"\"
++ -DLOCALEDIR=\""$(localedir)"\" \
++ -DLIBEXECDIR=\""$(libexecdir)"\"
++
++libexec_PROGRAMS = \
++ gnome-multi-writer-probe
+
+ bin_PROGRAMS = \
+- gnome-multi-writer-probe \
+ gnome-multi-writer
+
+ gnome_multi_writer_LDADD = \
+diff --git a/src/gmw-main.c b/src/gmw-main.c
+index c824724..5aa7617 100644
+--- a/src/gmw-main.c
++++ b/src/gmw-main.c
+@@ -888,7 +888,7 @@ gmw_block_device_probe (const gchar *block_dev, GError **error)
+ gint exit_status = 0;
+ g_autofree gchar *standard_output = NULL;
+ const gchar *argv[] = { "/usr/bin/pkexec",
+- "/usr/bin/gnome-multi-writer-probe",
++ LIBEXECDIR"/gnome-multi-writer-probe",
+ block_dev,
+ NULL };
+ const gchar *envp[] = { NULL };
+--
+2.9.3
+
Modified: packages/unstable/gnome-multi-writer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-multi-writer/debian/patches/series?rev=50073&op=diff
==============================================================================
--- packages/unstable/gnome-multi-writer/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-multi-writer/debian/patches/series [utf-8] Sun Sep 4 14:12:39 2016
@@ -1,2 +1,2 @@
-makefile.in_not_rm.patch
-path_to_probe.patch
+0001-build-Don-t-remove-NEWS-and-ChangeLog-on-distclean.patch
+0002-build-move-gnome-multi-writer-probe-to-libexecdir.patch
Modified: packages/unstable/gnome-multi-writer/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-multi-writer/debian/rules?rev=50073&op=diff
==============================================================================
--- packages/unstable/gnome-multi-writer/debian/rules [utf-8] (original)
+++ packages/unstable/gnome-multi-writer/debian/rules [utf-8] Sun Sep 4 14:12:39 2016
@@ -8,12 +8,14 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
- dh $@ --with autotools-dev,gnome
+ dh $@ --with autotools-dev,autoreconf,gnome
+
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --libexecdir=\$${libdir}/gnome-multi-writer
override_dh_installchangelogs:
dh_installchangelogs NEWS
-
-override_dh_install:
- dh_install
- # Remove extra gnome-multi-writer-probe
- rm -f ${DESTDIR}/usr/bin/gnome-multi-writer-probe
More information about the pkg-gnome-commits
mailing list