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

[Iain Lane]

The following commit has been merged in the master branch:
commit 953a660e231e6797848b00cc9d15496f7ced16a8
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Sep 28 21:40:24 2009 +0100

    New upstream Version 0.6.1.3
    
    * New upstream Version 0.6.1.3
      - call g_type_init () prior to using gconf
      - avoid echoing an entry as tip
      - check for existing files on version creation
      - set the progress dialog properties atomically
      - avoid a crash in the facebook extensions (Iain Lane)
      - fix slideshow transitions on gdk csw (>=2.18)
      - prevent a crash on broken exif data (Karl Mikaelsson)
      - support for X-GNOME-FullName in .desktop files
      - avoid locking on loading tiffs
      - better support for parallel build (Christian Krause)
      - avoid a crash on some broken color profiles
      - don't copy files to memory first at import (libgphoto2 >= 2.4, for usb
        cameras only)
      - backported translations from master
    * debian_link-system-flickrnet.patch: Part of this chance was incorporated
      upstream (for another reason); remove from patch.

diff --git a/debian/changelog b/debian/changelog
index cf2b63a..80a4e0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+f-spot (0.6.1.3-1) UNRELEASED; urgency=low
+
+  * New upstream Version 0.6.1.3
+    - call g_type_init () prior to using gconf 
+    - avoid echoing an entry as tip
+    - check for existing files on version creation 
+    - set the progress dialog properties atomically
+    - avoid a crash in the facebook extensions (Iain Lane)
+    - fix slideshow transitions on gdk csw (>=2.18)
+    - prevent a crash on broken exif data (Karl Mikaelsson)
+    - support for X-GNOME-FullName in .desktop files
+    - avoid locking on loading tiffs
+    - better support for parallel build (Christian Krause)
+    - avoid a crash on some broken color profiles 
+    - don't copy files to memory first at import (libgphoto2 >= 2.4, for usb
+      cameras only)
+    - backported translations from master
+  * debian_link-system-flickrnet.patch: Part of this chance was incorporated
+    upstream (for another reason); remove from patch. 
+
+ -- Iain Lane <laney at ubuntu.com>  Mon, 28 Sep 2009 21:39:19 +0100
+
 f-spot (0.6.1.2-1) unstable; urgency=low
 
   * New upstream Version 0.6.1.2
diff --git a/debian/patches/debian_link-system-flickrnet.patch b/debian/patches/debian_link-system-flickrnet.patch
index f8883a5..b426d9c 100644
--- a/debian/patches/debian_link-system-flickrnet.patch
+++ b/debian/patches/debian_link-system-flickrnet.patch
@@ -6,9 +6,11 @@
 ## DP: Link against system flickrnet-2.1.5 rather than bundled f-spot version.
 
 @DPATCH@
---- a/configure.ac
-+++ b/configure.ac
-@@ -318,7 +318,6 @@
+Index: f-spot.git/configure.ac
+===================================================================
+--- f-spot.git.orig/configure.ac	2009-09-28 21:28:31.130890999 +0100
++++ f-spot.git/configure.ac	2009-09-28 21:36:06.054891875 +0100
+@@ -323,7 +323,6 @@
  extensions/Exporters/CDExport/Makefile
  extensions/Exporters/DefaultExporters/Makefile
  extensions/Exporters/FlickrExport/Makefile
@@ -16,8 +18,10 @@
  extensions/Exporters/GalleryExport/Makefile
  extensions/Exporters/FacebookExport/Makefile
  extensions/Exporters/FolderExport/Makefile
---- a/extensions/Exporters/FlickrExport/Makefile.am
-+++ b/extensions/Exporters/FlickrExport/Makefile.am
+Index: f-spot.git/extensions/Exporters/FlickrExport/Makefile.am
+===================================================================
+--- f-spot.git.orig/extensions/Exporters/FlickrExport/Makefile.am	2009-09-28 21:12:52.487391241 +0100
++++ f-spot.git/extensions/Exporters/FlickrExport/Makefile.am	2009-09-28 21:36:06.054891875 +0100
 @@ -20,16 +20,13 @@
  	$(LINK_GIOSHARP)				\
  	$(LINK_GTKSHARPBEANS)		\
@@ -36,11 +40,3 @@
  RESOURCES =				\
  	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
  	-resource:$(srcdir)/$(PLUGIN_NAME).glade
-@@ -40,7 +37,6 @@
- 	mautil p $(PLUGIN_ASSEMBLY)
- 
- $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
--	$(MAKE) -C $(SUBDIRS)
- 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
- 
- plugindir = $(pkglibdir)/extensions
diff --git a/debian/patches/series b/debian/patches/series
index 6971a8c..9d2487a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ 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

-- 
Packaging for f-spot