[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.1.2-1-6-g4c66633

[Iain Lane]

The following commit has been merged in the master branch:
commit 4c6663302dce49c1c9f019afada040ed00e0c02f
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Sep 28 22:15:38 2009 +0100

    upstream_facebook-label-crash.patch: Drop, included in this release

diff --git a/debian/changelog b/debian/changelog
index a9a4eb8..121cddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ f-spot (0.6.1.3-1) UNRELEASED; urgency=low
   * debian_link-system-flickrnet.patch: Part of this chance was incorporated
     upstream (for another reason); remove from patch. 
   * debian/README.source: Add (thanks Lintian) 
+  * upstream_facebook-label-crash.patch: Drop, included in this release 
 
- -- Iain Lane <laney at ubuntu.com>  Mon, 28 Sep 2009 21:41:57 +0100
+ -- Iain Lane <laney at ubuntu.com>  Mon, 28 Sep 2009 22:15:20 +0100
 
 f-spot (0.6.1.2-1) unstable; urgency=low
 
diff --git a/debian/patches/upstream_facebook-label-crash.patch b/debian/patches/upstream_facebook-label-crash.patch
deleted file mode 100644
index d6aa2c2..0000000
--- a/debian/patches/upstream_facebook-label-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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