[Pkg-cli-apps-commits] r3904 - in /packages/f-spot/trunk/debian: ./ patches/

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

Author: diocles-guest
Date: Tue Apr 15 22:49:52 2008
New Revision: 3904

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3904
Log:
Patch from upstream stable SVN branch for protected node attributes.

Added:
    packages/f-spot/trunk/debian/patches/stable-042-3833_protected-nodeattributes.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-3782_gtkhtml-sharp-3.14.dpatch   (contents, props changed)
    packages/f-spot/trunk/debian/patches/stable-042-3835_gnome-sharp-typo.dpatch
    packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch   (contents, props changed)

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3904&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Apr 15 22:49:52 2008
@@ -8,6 +8,8 @@
   * debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch:
     + Use upstream's version of the gtkhtml-sharp-3.14 port, and remove
       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/11_screensaver_path.dpatch:
     + Remove - there is no point hardcoding a full path.
   * debian/control:
@@ -17,7 +19,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:16:02 +0100
+ -- Tim Retout <tim at retout.co.uk>  Tue, 15 Apr 2008 23:34:18 +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=3904&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Apr 15 22:49:52 2008
@@ -2,6 +2,7 @@
 stable-042-3692_cms-linkage
 stable-042-3748_v8-db-updater
 stable-042-3782_gtkhtml-sharp-3.14
+stable-042-3833_protected-nodeattributes
 stable-042-3835_gnome-sharp-typo
 
 # Patches from upstream SVN trunk.

Modified: packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch?rev=3904&op=diff
==============================================================================
    (empty)

Propchange: packages/f-spot/trunk/debian/patches/stable-042-3782_gtkhtml-sharp-3.14.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/f-spot/trunk/debian/patches/stable-042-3833_protected-nodeattributes.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/stable-042-3833_protected-nodeattributes.dpatch?rev=3904&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/stable-042-3833_protected-nodeattributes.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/stable-042-3833_protected-nodeattributes.dpatch Tue Apr 15 22:49:52 2008
@@ -1,0 +1,107 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## protected-nodeattributes.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 r3833 for protected node attributes.
+
+ at DPATCH@
+commit 10ea01bfe529b8adb8d1e978511499a203a413dc
+Author: sdelcroix <sdelcroix at 772769d8-d925-0410-89eb-a6ffa0d40526>
+Date:   Tue Apr 15 11:00:16 2008 +0000
+
+    2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
+    
+    	backporting r3832 to the 042_STABLE branch
+    
+    
+    git-svn-id: http://svn.gnome.org/svn/f-spot/branches/FSPOT_0_4_2_STABLE@3833 772769d8-d925-0410-89eb-a6ffa0d40526
+
+diff --git a/ChangeLog b/ChangeLog
+index 5ece9ed..393b6d1 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++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>
+ 
+ 	* configure.in:
+diff --git a/src/Extensions/CommandMenuItemNode.cs b/src/Extensions/CommandMenuItemNode.cs
+index 04e117e..fa01ddd 100644
+--- a/src/Extensions/CommandMenuItemNode.cs
++++ b/src/Extensions/CommandMenuItemNode.cs
+@@ -18,7 +18,7 @@ namespace FSpot.Extensions
+ 	{
+ 
+ 		[NodeAttribute ("command_type", true)]
+-		string command_type;
++		protected string command_type;
+ 
+ 		protected override void OnActivated (object o, EventArgs e)
+ 		{
+diff --git a/src/Extensions/ComplexMenuItemNode.cs b/src/Extensions/ComplexMenuItemNode.cs
+index 3204d67..0e72029 100644
+--- a/src/Extensions/ComplexMenuItemNode.cs
++++ b/src/Extensions/ComplexMenuItemNode.cs
+@@ -18,10 +18,10 @@ namespace FSpot.Extensions
+ 	public class ComplexMenuItemNode : MenuNode
+ 	{
+ 		[NodeAttribute]
+-		string widget_type;
++		protected string widget_type;
+ 
+ 		[NodeAttribute]
+-		string command_type;
++		protected string command_type;
+ 
+ 		public event EventHandler Changed;
+ 
+diff --git a/src/Extensions/ExportMenuItemNode.cs b/src/Extensions/ExportMenuItemNode.cs
+index f30d323..af33b56 100644
+--- a/src/Extensions/ExportMenuItemNode.cs
++++ b/src/Extensions/ExportMenuItemNode.cs
+@@ -20,7 +20,7 @@ namespace FSpot.Extensions
+ 	{
+ 
+ 		[NodeAttribute ("class", true)]
+-		string class_name;
++		protected string class_name;
+ 
+ 		public static SelectedImages SelectedImages;
+ 
+diff --git a/src/Extensions/MenuNode.cs b/src/Extensions/MenuNode.cs
+index 63ff39f..2a66cec 100644
+--- a/src/Extensions/MenuNode.cs
++++ b/src/Extensions/MenuNode.cs
+@@ -52,7 +52,7 @@ namespace FSpot.Extensions
+ 	public class MenuGeneratorNode : MenuNode
+ 	{
+ 		[NodeAttribute ("generator_type", true)]
+-		string command_type;
++		protected string command_type;
+ 
+ 		private IMenuGenerator menu_generator;
+ 
+@@ -78,7 +78,6 @@ namespace FSpot.Extensions
+ 
+ 		protected virtual void OnActivated (object o, EventArgs e)
+ 		{
+-			Console.WriteLine ("Item {0} activated", Id);
+ 		}
+ 	}
+ 
+@@ -94,10 +93,10 @@ namespace FSpot.Extensions
+ 	public abstract class MenuNode : ExtensionNode
+ 	{
+ 		[NodeAttribute]
+-		string _label;
++		protected string _label;
+ 
+ 		[NodeAttribute]
+-		string icon;
++		protected string icon;
+ 
+ 		public virtual Gtk.MenuItem GetMenuItem ()
+ 		{

Propchange: packages/f-spot/trunk/debian/patches/stable-042-3833_protected-nodeattributes.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=3904&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:52 2008
@@ -6,19 +6,21 @@
 
 @DPATCH@
 diff -urNad f-spot~/ChangeLog f-spot/ChangeLog
---- f-spot~/ChangeLog	2008-04-15 22:52:14.000000000 +0100
-+++ f-spot/ChangeLog	2008-04-15 22:52:47.000000000 +0100
-@@ -1,3 +1,7 @@
+--- f-spot~/ChangeLog	2008-04-15 23:32:08.000000000 +0100
++++ f-spot/ChangeLog	2008-04-15 23:32:54.000000000 +0100
+@@ -1,5 +1,9 @@
+ 2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
+ 
++	backporting r3766 to the 042_STABLE branch
++
 +2008-04-15  Stephane Delcroix  <sdelcroix at novell.com>
 +
-+	backporting r3766 to the 042_STABLE branch
-+
+ 	backporting r3832 to the 042_STABLE branch
+ 
  2008-03-25  Stephane Delcroix  <sdelcroix at novell.com>
- 
- 	* configure.in:
 diff -urNad f-spot~/configure.in f-spot/configure.in
---- f-spot~/configure.in	2008-04-15 22:52:14.000000000 +0100
-+++ f-spot/configure.in	2008-04-15 22:52:14.000000000 +0100
+--- f-spot~/configure.in	2008-04-15 23:32:08.000000000 +0100
++++ f-spot/configure.in	2008-04-15 23:32:08.000000000 +0100
 @@ -75,7 +75,7 @@
  
  CSC_DEFINES=""

Modified: packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch?rev=3904&op=diff
==============================================================================
    (empty)

Propchange: packages/f-spot/trunk/debian/patches/svn-042-3817_importdialog-missing-icon.dpatch
------------------------------------------------------------------------------
    svn:executable = *

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