[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.1.1-1-4-ge531126

[Iain Lane]

The following commit has been merged in the master branch:
commit 00d213306aeb0a6cada2d915002532b846544f69
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat Sep 19 11:16:25 2009 +0100

    New upstream Version 0.6.1.2
    
    * New upstream Version 0.6.1.2
      - no longer fails to upgrade if you have photos from post 2038 (sic)
      - use interpolation on drawing
      - allows to run on gtk2.14
    * debian/patches/upstream_facebook-label-crash.patch: Backport patch from
      upstream to fix crash in Facebook exporter plugin due to two labels having
      the same name.

diff --git a/debian/changelog b/debian/changelog
index a5727ed..6e0f1e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+f-spot (0.6.1.2-1) UNRELEASED; urgency=low
+
+  * New upstream Version 0.6.1.2
+    - no longer fails to upgrade if you have photos from post 2038 (sic)
+    - use interpolation on drawing
+    - allows to run on gtk2.14
+  * debian/patches/upstream_facebook-label-crash.patch: Backport patch from
+    upstream to fix crash in Facebook exporter plugin due to two labels having
+    the same name.
+
+ -- Iain Lane <laney at ubuntu.com>  Sat, 19 Sep 2009 10:12:06 +0100
+
 f-spot (0.6.1.1-1) unstable; urgency=low
 
   * New Upstream Version 0.6.1.1 (LP: #418936)
diff --git a/debian/patches/series b/debian/patches/series
index 9d2487a..6971a8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@ debian_link-system-flickrnet.patch
 debian_link-system-gnome-keyring.patch
 debian_fix_f-spot.exe.config.patch
 
+upstream_facebook-label-crash.patch
 ubuntu_importer-targetdir-selector.patch
 ubuntu_fname_quote_percent.patch
 ubuntu_fix_export_crash_FlickrRemote.cs.patch
diff --git a/debian/patches/upstream_facebook-label-crash.patch b/debian/patches/upstream_facebook-label-crash.patch
new file mode 100644
index 0000000..d6aa2c2
--- /dev/null
+++ b/debian/patches/upstream_facebook-label-crash.patch
@@ -0,0 +1,25 @@
+Index: f-spot.git/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
+===================================================================
+--- f-spot.git.orig/extensions/Exporters/FacebookExport/FacebookExport.addin.xml	2009-08-27 12:10:16.000000000 +0100
++++ f-spot.git/extensions/Exporters/FacebookExport/FacebookExport.addin.xml	2009-09-19 10:42:02.336236825 +0100
+@@ -1,6 +1,6 @@
+ <Addin 	namespace="FSpot"
+ 	id="FacebookExport"
+-	version="0.6.0.5"
++	version="0.6.0.6"
+ 	name="FacebookExport"
+ 	description="Export pictures to facebook"
+ 	author="George Talusan, Jim Ramsay, Stephane Delcroix"
+Index: f-spot.git/extensions/Exporters/FacebookExport/FacebookExport.ui
+===================================================================
+--- f-spot.git.orig/extensions/Exporters/FacebookExport/FacebookExport.ui	2009-07-09 15:03:28.000000000 +0100
++++ f-spot.git/extensions/Exporters/FacebookExport/FacebookExport.ui	2009-09-19 10:42:02.340236720 +0100
+@@ -76,7 +76,7 @@
+                   <object class="GtkHBox" id="permissions_hbox">
+                     <property name="visible">True</property>
+                     <child>
+-                      <object class="GtkLabel" id="label6">
++                      <object class="GtkLabel" id="label_permissions">
+                         <property name="visible">True</property>
+                         <property name="xalign">1</property>
+                         <property name="xpad">2</property>

-- 
Packaging for f-spot