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

[diocles-guest at users.alioth.debian.org]

Author: diocles-guest
Date: Tue Dec 25 14:56:32 2007
New Revision: 3603

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3603
Log:
  * debian/patches/no_dup_apps_icons.dpatch: Adjust Makefiles so as not to
    install application icons in two different locations. (Closes: #441326)

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

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3603&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Dec 25 14:56:32 2007
@@ -1,9 +1,14 @@
 f-spot (0.4.1-2~pre1) UNRELEASED; urgency=low
 
-  * debian/patched/02_autoreconf.dpatch:
+  [ Mirco Bauer ]
+  * debian/patches/02_autoreconf.dpatch:
     + Dropped
 
- -- Mirco Bauer <meebey at debian.org>  Thu, 13 Dec 2007 22:24:23 +0100
+  [ Tim Retout ]
+  * debian/patches/no_dup_apps_icons.dpatch: Adjust Makefiles so as not to
+    install application icons in two different locations. (Closes: #441326)
+
+ -- Tim Retout <tim at retout.co.uk>  Tue, 25 Dec 2007 14:54:28 +0000
 
 f-spot (0.4.1-1) unstable; urgency=low
 

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=3603&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Dec 25 14:56:32 2007
@@ -7,3 +7,4 @@
 forward_port_to_flickrnet_2.1.5
 detect_sqlite2_databases
 99_ltmain_as-needed
+no_dup_apps_icons

Added: packages/f-spot/trunk/debian/patches/no_dup_apps_icons.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/no_dup_apps_icons.dpatch?rev=3603&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/no_dup_apps_icons.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/no_dup_apps_icons.dpatch Tue Dec 25 14:56:32 2007
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_dup_apps_icons.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not install application icons under /usr/share/f-spot.
+
+ at DPATCH@
+diff -urNad trunk~/icons/Makefile.am trunk/icons/Makefile.am
+--- trunk~/icons/Makefile.am	2007-12-04 12:19:26.000000000 +0000
++++ trunk/icons/Makefile.am	2007-12-25 14:45:47.000000000 +0000
+@@ -54,11 +54,6 @@
+ 	actions,view-restore-22.png		\
+ 	actions,view-restore-24.png		\
+ 	actions,view-restore-32.png		\
+-	apps,f-spot.svg				\
+-	apps,f-spot-16.png			\
+-	apps,f-spot-22.png			\
+-	apps,f-spot-24.png			\
+-	apps,f-spot-32.png			\
+ 	devices,camera-photo-16.png		\
+ 	devices,camera-photo-22.png		\
+ 	devices,camera-photo-24.png		\
+diff -urNad trunk~/icons/Makefile.in trunk/icons/Makefile.in
+--- trunk~/icons/Makefile.in	2007-12-04 12:20:32.000000000 +0000
++++ trunk/icons/Makefile.in	2007-12-25 14:46:19.000000000 +0000
+@@ -303,11 +303,6 @@
+ 	actions,view-restore-22.png		\
+ 	actions,view-restore-24.png		\
+ 	actions,view-restore-32.png		\
+-	apps,f-spot.svg				\
+-	apps,f-spot-16.png			\
+-	apps,f-spot-22.png			\
+-	apps,f-spot-24.png			\
+-	apps,f-spot-32.png			\
+ 	devices,camera-photo-16.png		\
+ 	devices,camera-photo-22.png		\
+ 	devices,camera-photo-24.png		\

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