[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.2-2-2-g276352a

[Iain Lane]

The following commit has been merged in the master branch:
commit bf06c3ad2c827d52ee61fe92624ce52e33839d68
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Aug 2 14:33:06 2010 +0100

    Add cherrypicked patch to fix gconf schemas to not generate warnings on installation
    
    Closes: #584215

diff --git a/debian/patches/debian_fix-schema-warning.patch b/debian/patches/debian_fix-schema-warning.patch
new file mode 100644
index 0000000..6ddd4a9
--- /dev/null
+++ b/debian/patches/debian_fix-schema-warning.patch
@@ -0,0 +1,48 @@
+Description: Remove empty default tags from schemas to prevent a gconf warning
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584215
+Forwarded: not-needed
+
+Index: f-spot.git/f-spot.schemas.in
+===================================================================
+--- f-spot.git.orig/f-spot.schemas.in	2010-08-02 14:31:03.266266002 +0100
++++ f-spot.git/f-spot.schemas.in	2010-08-02 14:31:29.346266000 +0100
+@@ -8,7 +8,6 @@
+         <key>/schemas/desktop/gnome/f-spot/ui/gtkrc</key>
+ 	<applyto>/desktop/gnome/f-spot/ui/gtkrc</applyto>
+ 	<type>string</type>
+-	<default></default>
+ 	<locale name="C">
+ 	  <short>Path to custom gtkrc for theming F-Spot.</short>
+ 	  <long>Path to custom gtkrc for theming F-Spot.</long>
+@@ -53,7 +52,6 @@
+         <key>/schemas/desktop/gnome/f-spot/ui/main_window_x</key>
+ 	<applyto>/desktop/gnome/f-spot/ui/main_window_x</applyto>
+ 	<type>int</type>
+-	<default></default>
+ 	<locale name="C">
+ 	  <short>X position of the main window.</short>
+ 	  <long>The X position to use for the main window.</long>
+@@ -64,7 +62,6 @@
+         <key>/schemas/desktop/gnome/f-spot/ui/main_window_y</key>
+ 	<applyto>/desktop/gnome/f-spot/ui/main_window_y</applyto>
+ 	<type>int</type>
+-	<default></default>
+ 	<locale name="C">
+ 	  <short>Y position of the main window.</short>
+ 	  <long>The Y position to use for the main window.</long>
+@@ -253,7 +250,6 @@
+         <key>/schemas/desktop/gnome/f-spot/ui/viewer_x</key>
+ 	<applyto>/desktop/gnome/f-spot/ui/viewer_x</applyto>
+ 	<type>int</type>
+-	<default></default>
+ 	<locale name="C">
+ 	  <short>X position of the photo viewer window.</short>
+ 	  <long>The X position to use for the photo viewer window.</long>
+@@ -264,7 +260,6 @@
+         <key>/schemas/desktop/gnome/f-spot/ui/viewer_y</key>
+ 	<applyto>/desktop/gnome/f-spot/ui/viewer_y</applyto>
+ 	<type>int</type>
+-	<default></default>
+ 	<locale name="C">
+ 	  <short>Y position of the photo viewer window.</short>
+ 	  <long>The Y position to use for the photo viewer window.</long>
diff --git a/debian/patches/series b/debian/patches/series
index 6e4c844..ee5e961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@ debian_link-system-flickrnet.patch
 debian_link-system-gnome-keyring.patch
 debian_disable-unit-tests
 debian_dont-duplicate-icons.patch
+debian_fix-schema-warning.patch
 
 # Patches from Ubuntu
 ubuntu_importer-targetdir-selector.patch

-- 
f-spot