[Pkg-cli-apps-commits] r3905 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/stable-042-3834_gphoto2-cameralist.dpatch patches/stable-042-3835_gnome-sharp-typo.dpatch

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Tue Apr 15 22:49:56 UTC 2008 

Author: diocles-guest
Date: Tue Apr 15 22:49:56 2008
New Revision: 3905

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3905
Log:
Patch from upstream for bug in gphoto2 bindings. (Closes: #475662)

Added:
    packages/f-spot/trunk/debian/patches/stable-042-3834_gphoto2-cameralist.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list
    packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3905&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Apr 15 22:49:56 2008
@@ -10,6 +10,9 @@
       debian/patches/gtkhtml-sharp-3.14_port.dpatch.
   * debian/patches/stable-042-3833_protected-nodeattributes.dpatch:
     + Patch from upstream stable SVN branch for protected node attributes.
+  * debian/patches/stable-042-3834_gphoto2-cameralist.dpatch:
+    + Patch from upstream stable SVN branch for bug in gphoto2 bindings.
+      (Closes: #475662)
   * debian/patches/11_screensaver_path.dpatch:
     + Remove - there is no point hardcoding a full path.
   * debian/control:
@@ -19,7 +22,7 @@
     status; svn-042-* are on upstream SVN trunk, stable-042-* are from the
     upstream stable SVN branch, and debian_* patches are not upstream.
 
- -- Tim Retout <tim at retout.co.uk>  Tue, 15 Apr 2008 23:34:18 +0100
+ -- Tim Retout <tim at retout.co.uk>  Tue, 15 Apr 2008 23:46:17 +0100
 
 f-spot (0.4.2-1) unstable; urgency=low
 

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=3905&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Apr 15 22:49:56 2008
@@ -3,6 +3,7 @@
 stable-042-3748_v8-db-updater
 stable-042-3782_gtkhtml-sharp-3.14
 stable-042-3833_protected-nodeattributes
+stable-042-3834_gphoto2-cameralist
 stable-042-3835_gnome-sharp-typo
 
 # Patches from upstream SVN trunk.

Added: packages/f-spot/trunk/debian/patches/stable-042-3834_gphoto2-cameralist.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/stable-042-3834_gphoto2-cameralist.dpatch?rev=3905&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/stable-042-3834_gphoto2-cameralist.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/stable-042-3834_gphoto2-cameralist.dpatch Tue Apr 15 22:49:56 2008
@@ -1,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## stable-042-3834_gphoto2-cameralist.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from upstream stable branch r3834 to fix a bug in the gphoto2
+## DP: bindings. (Closes: #475662)
+
+ at DPATCH@
+commit 99209c5ec0da41bbf7c14bad574120b8e41c3b73
+Author: sdelcroix <sdelcroix at 772769d8-d925-0410-89eb-a6ffa0d40526>
+Date:   Tue Apr 15 11:02:19 2008 +0000
+
+    2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
+    
+    	backporting r3831 to the 042_STABLE branch
+    
+    
+    git-svn-id: http://svn.gnome.org/svn/f-spot/branches/FSPOT_0_4_2_STABLE@3834 772769d8-d925-0410-89eb-a6ffa0d40526
+
+diff --git a/ChangeLog b/ChangeLog
+index 393b6d1..3d1a32e 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,9 @@
+ 2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
+ 
++	backporting r3831 to the 042_STABLE branch
++
++2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
++
+ 	backporting r3832 to the 042_STABLE branch
+ 
+ 2008-03-25  Stephane Delcroix  <sdelcroix at novell.com>
+diff --git a/libgphoto2-sharp/CameraList.cs b/libgphoto2-sharp/CameraList.cs
+index dfc5dbb..24e2a6c 100644
+--- a/libgphoto2-sharp/CameraList.cs
++++ b/libgphoto2-sharp/CameraList.cs
+@@ -69,27 +69,27 @@ namespace LibGPhoto2
+ 		}
+ 		
+ 		[DllImport ("libgphoto2.so")]
+-		internal static extern ErrorCode gp_list_get_name (HandleRef list, int index, out string name);
++		internal static extern ErrorCode gp_list_get_name (HandleRef list, int index, out IntPtr name);
+ 
+ 		public string GetName (int index)
+ 		{
+-			string name;
++			IntPtr name;
+ 
+ 			Error.CheckError (gp_list_get_name(this.Handle, index, out name));
+ 
+-			return name;
++			return Marshal.PtrToStringAnsi (name);
+ 		}
+ 		
+ 		[DllImport ("libgphoto2.so")]
+-		internal static extern ErrorCode gp_list_get_value (HandleRef list, int index, out string value);
++		internal static extern ErrorCode gp_list_get_value (HandleRef list, int index, out IntPtr value);
+ 
+ 		public string GetValue (int index)
+ 		{
+-			string value;
++			IntPtr value;
+ 
+ 			Error.CheckError (gp_list_get_value(this.Handle, index, out value));
+ 
+-			return value;
++			return Marshal.PtrToStringAnsi (value);
+ 		}
+ 		
+ 		[DllImport ("libgphoto2.so")]

Propchange: packages/f-spot/trunk/debian/patches/stable-042-3834_gphoto2-cameralist.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch?rev=3905&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch Tue Apr 15 22:49:56 2008
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad f-spot~/ChangeLog f-spot/ChangeLog
---- f-spot~/ChangeLog	2008-04-15 23:32:08.000000000 +0100
-+++ f-spot/ChangeLog	2008-04-15 23:32:54.000000000 +0100
+--- f-spot~/ChangeLog	2008-04-15 23:43:25.000000000 +0100
++++ f-spot/ChangeLog	2008-04-15 23:43:54.000000000 +0100
 @@ -1,5 +1,9 @@
  2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
  
@@ -15,12 +15,12 @@
 +
 +2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
 +
- 	backporting r3832 to the 042_STABLE branch
+ 	backporting r3831 to the 042_STABLE branch
  
- 2008-03-25  Stephane Delcroix  <sdelcroix at novell.com>
+ 2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
 diff -urNad f-spot~/configure.in f-spot/configure.in
---- f-spot~/configure.in	2008-04-15 23:32:08.000000000 +0100
-+++ f-spot/configure.in	2008-04-15 23:32:08.000000000 +0100
+--- f-spot~/configure.in	2008-04-15 23:43:25.000000000 +0100
++++ f-spot/configure.in	2008-04-15 23:43:25.000000000 +0100
 @@ -75,7 +75,7 @@
  
  CSC_DEFINES=""

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