[Pkg-cli-apps-commits] r4145 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/svn_folder-export.dpatch

[hanska-guest at users.alioth.debian.org]

Author: hanska-guest
Date: Sun Sep 21 10:17:25 2008
New Revision: 4145

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4145
Log:
* debian/patches/:
  + svn_folder-export.dpatch added, thanks to Arnaud Cornet.
    (Closes: #491126)

Added:
    packages/f-spot/trunk/debian/patches/svn_folder-export.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=4145&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Sep 21 10:17:25 2008
@@ -1,3 +1,11 @@
+f-spot (0.4.4-2) UNRELEASED; urgency=low
+
+  * debian/patches/:
+    + svn_folder-export.dpatch added, thanks to Arnaud Cornet.
+      (Closes: #491126)
+
+ -- David Paleino <d.paleino at gmail.com>  Sun, 21 Sep 2008 12:16:43 +0200
+
 f-spot (0.4.4-1) unstable; urgency=medium
 
   [ Tim Retout ]

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=4145&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Sep 21 10:17:25 2008
@@ -1,5 +1,6 @@
 # Patches from upstream SVN
 svn-044-4010_gio-sharp-destdir
+svn_folder-export
 
 # Patches that haven't been applied upstream yet.
 debian_fix-distclean

Added: packages/f-spot/trunk/debian/patches/svn_folder-export.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn_folder-export.dpatch?rev=4145&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/svn_folder-export.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/svn_folder-export.dpatch Sun Sep 21 10:17:25 2008
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## svn_folder-export.dpatch by Arnaud Cornet <acornet at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.4~/extensions/FolderExport/FolderExport.cs f-spot-0.4.4/extensions/FolderExport/FolderExport.cs
+--- f-spot-0.4.4.orig/extensions/FolderExport/FolderExport.cs	2008-09-21 11:15:50.000000000 +0200
++++ f-spot-0.4.4/extensions/FolderExport/FolderExport.cs	2008-09-21 11:17:25.000000000 +0200
+@@ -503,7 +503,14 @@
+ 				
+ 						FilterSet req_set = new FilterSet ();
+ 						req_set.Add (new ResizeFilter ((uint)Math.Max (req.Width, req.Height)));
+-						if ((bool)Preferences.Get (FolderExport.SHARPEN_KEY)) {
++						bool sharpen;
++						try {
++							sharpen = (bool)Prefernces.Get (FolderExport.SHARPEN_KEY);
++						} catch (NullReferenceException) {
++							sharpen = true;
++							Preferences.Set (FolderExport.SHARPEN_KEY, true);
++						}
++						if (sharpen) {
+ 							if (req.Name == "lq")
+ 								req_set.Add (new SharpFilter (0.1, 2, 4));
+ 							if (req.Name == "thumbs")

Propchange: packages/f-spot/trunk/debian/patches/svn_folder-export.dpatch
------------------------------------------------------------------------------
    svn:executable = *