r43845 - in /desktop/unstable/cheese/debian: changelog control patches/ patches/series patches/substitute-bindir-and-libexecdir.patch

Fri Nov 7 11:37:34 UTC 2014

Author: pochu
Date: Fri Nov  7 11:37:34 2014
New Revision: 43845

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43845
Log:
* debian/patches/substitute-bindir-and-libexecdir.patch:
  + Substitute @bindir@ and @libexecdir@ in service files. Fixes
    launching cheese from the shell. Closes: #765513.

Added:
    desktop/unstable/cheese/debian/patches/
    desktop/unstable/cheese/debian/patches/series
    desktop/unstable/cheese/debian/patches/substitute-bindir-and-libexecdir.patch
Modified:
    desktop/unstable/cheese/debian/changelog
    desktop/unstable/cheese/debian/control

Modified: desktop/unstable/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/changelog?rev=43845&op=diff
==============================================================================

--- desktop/unstable/cheese/debian/changelog	[utf-8] (original)
+++ desktop/unstable/cheese/debian/changelog	[utf-8] Fri Nov  7 11:37:34 2014
@@ -1,3 +1,11 @@
+cheese (3.14.1-2) UNRELEASED; urgency=medium
+
+  * debian/patches/substitute-bindir-and-libexecdir.patch:
+    + Substitute @bindir@ and @libexecdir@ in service files. Fixes
+      launching cheese from the shell. Closes: #765513.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Fri, 07 Nov 2014 12:00:30 +0100
+
 cheese (3.14.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/cheese/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/control?rev=43845&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/control	[utf-8] (original)
+++ desktop/unstable/cheese/debian/control	[utf-8] Fri Nov  7 11:37:34 2014
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Apps/Cheese
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/

Added: desktop/unstable/cheese/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/series?rev=43845&op=file
==============================================================================
--- desktop/unstable/cheese/debian/patches/series	(added)
+++ desktop/unstable/cheese/debian/patches/series	[utf-8] Fri Nov  7 11:37:34 2014
@@ -0,0 +1 @@
+substitute-bindir-and-libexecdir.patch

Added: desktop/unstable/cheese/debian/patches/substitute-bindir-and-libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/substitute-bindir-and-libexecdir.patch?rev=43845&op=file
==============================================================================
--- desktop/unstable/cheese/debian/patches/substitute-bindir-and-libexecdir.patch	(added)
+++ desktop/unstable/cheese/debian/patches/substitute-bindir-and-libexecdir.patch	[utf-8] Fri Nov  7 11:37:34 2014
@@ -0,0 +1,75 @@
+From e19f4b1a5ccd682b2d67171f29a037e0b754085b Mon Sep 17 00:00:00 2001
+From: David King <amigadave at amigadave.com>
+Date: Sat, 25 Oct 2014 12:20:36 +0100
+Subject: Substitute bindir and libexecdir in Makefile.am
+
+Rather than substituting the values of libexecdir and bindir during
+configure, which might include some unexpanded shell variables, expand
+and substitute them as targets in Makefile.am instead.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=726095
+
+diff --git a/Makefile.am b/Makefile.am
+index 469e3a4..771cb74 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -367,10 +367,17 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ appstream_in_files = data/org.gnome.Cheese.appdata.xml.in
+ appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
+ 
++data/org.gnome.Cheese.service: data/org.gnome.Cheese.service.in
++	$(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
++
++data/org.gnome.Camera.service: data/org.gnome.Camera.service.in
++	$(AM_V_GEN)$(SED) -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
++
+ servicedir = $(datadir)/dbus-1/services
+-service_DATA = \
+-	data/org.gnome.Camera.service \
+-	data/org.gnome.Cheese.service
++service_in_files = \
++	data/org.gnome.Camera.service.in \
++	data/org.gnome.Cheese.service.in
++service_DATA = $(service_in_files:.service.in=.service)
+ 
+ @GSETTINGS_RULES@
+ gsettings_SCHEMAS = data/org.gnome.Cheese.gschema.xml
+@@ -534,11 +541,12 @@ dist-hook: git-changelog-hook
+ dist_noinst_DATA = \
+ 	ChangeLog.pre-git \
+ 	COPYING.GPL3 \
++	$(appstream_in_files) \
+ 	$(desktop_in_files) \
+ 	$(gsettings_SCHEMAS) \
+ 	$(noinst_gnome_camera_service_headers) \
+ 	$(noinst_resource_files) \
+-	$(appstream_in_files) \
++	$(service_in_files) \
+ 	data/org.gnome.Cheese.gresource.xml \
+ 	data/org.gnome.Camera.xml \
+ 	build-aux/test-driver \
+@@ -566,6 +574,7 @@ CLEANFILES = \
+ 	$(pkgconfig_DATA) \
+ 	$(enum_data) \
+ 	$(gir_DATA) \
++	$(service_DATA) \
+ 	$(typelib_DATA) \
+ 	$(nodist_gnome_camera_service_headers) \
+ 	$(nodist_gnome_camera_service_SOURCES) \
+diff --git a/configure.ac b/configure.ac
+index b32be22..13843f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,9 +215,7 @@ docs/reference/Makefile
+ docs/reference/version.xml
+ data/cheese.pc
+ data/cheese-gtk.pc
+-data/org.gnome.Camera.service
+ data/org.gnome.Cheese.desktop.in
+-data/org.gnome.Cheese.service
+ help/Makefile
+ po/Makefile.in
+ ])
+-- 
+cgit v0.10.1
+


