[Pkg-cli-apps-commits] r3781 - in /packages/f-spot/trunk/debian/patches: 00list fix_gallery_extension_install_hook.dpatch

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Sun Mar 9 02:29:28 UTC 2008


Author: diocles-guest
Date: Sun Mar  9 02:29:28 2008
New Revision: 3781

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3781
Log:
Respect $(DESTDIR) in custom install hook in gallery extension.

Added:
    packages/f-spot/trunk/debian/patches/fix_gallery_extension_install_hook.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3781&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Mar  9 02:29:28 2008
@@ -3,6 +3,9 @@
 fix_libfspoteog_linkage
 fix_libfspotjpegtran_linkage
 link_system_libs
+
+# Bugfix for build breakage.
+fix_gallery_extension_install_hook
 
 # Update FlickrNet to 2.1.5
 link_system_flickrnet

Added: packages/f-spot/trunk/debian/patches/fix_gallery_extension_install_hook.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_gallery_extension_install_hook.dpatch?rev=3781&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_gallery_extension_install_hook.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_gallery_extension_install_hook.dpatch Sun Mar  9 02:29:28 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_gallery_extension_install_hook.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Respect the value of $(DESTDIR) in custom install hook.
+
+ at DPATCH@
+diff -urNad f-spot~/extensions/GalleryExport/Makefile.am f-spot/extensions/GalleryExport/Makefile.am
+--- f-spot~/extensions/GalleryExport/Makefile.am	2008-03-09 01:06:51.000000000 +0000
++++ f-spot/extensions/GalleryExport/Makefile.am	2008-03-09 01:08:22.000000000 +0000
+@@ -36,7 +36,7 @@
+ plugindir = $(pkglibdir)/extensions
+ 
+ install-data-hook:
+-	rm -f $(plugindir)/GalleryExport.addin.xml
++	rm -f $(DESTDIR)$(plugindir)/GalleryExport.addin.xml
+ 
+ plugin_DATA =			\
+ 	$(PLUGIN_ASSEMBLY)

Propchange: packages/f-spot/trunk/debian/patches/fix_gallery_extension_install_hook.dpatch
------------------------------------------------------------------------------
    svn:executable = *




More information about the Pkg-cli-apps-commits mailing list