r50017 - in /desktop/unstable/gnome-user-share/debian: changelog control patches/30-build-Properly-expand-paths-in-gnome-user-share-webd.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Sep 2 16:16:16 UTC 2016
Author: biebl
Date: Fri Sep 2 16:16:16 2016
New Revision: 50017
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50017
Log:
Add patch to properly expand paths in gnome-user-share-webdav.desktop.
Added:
desktop/unstable/gnome-user-share/debian/patches/30-build-Properly-expand-paths-in-gnome-user-share-webd.patch
Modified:
desktop/unstable/gnome-user-share/debian/changelog
desktop/unstable/gnome-user-share/debian/control
desktop/unstable/gnome-user-share/debian/patches/series
Modified: desktop/unstable/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/changelog?rev=50017&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/changelog [utf-8] Fri Sep 2 16:16:16 2016
@@ -9,6 +9,7 @@
* Drop debian/dirs, no longer needed.
* Convert from cdbs to dh.
* Bump debhelper compatibility level to 9.
+ * Add patch to properly expand paths in gnome-user-share-webdav.desktop.
-- Michael Biebl <biebl at debian.org> Fri, 02 Sep 2016 16:18:34 +0200
Modified: desktop/unstable/gnome-user-share/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control?rev=50017&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/control [utf-8] Fri Sep 2 16:16:16 2016
@@ -7,7 +7,7 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
dh-autoreconf,
gnome-pkg-tools,
gnome-common,
Added: desktop/unstable/gnome-user-share/debian/patches/30-build-Properly-expand-paths-in-gnome-user-share-webd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/30-build-Properly-expand-paths-in-gnome-user-share-webd.patch?rev=50017&op=file
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/30-build-Properly-expand-paths-in-gnome-user-share-webd.patch (added)
+++ desktop/unstable/gnome-user-share/debian/patches/30-build-Properly-expand-paths-in-gnome-user-share-webd.patch [utf-8] Fri Sep 2 16:16:16 2016
@@ -0,0 +1,64 @@
+From 2afcd89006900172e171a7782be86b3a8e94344a Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Fri, 2 Sep 2016 18:12:59 +0200
+Subject: [PATCH] build: Properly expand paths in
+ gnome-user-share-webdav.desktop
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770764
+---
+ configure.ac | 3 ---
+ data/Makefile.am | 3 +++
+ data/gnome-user-share-webdav.desktop.in.in | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e962df1..5cda7a2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,8 +85,6 @@ fi
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+ fi
+-installdir="`eval echo $libexecdir`"
+-AC_SUBST(installdir, $installdir)
+
+ dnl ==========================================================================
+ IT_PROG_INTLTOOL([0.35.0])
+@@ -186,7 +184,6 @@ fi
+ AC_CONFIG_FILES([
+ Makefile
+ data/Makefile
+-data/gnome-user-share-webdav.desktop.in
+ data/org.gnome.desktop.file-sharing.gschema.xml.in
+ po/Makefile.in
+ src/Makefile
+diff --git a/data/Makefile.am b/data/Makefile.am
+index bde8244..33b8e30 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -3,6 +3,9 @@ applicationsdir = $(datadir)/applications/
+ applications_DATA = $(applications_in_files:.desktop.in=.desktop)
+ applications_in_files = gnome-user-share-webdav.desktop.in
+
++gnome-user-share-webdav.desktop.in: gnome-user-share-webdav.desktop.in.in Makefile
++ $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++
+ appdir = $(datadir)/gnome-user-share
+ app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile
+
+diff --git a/data/gnome-user-share-webdav.desktop.in.in b/data/gnome-user-share-webdav.desktop.in.in
+index d7c47c2..ecb88d4 100644
+--- a/data/gnome-user-share-webdav.desktop.in.in
++++ b/data/gnome-user-share-webdav.desktop.in.in
+@@ -3,7 +3,7 @@ _Name=Personal File Sharing
+ _Comment=Launch Personal File Sharing if enabled
+ _Keywords=share;files;http;network;copy;send;
+ Icon=folder-remote
+-Exec=@installdir@/gnome-user-share-webdav
++Exec=@libexecdir@/gnome-user-share-webdav
+ Terminal=false
+ Type=Application
+ Categories=
+--
+2.9.3
+
Modified: desktop/unstable/gnome-user-share/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/series?rev=50017&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/patches/series [utf-8] Fri Sep 2 16:16:16 2016
@@ -2,3 +2,4 @@
#02_bluetooth_optional.patch
10_apache_2.4.patch
20-build-Don-t-install-systemd-user-unit-files-if-targe.patch
+30-build-Properly-expand-paths-in-gnome-user-share-webd.patch
More information about the pkg-gnome-commits
mailing list