[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.1.3-2-3-gd6eae3f

Iain Lane laney at ubuntu.com
Thu Oct 29 15:25:42 UTC 2009 

The following commit has been merged in the master branch:
commit d6eae3fb8cab145507f5adcdc277eff3e9b1416c
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Oct 29 14:07:25 2009 +0000

    New upstream release 0.6.1.4
    
    * New upstream release 0.6.1.4
     - keep sorting on startup
     - fix a NRE on LastRollDialog
     - fix the toolbar 2.28-ification
     - accept --sync as comandline parameter
     - avoid crashing on AdjustTimeDialog
     - allow more than 60 pictures per Facebook albums
     - backported translations
    * debian/control: Require at least Cairo 1.4.0 per upstream
    * debian/control: Require cli-common-dev >= 0.5.7 per Debian CLI
      policy
    * Refresh various patches to apply cleanly

diff --git a/debian/changelog b/debian/changelog
index c41e0e9..9861660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+f-spot (0.6.1.4-1) UNRELEASED; urgency=low
+
+  * New upstream release 0.6.1.4
+   - keep sorting on startup
+   - fix a NRE on LastRollDialog
+   - fix the toolbar 2.28-ification
+   - accept --sync as comandline parameter
+   - avoid crashing on AdjustTimeDialog 
+   - allow more than 60 pictures per Facebook albums
+   - backported translations
+  * debian/control: Require at least Cairo 1.4.0 per upstream 
+  * debian/control: Require cli-common-dev >= 0.5.7 per Debian CLI
+    policy
+  * Refresh various patches to apply cleanly  
+
+ -- Iain Lane <laney at ubuntu.com>  Thu, 29 Oct 2009 14:30:30 +0000
+
 f-spot (0.6.1.3-2) unstable; urgency=low
 
   [ Iain Lane ]
diff --git a/debian/control b/debian/control
index bf33182..73c5658 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
- cli-common-dev (>= 0.5.4),
+ cli-common-dev (>= 0.5.7),
  quilt (>= 0.46-7~),
  mono-devel (>= 2.4.2.3),
  libgtk2.0-dev (>= 2.14),
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 7.0.50),
  libmono-sqlite2.0-cil,
  libmono-system-runtime2.0-cil,
  libmono-cairo2.0-cil (>= 1.2.4),
+ libcairo2-dev (>= 1.4.0),
  libmono-addins0.2-cil (>= 0.4),
  libmono-addins-gui0.2-cil (>= 0.4),
  libndesk-dbus1.0-cil (>= 0.4.2),
diff --git a/debian/patches/debian_fix-distclean.patch b/debian/patches/debian_fix-distclean.patch
index 3d496d1..d14c6b4 100644
--- a/debian/patches/debian_fix-distclean.patch
+++ b/debian/patches/debian_fix-distclean.patch
@@ -5,8 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
---- a/Makefile.am
-+++ b/Makefile.am
+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 @@
          intltool-extract        \
          intltool-merge          \
diff --git a/debian/patches/debian_fix_f-spot.exe.config.patch b/debian/patches/debian_fix_f-spot.exe.config.patch
index c385c34..933d533 100644
--- a/debian/patches/debian_fix_f-spot.exe.config.patch
+++ b/debian/patches/debian_fix_f-spot.exe.config.patch
@@ -5,8 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
---- a/src/f-spot.exe.config.in
-+++ b/src/f-spot.exe.config.in
+Index: f-spot.git/src/f-spot.exe.config.in
+===================================================================
+--- f-spot.git.orig/src/f-spot.exe.config.in	2009-10-29 14:18:29.266756878 +0000
++++ f-spot.git/src/f-spot.exe.config.in	2009-10-29 14:19:07.621765182 +0000
 @@ -13,4 +13,5 @@
    <dllmap dll="libXcomposite.dll" target="libXcomposite.so.1"/>
    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
diff --git a/debian/patches/debian_libfspot-linkage.patch b/debian/patches/debian_libfspot-linkage.patch
index a29f339..04df8b4 100644
--- a/debian/patches/debian_libfspot-linkage.patch
+++ b/debian/patches/debian_libfspot-linkage.patch
@@ -5,8 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
---- a/lib/libfspot/Makefile.am
-+++ b/lib/libfspot/Makefile.am
+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
 @@ -31,6 +31,8 @@
  	f-utils.h
  
diff --git a/debian/patches/debian_libfspotjpegtran-linkage.patch b/debian/patches/debian_libfspotjpegtran-linkage.patch
old mode 100755
new mode 100644
index 0759e16..ea2f4ff
--- a/debian/patches/debian_libfspotjpegtran-linkage.patch
+++ b/debian/patches/debian_libfspotjpegtran-linkage.patch
@@ -5,9 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad f-spot-0.4.1~/libjpegtran/Makefile.am f-spot-0.4.1/libjpegtran/Makefile.am
---- f-spot-0.4.1~/lib/libjpegtran/Makefile.am	2007-12-04 13:19:23.000000000 +0100
-+++ f-spot-0.4.1/lib/libjpegtran/Makefile.am	2007-12-09 23:51:33.000000000 +0100
+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
 @@ -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 b426d9c..a232b86 100644
--- a/debian/patches/debian_link-system-flickrnet.patch
+++ b/debian/patches/debian_link-system-flickrnet.patch
@@ -8,9 +8,9 @@
 @DPATCH@
 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 @@
+--- 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 @@
  extensions/Exporters/CDExport/Makefile
  extensions/Exporters/DefaultExporters/Makefile
  extensions/Exporters/FlickrExport/Makefile
@@ -20,8 +20,8 @@ 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-09-28 21:12:52.487391241 +0100
-+++ f-spot.git/extensions/Exporters/FlickrExport/Makefile.am	2009-09-28 21:36:06.054891875 +0100
+--- 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)		\
diff --git a/debian/patches/debian_link-system-gnome-keyring.patch b/debian/patches/debian_link-system-gnome-keyring.patch
index b676dd0..9d27fdc 100644
--- a/debian/patches/debian_link-system-gnome-keyring.patch
+++ b/debian/patches/debian_link-system-gnome-keyring.patch
@@ -4,8 +4,10 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
---- a/Makefile.include
-+++ b/Makefile.include
+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
 @@ -18,7 +18,7 @@
  
  ## Links
@@ -15,8 +17,10 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS =			\
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
+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 @@
  	GKeyFile 			\
  	gio-sharp			\
diff --git a/debian/patches/debian_link-system-mono-addins.patch b/debian/patches/debian_link-system-mono-addins.patch
index fdb3898..46f9b1e 100644
--- a/debian/patches/debian_link-system-mono-addins.patch
+++ b/debian/patches/debian_link-system-mono-addins.patch
@@ -5,8 +5,10 @@
 ## DP: Link against system libraries in preference to versions bundled in the
 ## DP: f-spot tarball.
 
---- a/Makefile.include
-+++ b/Makefile.include
+Index: f-spot.git/Makefile.include
+===================================================================
+--- f-spot.git.orig/Makefile.include	2009-10-29 14:18:29.542756809 +0000
++++ f-spot.git/Makefile.include	2009-10-29 14:19:05.509756682 +0000
 @@ -3,9 +3,6 @@
  
  ## Directories
@@ -32,9 +34,11 @@
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
  LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
  LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
---- a/configure.ac
-+++ b/configure.ac
-@@ -302,10 +302,6 @@
+Index: f-spot.git/configure.ac
+===================================================================
+--- f-spot.git.orig/configure.ac	2009-10-29 14:18:29.578756336 +0000
++++ f-spot.git/configure.ac	2009-10-29 14:19:05.509756682 +0000
+@@ -308,10 +308,6 @@
  lib/libgphoto2-sharp/Makefile
  lib/libjpegtran/Makefile
  lib/Makefile
@@ -45,8 +49,10 @@
  lib/semweb/Makefile
  docs/Makefile
  icons/Makefile
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
+Index: f-spot.git/lib/Makefile.am
+===================================================================
+--- f-spot.git.orig/lib/Makefile.am	2009-10-29 14:18:29.562758733 +0000
++++ f-spot.git/lib/Makefile.am	2009-10-29 14:19:05.509756682 +0000
 @@ -10,7 +10,6 @@
  	libjpegtran			\
  	libfspot			\
diff --git a/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.patch b/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.patch
index b8d5970..3eda14f 100644
--- a/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.patch
+++ b/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.patch
@@ -6,8 +6,10 @@
 ## DP: http://bugzilla.gnome.org/show_bug.cgi?id=553518
 
 @DPATCH@
---- a/extensions/Exporters/FlickrExport/FlickrRemote.cs
-+++ b/extensions/Exporters/FlickrExport/FlickrRemote.cs
+Index: f-spot.git/extensions/Exporters/FlickrExport/FlickrRemote.cs
+===================================================================
+--- f-spot.git.orig/extensions/Exporters/FlickrExport/FlickrRemote.cs	2009-10-29 14:18:29.090754899 +0000
++++ f-spot.git/extensions/Exporters/FlickrExport/FlickrRemote.cs	2009-10-29 14:19:08.558758093 +0000
 @@ -17,6 +17,7 @@
  using FSpot;
  using FSpot.Utils;
diff --git a/debian/patches/ubuntu_fname_quote_percent.patch b/debian/patches/ubuntu_fname_quote_percent.patch
index 5a7a4c2..85fbefa 100644
--- a/debian/patches/ubuntu_fname_quote_percent.patch
+++ b/debian/patches/ubuntu_fname_quote_percent.patch
@@ -6,8 +6,10 @@
 ## DP: https://launchpad.net/bugs/258083
 
 @DPATCH@
---- a/src/Utils/UriUtils.cs
-+++ b/src/Utils/UriUtils.cs
+Index: f-spot.git/src/Utils/UriUtils.cs
+===================================================================
+--- f-spot.git.orig/src/Utils/UriUtils.cs	2009-10-29 14:18:29.150757347 +0000
++++ f-spot.git/src/Utils/UriUtils.cs	2009-10-29 14:19:08.265757117 +0000
 @@ -45,7 +45,7 @@
  			return new Uri (builder.ToString ());
  		}
diff --git a/debian/patches/ubuntu_importer-targetdir-selector.patch b/debian/patches/ubuntu_importer-targetdir-selector.patch
index 7396076..4cfe695 100644
--- a/debian/patches/ubuntu_importer-targetdir-selector.patch
+++ b/debian/patches/ubuntu_importer-targetdir-selector.patch
@@ -6,8 +6,10 @@
 ## DP: LP: #182858, http://bugzilla.gnome.org/show_bug.cgi?id=511569
 
 @DPATCH@
---- a/src/CameraFileSelectionDialog.cs
-+++ b/src/CameraFileSelectionDialog.cs
+Index: f-spot.git/src/CameraFileSelectionDialog.cs
+===================================================================
+--- f-spot.git.orig/src/CameraFileSelectionDialog.cs	2009-10-29 14:18:29.198756433 +0000
++++ f-spot.git/src/CameraFileSelectionDialog.cs	2009-10-29 14:19:07.933765187 +0000
 @@ -33,6 +33,7 @@
  		[Widget] Gtk.OptionMenu tag_option_menu;
  		[Widget] Gtk.CheckButton attach_check;
@@ -26,7 +28,7 @@
  			
  			GetPreviews ();
  		}
-@@ -279,7 +283,11 @@
+@@ -276,7 +280,11 @@
  
  				return new SaveResult (path, true);
  			} else {
@@ -39,8 +41,10 @@
  				System.IO.File.Move (path, dest);
  
  				return new SaveResult (dest, false);
---- a/src/f-spot.glade
-+++ b/src/f-spot.glade
+Index: f-spot.git/src/f-spot.glade
+===================================================================
+--- f-spot.git.orig/src/f-spot.glade	2009-10-29 14:18:29.214766595 +0000
++++ f-spot.git/src/f-spot.glade	2009-10-29 14:19:07.933765187 +0000
 @@ -668,10 +668,44 @@
                </widget>
                <packing>
diff --git a/debian/patches/ubuntu_nofuse_fix_photo_import.patch b/debian/patches/ubuntu_nofuse_fix_photo_import.patch
index 53b88b9..7566e96 100644
--- a/debian/patches/ubuntu_nofuse_fix_photo_import.patch
+++ b/debian/patches/ubuntu_nofuse_fix_photo_import.patch
@@ -5,16 +5,20 @@
 ## DP: LP: #338466
 
 @DPATCH@
---- a/f-spot-import.desktop.in
-+++ b/f-spot-import.desktop.in
-@@ -15,3 +15,4 @@
+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
+@@ -16,3 +16,4 @@
  X-GNOME-Bugzilla-Component=General
- X-GNOME-Bugzilla-Version=0.6.1.1
+ X-GNOME-Bugzilla-Version=0.6.1.4
  X-GNOME-DocPath=f-spot/f-spot.xml
 +X-GIO-NoFuse=true
---- a/f-spot-import.desktop.in.in
-+++ b/f-spot-import.desktop.in.in
-@@ -15,3 +15,4 @@
+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
+@@ -16,3 +16,4 @@
  X-GNOME-Bugzilla-Component=General
  X-GNOME-Bugzilla-Version=@VERSION@
  X-GNOME-DocPath=f-spot/f-spot.xml
diff --git a/debian/patches/ubuntu_xdg-photo-dir.patch b/debian/patches/ubuntu_xdg-photo-dir.patch
index abc7987..c678ef9 100644
--- a/debian/patches/ubuntu_xdg-photo-dir.patch
+++ b/debian/patches/ubuntu_xdg-photo-dir.patch
@@ -4,8 +4,10 @@
 -- f-spot-0.6.0.0.orig/debian/patches/ubuntu_xdg_photo_dir.patch
 ++ f-spot-0.6.0.0/debian/patches/ubuntu_xdg_photo_dir.patch
 @ -0,0 +1,16 @@
---- a/src/Preferences.cs
-+++ b/src/Preferences.cs
+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;

-- 
Packaging for f-spot

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