[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.1.5-3-8-g9d2d7df

Iain Lane laney at ubuntu.com
Tue May 18 17:57:41 UTC 2010 

The following commit has been merged in the master branch:
commit 8a6f5ae7b869ed0afdcca446c44f428a53be8f96
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon May 17 20:00:10 2010 +0100

    debian/patches/*: Refresh to apply to new upstream version

diff --git a/debian/changelog b/debian/changelog
index ddef66b..80a4ae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
   * debian/control: Add build-dependency on libunique-dev to build new
     unique-sharp bindings which f-spot now uses to handle activation.
   * debian/patches/debian_link-system-mono-addins.patch: Drop, now upstream 
+  * debian/patches/*: Refresh to apply to new upstream version 
 
  -- Iain Lane <laney at ubuntu.com>  Mon, 17 May 2010 11:59:58 +0100
 
diff --git a/debian/patches/debian_disable-unit-tests b/debian/patches/debian_disable-unit-tests
index 7622c9b..53a22e2 100644
--- a/debian/patches/debian_disable-unit-tests
+++ b/debian/patches/debian_disable-unit-tests
@@ -4,10 +4,10 @@ Forwarded: not-needed
 
 Index: f-spot.git/configure.ac
 ===================================================================
---- f-spot.git.orig/configure.ac	2010-04-15 11:48:26.036097143 +0100
-+++ f-spot.git/configure.ac	2010-04-15 11:48:33.774845929 +0100
-@@ -147,8 +147,8 @@
- AC_SUBST(PATH_DBUS)
+--- f-spot.git.orig/configure.ac	2010-05-17 16:37:43.976710072 +0100
++++ f-spot.git/configure.ac	2010-05-17 16:56:00.066711595 +0100
+@@ -200,8 +200,8 @@
+ AC_SUBST(NDESK_DBUS_LIBS)
  
  dnl -- nunit
 -PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED, 
diff --git a/debian/patches/debian_fix-distclean.patch b/debian/patches/debian_fix-distclean.patch
index d14c6b4..fcb805b 100644
--- a/debian/patches/debian_fix-distclean.patch
+++ b/debian/patches/debian_fix-distclean.patch
@@ -7,9 +7,9 @@
 @DPATCH@
 Index: f-spot.git/Makefile.am
 ===================================================================
---- f-spot.git.orig/Makefile.am	2009-10-29 14:18:29.798756638 +0000
-+++ f-spot.git/Makefile.am	2009-10-29 14:19:03.969757415 +0000
-@@ -44,7 +44,6 @@
+--- f-spot.git.orig/Makefile.am	2010-05-17 11:59:36.606708998 +0100
++++ f-spot.git/Makefile.am	2010-05-17 16:32:15.376708636 +0100
+@@ -54,7 +54,6 @@
          intltool-extract        \
          intltool-merge          \
          intltool-update         \
diff --git a/debian/patches/debian_libfspot-linkage.patch b/debian/patches/debian_libfspot-linkage.patch
index 04df8b4..b68953d 100644
--- a/debian/patches/debian_libfspot-linkage.patch
+++ b/debian/patches/debian_libfspot-linkage.patch
@@ -7,8 +7,8 @@
 @DPATCH@
 Index: f-spot.git/lib/libfspot/Makefile.am
 ===================================================================
---- f-spot.git.orig/lib/libfspot/Makefile.am	2009-10-29 14:18:29.714756954 +0000
-+++ f-spot.git/lib/libfspot/Makefile.am	2009-10-29 14:19:04.953756819 +0000
+--- f-spot.git.orig/lib/libfspot/Makefile.am	2009-10-21 16:01:21.000000000 +0100
++++ f-spot.git/lib/libfspot/Makefile.am	2010-05-17 16:33:14.856720436 +0100
 @@ -31,6 +31,8 @@
  	f-utils.h
  
diff --git a/debian/patches/debian_libfspotjpegtran-linkage.patch b/debian/patches/debian_libfspotjpegtran-linkage.patch
index ea2f4ff..99139bf 100644
--- a/debian/patches/debian_libfspotjpegtran-linkage.patch
+++ b/debian/patches/debian_libfspotjpegtran-linkage.patch
@@ -7,8 +7,8 @@
 @DPATCH@
 Index: f-spot.git/lib/libjpegtran/Makefile.am
 ===================================================================
---- f-spot.git.orig/lib/libjpegtran/Makefile.am	2009-10-29 14:18:29.658757147 +0000
-+++ f-spot.git/lib/libjpegtran/Makefile.am	2009-10-29 14:19:05.233767113 +0000
+--- f-spot.git.orig/lib/libjpegtran/Makefile.am	2009-10-21 16:01:21.000000000 +0100
++++ f-spot.git/lib/libjpegtran/Makefile.am	2010-05-17 16:33:20.006711137 +0100
 @@ -18,5 +18,6 @@
  libfspotjpegtran_la_SOURCES =			\
  	$(libfspotjpegtran_files)
diff --git a/debian/patches/debian_link-system-flickrnet.patch b/debian/patches/debian_link-system-flickrnet.patch
index b535543..465328a 100644
--- a/debian/patches/debian_link-system-flickrnet.patch
+++ b/debian/patches/debian_link-system-flickrnet.patch
@@ -8,11 +8,11 @@
 @DPATCH@
 Index: f-spot.git/configure.ac
 ===================================================================
---- f-spot.git.orig/configure.ac	2009-10-29 14:19:05.509756682 +0000
-+++ f-spot.git/configure.ac	2009-10-29 14:19:05.821756676 +0000
-@@ -324,7 +324,6 @@
+--- f-spot.git.orig/configure.ac	2010-05-17 11:59:36.000000000 +0100
++++ f-spot.git/configure.ac	2010-05-17 16:37:43.976710072 +0100
+@@ -376,7 +376,6 @@
+ extensions/Exporters/Makefile
  extensions/Exporters/CDExport/Makefile
- extensions/Exporters/DefaultExporters/Makefile
  extensions/Exporters/FlickrExport/Makefile
 -extensions/Exporters/FlickrExport/FlickrNet/Makefile
  extensions/Exporters/GalleryExport/Makefile
@@ -20,17 +20,17 @@ Index: f-spot.git/configure.ac
  extensions/Exporters/FolderExport/Makefile
 Index: f-spot.git/extensions/Exporters/FlickrExport/Makefile.am
 ===================================================================
---- f-spot.git.orig/extensions/Exporters/FlickrExport/Makefile.am	2009-10-29 14:18:29.426756349 +0000
-+++ f-spot.git/extensions/Exporters/FlickrExport/Makefile.am	2009-10-29 14:19:05.821756676 +0000
-@@ -20,16 +20,13 @@
- 	$(LINK_GIOSHARP)				\
- 	$(LINK_GTKSHARPBEANS)		\
- 	$(LINK_DBUS)				\
+--- f-spot.git.orig/extensions/Exporters/FlickrExport/Makefile.am	2010-05-17 11:59:36.000000000 +0100
++++ f-spot.git/extensions/Exporters/FlickrExport/Makefile.am	2010-05-17 16:43:30.046709088 +0100
+@@ -19,16 +19,13 @@
+ 	$(LINK_GIOSHARP)			\
+ 	$(LINK_GTKSHARPBEANS)			\
+ 	$(LINK_UNIQUESHARP)			\
 -	-r:FlickrNet/FlickrNet.dll	\
  	-r:Mono.Posix
  
  PKGS =					\
-+    -pkg:flickrnet    \
++    -pkg:flickrnet \
  	-pkg:gtk-sharp-2.0		\
  	-pkg:glade-sharp-2.0
  
diff --git a/debian/patches/debian_link-system-gnome-keyring.patch b/debian/patches/debian_link-system-gnome-keyring.patch
index dd29a00..d330b9e 100644
--- a/debian/patches/debian_link-system-gnome-keyring.patch
+++ b/debian/patches/debian_link-system-gnome-keyring.patch
@@ -6,25 +6,25 @@
 
 Index: f-spot.git/Makefile.include
 ===================================================================
---- f-spot.git.orig/Makefile.include	2009-10-29 14:19:05.509756682 +0000
-+++ f-spot.git/Makefile.include	2009-10-29 14:19:07.317757872 +0000
+--- f-spot.git.orig/Makefile.include	2010-05-17 11:59:36.000000000 +0100
++++ f-spot.git/Makefile.include	2010-05-17 16:55:09.267960224 +0100
 @@ -18,7 +18,7 @@
  
  ## Links
  
 -LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
 +LINK_KEYRING = -pkg:gnome-keyring-sharp-1.0
- LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
- LINK_MONO_ADDINS =			\
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
 Index: f-spot.git/lib/Makefile.am
 ===================================================================
---- f-spot.git.orig/lib/Makefile.am	2009-10-29 14:19:05.509756682 +0000
-+++ f-spot.git/lib/Makefile.am	2009-10-29 14:19:07.317757872 +0000
-@@ -5,7 +5,6 @@
+--- f-spot.git.orig/lib/Makefile.am	2010-05-17 11:59:36.000000000 +0100
++++ f-spot.git/lib/Makefile.am	2010-05-17 16:55:49.197959582 +0100
+@@ -4,7 +4,6 @@
+ UNCONDITIONAL_SUBDIRS = \
  	GKeyFile 			\
  	gio-sharp			\
- 	glitz-sharp			\
 -	gnome-keyring-sharp	\
  	gtk-sharp-beans		\
  	libjpegtran			\
diff --git a/debian/patches/series b/debian/patches/series
index 654e0db..610be21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@ debian_disable-unit-tests
 debian_fix_f-spot.exe.config.patch
 
 ubuntu_importer-targetdir-selector.patch
-ubuntu_fname_quote_percent.patch
 ubuntu_fix_export_crash_FlickrRemote.cs.patch
 ubuntu_nofuse_fix_photo_import.patch
 ubuntu_xdg-photo-dir.patch
diff --git a/debian/patches/ubuntu_nofuse_fix_photo_import.patch b/debian/patches/ubuntu_nofuse_fix_photo_import.patch
index 7566e96..6baff37 100644
--- a/debian/patches/ubuntu_nofuse_fix_photo_import.patch
+++ b/debian/patches/ubuntu_nofuse_fix_photo_import.patch
@@ -7,17 +7,17 @@
 @DPATCH@
 Index: f-spot.git/f-spot-import.desktop.in
 ===================================================================
---- f-spot.git.orig/f-spot-import.desktop.in	2009-10-29 14:18:28.990756849 +0000
-+++ f-spot.git/f-spot-import.desktop.in	2009-10-29 14:19:08.849756837 +0000
+--- f-spot.git.orig/f-spot-import.desktop.in	2010-05-17 11:59:36.637958342 +0100
++++ f-spot.git/f-spot-import.desktop.in	2010-05-17 16:57:22.506710261 +0100
 @@ -16,3 +16,4 @@
  X-GNOME-Bugzilla-Component=General
- X-GNOME-Bugzilla-Version=0.6.1.4
+ X-GNOME-Bugzilla-Version=0.6.2
  X-GNOME-DocPath=f-spot/f-spot.xml
 +X-GIO-NoFuse=true
 Index: f-spot.git/f-spot-import.desktop.in.in
 ===================================================================
---- f-spot.git.orig/f-spot-import.desktop.in.in	2009-10-29 14:18:29.006757763 +0000
-+++ f-spot.git/f-spot-import.desktop.in.in	2009-10-29 14:19:08.849756837 +0000
+--- f-spot.git.orig/f-spot-import.desktop.in.in	2009-10-21 16:01:20.000000000 +0100
++++ f-spot.git/f-spot-import.desktop.in.in	2010-05-17 16:57:22.506710261 +0100
 @@ -16,3 +16,4 @@
  X-GNOME-Bugzilla-Component=General
  X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/debian/patches/ubuntu_xdg-photo-dir.patch b/debian/patches/ubuntu_xdg-photo-dir.patch
index c678ef9..a463ed9 100644
--- a/debian/patches/ubuntu_xdg-photo-dir.patch
+++ b/debian/patches/ubuntu_xdg-photo-dir.patch
@@ -6,11 +6,11 @@
 @ -0,0 +1,16 @@
 Index: f-spot.git/src/Preferences.cs
 ===================================================================
---- f-spot.git.orig/src/Preferences.cs	2009-10-29 14:18:28.922756627 +0000
-+++ f-spot.git/src/Preferences.cs	2009-10-29 14:19:10.045756727 +0000
-@@ -146,7 +146,14 @@
- 			case SCREENSAVER_TAG:
- 				return 1;
+--- f-spot.git.orig/src/Preferences.cs	2010-05-17 11:59:36.716709144 +0100
++++ f-spot.git/src/Preferences.cs	2010-05-17 16:57:27.086720213 +0100
+@@ -148,7 +148,14 @@
+ 			case SCREENSAVER_DELAY:
+ 				return 4.0;
  			case STORAGE_PATH:
 -				return System.IO.Path.Combine (FSpot.Global.HomeDirectory, Catalog.GetString("Photos"));
 +                String default_storage_path = System.IO.Path.Combine (

-- 
f-spot

More information about the Pkg-cli-apps-commits mailing list