[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/2.4+dfsg-3-2-gf185c8a

Jo Shields directhex at apebox.org
Wed Sep 15 11:19:20 UTC 2010 

The following commit has been merged in the master branch:
commit 73c94117d97522630e449caf5220501052703a81
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Jun 9 15:32:59 2010 +0100

    refreshed debian/patches/update_templates_for_gtk-sharp_2.12.patch

diff --git a/debian/changelog b/debian/changelog
index cf7c69a..e0917ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ monodevelop (2.3.1+dfsg-1) UNRELEASED; urgency=low
     + src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll
   * debian/control:
     + Bump mono build-deps to 2.6.1, to reflect configure.in
-  * debian/patches/use_libsvn1.patch:
+  * debian/patches/use_libsvn1.patch,
+    debian/patches/update_templates_for_gtk-sharp_2.12.patch:
     + Refreshed
 
  -- Jo Shields <directhex at apebox.org>  Wed, 09 Jun 2010 15:17:58 +0100
diff --git a/debian/patches/update_templates_for_gtk-sharp_2.12.patch b/debian/patches/update_templates_for_gtk-sharp_2.12.patch
old mode 100755
new mode 100644
index da7b85d..065734d
--- a/debian/patches/update_templates_for_gtk-sharp_2.12.patch
+++ b/debian/patches/update_templates_for_gtk-sharp_2.12.patch
@@ -1,51 +1,7 @@
-Index: monodevelop-2.2/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml
+Index: monodevelop.git/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
 ===================================================================
---- monodevelop-2.2.orig/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml	2010-01-07 19:36:26.000000000 +0000
-+++ monodevelop-2.2/src/addins/CSharpBinding/templates/GladeSharp2Project.xpt.xml	2010-01-07 19:36:59.000000000 +0000
-@@ -28,11 +28,11 @@
- 			
- 			<References>
- 				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
--				<Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- 			</References>
- 			
- 			<Resources>
-Index: monodevelop-2.2/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml
-===================================================================
---- monodevelop-2.2.orig/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml	2010-01-07 19:36:26.000000000 +0000
-+++ monodevelop-2.2/src/addins/CSharpBinding/templates/GnomeSharp2Project.xpt.xml	2010-01-07 19:36:59.000000000 +0000
-@@ -28,12 +28,12 @@
- 			
- 			<References>
- 				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
--				<Reference type="Gac" refto="gnome-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--				<Reference type="Gac" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="gnome-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-+				<Reference type="Gac" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- 			</References>
- 
- 			<Files>
-Index: monodevelop-2.2/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
-===================================================================
---- monodevelop-2.2.orig/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml	2010-01-07 19:36:26.000000000 +0000
-+++ monodevelop-2.2/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml	2010-01-07 19:36:59.000000000 +0000
+--- monodevelop.git.orig/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml	2009-09-11 00:00:00.000000000 +0100
++++ monodevelop.git/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml	2010-06-09 15:31:04.000000000 +0100
 @@ -28,12 +28,12 @@
  			
  			<References>
@@ -65,10 +21,10 @@ Index: monodevelop-2.2/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.x
  			</References>
  		
  			<Files>
-Index: monodevelop-2.2/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
+Index: monodevelop.git/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
 ===================================================================
---- monodevelop-2.2.orig/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml	2010-01-07 19:36:26.000000000 +0000
-+++ monodevelop-2.2/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml	2010-01-07 19:38:28.000000000 +0000
+--- monodevelop.git.orig/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml	2009-09-11 00:00:00.000000000 +0100
++++ monodevelop.git/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml	2010-06-09 15:31:04.000000000 +0100
 @@ -28,12 +28,12 @@
  			
  			<References>

-- 
monodevelop

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