r50871 - in /desktop/unstable/gnome-user-share/debian: changelog patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch patches/30-build-Properly-expand-paths-in-gnome-user-share-webd.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Sep 20 10:44:24 2016
New Revision: 50871

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50871
Log:
Drop 30-build-Properly-expand-paths-in-gnome-user-share-webd.patch, merged
upstream.

Removed:
    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/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch
    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=50871&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/changelog	[utf-8] Tue Sep 20 10:44:24 2016
@@ -1,6 +1,8 @@
 gnome-user-share (3.18.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop 30-build-Properly-expand-paths-in-gnome-user-share-webd.patch, merged
+    upstream.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 20 Sep 2016 12:40:02 +0200
 

Modified: desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch?rev=50871&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch	[utf-8] Tue Sep 20 10:44:24 2016
@@ -14,11 +14,11 @@
  data/Makefile.am | 2 ++
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 247b54a..e962df1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,14 +99,12 @@ AM_GLIB_GNU_GETTEXT
+Index: gnome-user-share-3.18.3/configure.ac
+===================================================================
+--- gnome-user-share-3.18.3.orig/configure.ac	2016-09-20 12:43:40.852537001 +0200
++++ gnome-user-share-3.18.3/configure.ac	2016-09-20 12:43:40.848536926 +0200
+@@ -97,14 +97,12 @@
  
  dnl ==========================================================================
  dnl systemd user unit directory
@@ -35,11 +35,11 @@
  
  dnl ==========================================================================
  dnl Check for SELinux
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 8b89428..bde8244 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -12,12 +12,14 @@ gsettings_DATA = $(gsettings_in_files:.xml.in=.xml)
+Index: gnome-user-share-3.18.3/data/Makefile.am
+===================================================================
+--- gnome-user-share-3.18.3.orig/data/Makefile.am	2016-09-20 12:43:40.852537001 +0200
++++ gnome-user-share-3.18.3/data/Makefile.am	2016-09-20 12:43:40.848536926 +0200
+@@ -15,12 +15,14 @@
  @INTLTOOL_XML_NOMERGE_RULE@
  @GSETTINGS_RULES@
  
@@ -54,6 +54,3 @@
  
  convertdir = $(datadir)/GConf/gsettings
  convert_DATA = gnome-user-share.convert
--- 
-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=50871&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/patches/series	[utf-8] Tue Sep 20 10:44:24 2016
@@ -2,4 +2,3 @@
 #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