[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.2-1-6-g4cdf07a

[Iain Lane]

The following commit has been merged in the master branch:
commit 4cdf07a5d3b64fe6ab862a13ffd284d7e655d3ed
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Aug 1 12:38:55 2010 +0100

    Readd patch to not duplicate icons unnecessarily. Thanks to Tim Retout. (Closes: #441326)

diff --git a/debian/patches/debian_dont-duplicate-icons.patch b/debian/patches/debian_dont-duplicate-icons.patch
new file mode 100644
index 0000000..0f17757
--- /dev/null
+++ b/debian/patches/debian_dont-duplicate-icons.patch
@@ -0,0 +1,24 @@
+commit e56e1b505b8de2f72182654d20858203c5d9ac4d
+Author: Tim Retout <tim at retout.co.uk>
+Date:   Thu Jun 24 20:10:00 2010 +0100
+
+    Avoid installing 'apps' icons in two locations.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=505570
+
+Index: f-spot.git/icons/Makefile.am
+===================================================================
+--- f-spot.git.orig/icons/Makefile.am	2010-08-01 12:37:56.406266000 +0100
++++ f-spot.git/icons/Makefile.am	2010-08-01 12:38:31.976265999 +0100
+@@ -59,11 +59,6 @@
+ 	actions,view-restore-22.png		\
+ 	actions,view-restore-24.png		\
+ 	actions,view-restore-32.png		\
+-	apps,f-spot-16.png			\
+-	apps,f-spot-22.png			\
+-	apps,f-spot-24.png			\
+-	apps,f-spot-32.png			\
+-	apps,f-spot-256.png			\
+ 	devices,camera-photo-16.png		\
+ 	devices,camera-photo-22.png		\
+ 	devices,camera-photo-24.png		\
diff --git a/debian/patches/series b/debian/patches/series
index 8375083..6e4c844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ debian_libfspotjpegtran-linkage.patch
 debian_link-system-flickrnet.patch
 debian_link-system-gnome-keyring.patch
 debian_disable-unit-tests
+debian_dont-duplicate-icons.patch
 
 # Patches from Ubuntu
 ubuntu_importer-targetdir-selector.patch

-- 
f-spot