[Pkg-mono-svn-commits] rev 2433 - in
non-group/monodevelop/trunk/debian: . patches
Mirco Bauer
meebey-guest at costa.debian.org
Fri Apr 14 11:42:23 UTC 2006
Author: meebey-guest
Date: 2006-04-14 11:42:22 +0000 (Fri, 14 Apr 2006)
New Revision: 2433
Added:
non-group/monodevelop/trunk/debian/patches/add_new_file_null.dpatch
non-group/monodevelop/trunk/debian/patches/boo_mimetype.dpatch
non-group/monodevelop/trunk/debian/patches/glade_no-gnome.dpatch
non-group/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch
non-group/monodevelop/trunk/debian/patches/remove_gtk-sharp-1.0_support.dpatch
Removed:
non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch
Modified:
non-group/monodevelop/trunk/debian/changelog
non-group/monodevelop/trunk/debian/control
non-group/monodevelop/trunk/debian/patches/00list
Log:
- pre2
Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/changelog 2006-04-14 11:42:22 UTC (rev 2433)
@@ -1,4 +1,4 @@
-monodevelop (0.10-0pre1) unstable; urgency=low
+monodevelop (0.10-0pre2) unstable; urgency=low
* New upstream release
+ Fixed fr.po encoding (Closes: #343889)
@@ -19,13 +19,23 @@
* debian/copyright:
+ Updated author list.
+ Added URL for the source of stetic.
+ * debian/patches/*.dpatch:
+ + Thanks to Sebastian 'slomo' Dröge <slomo at ubuntu.com> for all patches.
* debian/patches/use_real_libs.dpatch:
+ Use real log4net, cecil and FirebirdSql.Data.Firebird instead of the
bundled versions.
- (thanks to Sebastian 'slomo' Dröge <slomo at ubuntu.com> for the patch)
* debian/patches/update_templates_for_gtk_sharp_2.8.x.dpatch:
+ Updates the references to Gtk# 2 libraries in the templates.
- (thanks to Sebastian 'slomo' Dröge <slomo at ubuntu.com> for the patch)
+ * debian/patches/glade_wrong_file_extension.dpatch:
+ + Fixes bug that used .cs instead of .glade
+ * debian/patches/remove_gtk-sharp-1.0_support.dpatch:
+ + Removes Gtk# 1.0 support because it can't work.
+ * debian/patches/boo_mimetype.dpatch:
+ + Adds missing .boo extension entry needed for syntax highlighting
+ * debian/patches/add_new_file_null.dpatch:
+ + Fixes a crash for new files.
+ * debian/patches/glade_no-gnome.dpatch:
+ + Glade templates should not depend on GNOME.
-- Mirco Bauer <meebey at meebey.net> Sun, 19 Mar 2006 15:36:34 +0100
Modified: non-group/monodevelop/trunk/debian/control
===================================================================
--- non-group/monodevelop/trunk/debian/control 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/control 2006-04-14 11:42:22 UTC (rev 2433)
@@ -7,7 +7,7 @@
Package: monodevelop
Architecture: all
-Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-query
+Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-query, nemerle
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.10), monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator
Provides: monodoc-viewer
Description: C#/Boo/Java/Nemerle/ILasm Development Environment
Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/patches/00list 2006-04-14 11:42:22 UTC (rev 2433)
@@ -1,3 +1,8 @@
use_nunit2.2
use_real_libs
update_templates_for_gtk_sharp_2.8.x
+boo_mimetype
+remove_gtk-sharp-1.0_support
+add_new_file_null
+glade_no-gnome
+glade_wrong_file_extension
Added: non-group/monodevelop/trunk/debian/patches/add_new_file_null.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/add_new_file_null.dpatch 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/patches/add_new_file_null.dpatch 2006-04-14 11:42:22 UTC (rev 2433)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- monodevelop-0.10/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs.old 2006-04-13 14:00:10.096000000 +0200
++++ monodevelop-0.10/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs 2006-04-13 14:00:11.700000000 +0200
+@@ -50,6 +50,8 @@
+ public bool CanAttachTo (IViewContent parent)
+ {
+ string filename = parent.ContentName;
++ if (filename == null)
++ return false;
+ string mimetype = Gnome.Vfs.MimeType.GetMimeTypeForUri (filename);
+ if (mimetype == "text/html")
+ return true;
Added: non-group/monodevelop/trunk/debian/patches/boo_mimetype.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/boo_mimetype.dpatch 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/patches/boo_mimetype.dpatch 2006-04-14 11:42:22 UTC (rev 2433)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- monodevelop-0.10/monodevelop.xml.old 2006-04-13 12:12:05.676000000 +0200
++++ monodevelop-0.10/monodevelop.xml 2006-04-13 12:12:54.376000000 +0200
+@@ -12,6 +12,10 @@
+ <comment xml:lang="en">Nemerle source</comment>
+ <glob pattern="*.n"/>
+ </mime-type>
++ <mime-type type="text/x-boo">
++ <comment xml:lang="en">Boo source</comment>
++ <glob pattern="*.boo"/>
++ </mime-type>
+ <mime-type type="text/x-vb">
+ <comment xml:lang="en">VB source</comment>
+ <glob pattern="*.vb"/>
Added: non-group/monodevelop/trunk/debian/patches/glade_no-gnome.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/glade_no-gnome.dpatch 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/patches/glade_no-gnome.dpatch 2006-04-14 11:42:22 UTC (rev 2433)
@@ -0,0 +1,14 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- monodevelop-0.10/Extras/CSharpBinding/templates/GladeSharp2Project.xpt.xml.old 2006-04-13 14:32:43.312000000 +0200
++++ monodevelop-0.10/Extras/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2006-04-13 14:33:00.628000000 +0200
+@@ -40,7 +40,6 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+ <glade-interface>
+-<requires lib="gnome"/>
+
+ <widget class="GtkWindow" id="window1">
+ <property name="visible">True</property>
Added: non-group/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/patches/glade_wrong_file_extension.dpatch 2006-04-14 11:42:22 UTC (rev 2433)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- monodevelop-0.10/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs.old 2006-04-13 15:48:14.088000000 +0200
++++ monodevelop-0.10/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs 2006-04-13 15:48:23.776000000 +0200
+@@ -102,7 +102,7 @@
+ throw new InvalidOperationException ("Only single-file templates can be used to generate resource files");
+
+ try {
+- string fileName = singleFile.SaveFile (project, defaultLanguage, project.BaseDirectory, null);
++ string fileName = singleFile.SaveFile (project, String.Empty, project.BaseDirectory, null);
+
+ ProjectFile resource = new ProjectFile (fileName);
+ resource.BuildAction = BuildAction.EmbedAsResource;
+
Added: non-group/monodevelop/trunk/debian/patches/remove_gtk-sharp-1.0_support.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/remove_gtk-sharp-1.0_support.dpatch 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/patches/remove_gtk-sharp-1.0_support.dpatch 2006-04-14 11:42:22 UTC (rev 2433)
@@ -0,0 +1,556 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+diff -Naur tmp/monodevelop-0.10/Extras/CSharpBinding/CSharpBinding.addin.xml monodevelop-0.10/Extras/CSharpBinding/CSharpBinding.addin.xml
+--- tmp/monodevelop-0.10/Extras/CSharpBinding/CSharpBinding.addin.xml 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/CSharpBinding/CSharpBinding.addin.xml 2006-04-13 12:22:11.496000000 +0200
+@@ -34,11 +34,8 @@
+ <Extension path = "/MonoDevelop/ProjectTemplates">
+ <ProjectTemplate id = "ConsoleProject" resource = "ConsoleProject.xpt.xml"/>
+ <ProjectTemplate id = "EmptyProject" resource = "EmptyProject.xpt.xml"/>
+- <ProjectTemplate id = "GladeSharpProject" resource = "GladeSharpProject.xpt.xml"/>
+ <ProjectTemplate id = "GladeSharp2Project" resource = "GladeSharp2Project.xpt.xml"/>
+- <ProjectTemplate id = "GnomeSharpProject" resource = "GnomeSharpProject.xpt.xml"/>
+ <ProjectTemplate id = "GnomeSharp2Project" resource = "GnomeSharp2Project.xpt.xml"/>
+- <ProjectTemplate id = "GtkSharpProject" resource = "GtkSharpProject.xpt.xml"/>
+ <ProjectTemplate id = "GtkSharp2Project" resource = "GtkSharp2Project.xpt.xml"/>
+ <ProjectTemplate id = "Library" resource = "Library.xpt.xml"/>
+ </Extension>
+diff -Naur tmp/monodevelop-0.10/Extras/CSharpBinding/Makefile.am monodevelop-0.10/Extras/CSharpBinding/Makefile.am
+--- tmp/monodevelop-0.10/Extras/CSharpBinding/Makefile.am 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/CSharpBinding/Makefile.am 2006-04-13 12:21:01.732000000 +0200
+@@ -49,12 +49,9 @@
+ templates/ConsoleProject.xpt.xml \
+ templates/EmptyCSharpFile.xft.xml \
+ templates/EmptyProject.xpt.xml \
+-templates/GladeSharpProject.xpt.xml \
+ templates/GladeSharp2Project.xpt.xml \
+ templates/GnomeSharpProgram.xft.xml \
+-templates/GnomeSharpProject.xpt.xml \
+ templates/GnomeSharp2Project.xpt.xml \
+-templates/GtkSharpProject.xpt.xml \
+ templates/GtkSharp2Project.xpt.xml \
+ templates/GtkSharpWindow.xft.xml \
+ templates/Library.xpt.xml \
+diff -Naur tmp/monodevelop-0.10/Extras/CSharpBinding/Makefile.in monodevelop-0.10/Extras/CSharpBinding/Makefile.in
+--- tmp/monodevelop-0.10/Extras/CSharpBinding/Makefile.in 2006-04-04 23:55:45.000000000 +0200
++++ monodevelop-0.10/Extras/CSharpBinding/Makefile.in 2006-04-13 12:21:27.924000000 +0200
+@@ -289,12 +289,9 @@
+ templates/ConsoleProject.xpt.xml \
+ templates/EmptyCSharpFile.xft.xml \
+ templates/EmptyProject.xpt.xml \
+-templates/GladeSharpProject.xpt.xml \
+ templates/GladeSharp2Project.xpt.xml \
+ templates/GnomeSharpProgram.xft.xml \
+-templates/GnomeSharpProject.xpt.xml \
+ templates/GnomeSharp2Project.xpt.xml \
+-templates/GtkSharpProject.xpt.xml \
+ templates/GtkSharp2Project.xpt.xml \
+ templates/GtkSharpWindow.xft.xml \
+ templates/Library.xpt.xml \
+diff -Naur tmp/monodevelop-0.10/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml monodevelop-0.10/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml
+--- tmp/monodevelop-0.10/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/CSharpBinding/templates/GladeSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100
+@@ -1,136 +0,0 @@
+-<?xml version="1.0"?>
+-<Template originator = "Erik Dasque"
+- created = "03/10/2004"
+- lastModified = "03/11/2004">
+-
+- <!-- Template Header -->
+- <TemplateConfiguration>
+- <_Name>Glade# 1.0 Project</_Name>
+- <Category>C#/Samples</Category>
+- <Icon>res:C#.Project.Form</Icon>
+- <LanguageName>C#</LanguageName>
+- <_Description>a Glade# project with one window and button</_Description>
+- </TemplateConfiguration>
+-
+- <!-- Actions -->
+- <Actions>
+- <Open filename = "Main.cs"/>
+- </Actions>
+-
+- <!-- Template Content -->
+- <Combine name = "${ProjectName}" directory = ".">
+- <Options>
+- <StartupProject>${ProjectName}</StartupProject>
+- </Options>
+-
+- <Project name = "${ProjectName}" directory = ".">
+- <Options/>
+-
+- <References>
+- <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- </References>
+-
+- <Resources>
+-<File name="gui.glade"><![CDATA[<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+-
+-<glade-interface>
+-<requires lib="gnome"/>
+-
+-<widget class="GtkWindow" id="window1">
+- <property name="visible">True</property>
+- <property name="title" translatable="yes">Glade Window</property>
+- <property name="window_position">GTK_WIN_POS_CENTER</property>
+- <property name="modal">False</property>
+- <property name="default_width">256</property>
+- <property name="default_height">256</property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="resizable">True</property>
+- <property name="destroy_with_parent">False</property>
+- <signal name="delete_event" handler="OnWindowDeleteEvent"/>
+-
+- <child>
+- <placeholder/>
+- </child>
+-</widget>
+-
+-</glade-interface>
+-
+-]]></File>
+- </Resources>
+- <Files>
+- <File name="Main.cs">
+-<![CDATA[// project created on ${Date} at ${Time}
+-using System;
+-using Gtk;
+-using Glade;
+-
+-public class GladeApp
+-{
+- public static void Main (string[] args)
+- {
+- new GladeApp (args);
+- }
+-
+- public GladeApp (string[] args)
+- {
+- Application.Init ();
+-
+- Glade.XML gxml = new Glade.XML (null, "gui.glade", "window1", null);
+- gxml.Autoconnect (this);
+- Application.Run ();
+- }
+-
+- // Connect the Signals defined in Glade
+- private void OnWindowDeleteEvent (object sender, DeleteEventArgs a)
+- {
+- Application.Quit ();
+- a.RetVal = true;
+- }
+-}
+-
+-]]>
+-</File>
+-<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
+-using System.Runtime.CompilerServices;
+-
+-// Information about this assembly is defined by the following
+-// attributes.
+-//
+-// change them to the information which is associated with the assembly
+-// you compile.
+-
+-[assembly: AssemblyTitle("")]
+-[assembly: AssemblyDescription("")]
+-[assembly: AssemblyConfiguration("")]
+-[assembly: AssemblyCompany("")]
+-[assembly: AssemblyProduct("")]
+-[assembly: AssemblyCopyright("")]
+-[assembly: AssemblyTrademark("")]
+-[assembly: AssemblyCulture("")]
+-
+-// The assembly version has following format :
+-//
+-// Major.Minor.Build.Revision
+-//
+-// You can specify all values by your own or you can build default build and revision
+-// numbers with the '*' character (the default):
+-
+-[assembly: AssemblyVersion("1.0.*")]
+-
+-// The following attributes specify the key for the sign of your assembly. See the
+-// .NET Framework documentation for more information about signing.
+-// This is not required, if you don't want signing let these attributes like they're.
+-[assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("")]
+-]]></File>
+- </Files>
+- </Project>
+- </Combine>
+-</Template>
+diff -Naur tmp/monodevelop-0.10/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml monodevelop-0.10/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml
+--- tmp/monodevelop-0.10/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/CSharpBinding/templates/GnomeSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100
+@@ -1,107 +0,0 @@
+-<?xml version="1.0"?>
+-<Template originator = "John Luke"
+- created = "01/03/2004"
+- lastModified = "03/08/2004">
+-
+- <!-- Template Header -->
+- <TemplateConfiguration>
+- <_Name>Gnome# 1.0 Project</_Name>
+- <Category>C#/Samples</Category>
+- <Icon>res:C#.Project.Form</Icon>
+- <LanguageName>C#</LanguageName>
+- <_Description>Creates a Gnome# project</_Description>
+- </TemplateConfiguration>
+-
+- <!-- Actions -->
+- <Actions>
+- <Open filename = "Main.cs"/>
+- </Actions>
+-
+- <!-- Template Content -->
+- <Combine name = "${ProjectName}" directory = ".">
+- <Options>
+- <StartupProject>${ProjectName}</StartupProject>
+- </Options>
+-
+- <Project name = "${ProjectName}" directory = ".">
+- <Options/>
+-
+- <References>
+- <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" refto="gnome-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- </References>
+-
+- <Files>
+- <File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
+-using System;
+-
+-public class MainClass
+-{
+- public static void Main (string[] args)
+- {
+- new MyProgram (args);
+- }
+-}]]></File>
+- <File name="MyProgram.cs"><![CDATA[using System;
+-using Gtk;
+-using Gnome;
+-
+-public class MyProgram
+-{
+- public MyProgram (string [] args)
+- {
+- Program program = new Program ("MyProgram", "0.0", Modules.UI, args);
+- App app = new App ("MyProgram", "MyWindow");
+- app.SetDefaultSize (400, 300);
+- app.DeleteEvent += new DeleteEventHandler (OnAppDelete);
+- app.ShowAll ();
+- program.Run ();
+- }
+-
+- private void OnAppDelete (object o, DeleteEventArgs args)
+- {
+- Application.Quit ();
+- }
+-}]]></File>
+- <File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
+-using System.Runtime.CompilerServices;
+-
+-// Information about this assembly is defined by the following
+-// attributes.
+-//
+-// change them to the information which is associated with the assembly
+-// you compile.
+-
+-[assembly: AssemblyTitle("")]
+-[assembly: AssemblyDescription("")]
+-[assembly: AssemblyConfiguration("")]
+-[assembly: AssemblyCompany("")]
+-[assembly: AssemblyProduct("")]
+-[assembly: AssemblyCopyright("")]
+-[assembly: AssemblyTrademark("")]
+-[assembly: AssemblyCulture("")]
+-
+-// The assembly version has following format :
+-//
+-// Major.Minor.Build.Revision
+-//
+-// You can specify all values by your own or you can build default build and revision
+-// numbers with the '*' character (the default):
+-
+-[assembly: AssemblyVersion("1.0.*")]
+-
+-// The following attributes specify the key for the sign of your assembly. See the
+-// .NET Framework documentation for more information about signing.
+-// This is not required, if you don't want signing let these attributes like they're.
+-[assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("")]
+-]]></File>
+- </Files>
+- </Project>
+- </Combine>
+-</Template>
+diff -Naur tmp/monodevelop-0.10/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml monodevelop-0.10/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml
+--- tmp/monodevelop-0.10/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/CSharpBinding/templates/GtkSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100
+@@ -1,106 +0,0 @@
+-<?xml version="1.0"?>
+-<Template originator = "John Luke"
+- created = "01/03/2004"
+- lastModified = "03/25/2004">
+-
+- <!-- Template Header -->
+- <TemplateConfiguration>
+- <_Name>Gtk# 1.0 Project</_Name>
+- <Category>C#/Samples</Category>
+- <Icon>res:C#.Project.Form</Icon>
+- <LanguageName>C#</LanguageName>
+- <_Description>Creates a Gtk# project.</_Description>
+- </TemplateConfiguration>
+-
+- <!-- Actions -->
+- <Actions>
+- <Open filename = "Main.cs"/>
+- </Actions>
+-
+- <!-- Template Content -->
+- <Combine name = "${ProjectName}" directory = ".">
+- <Options>
+- <StartupProject>${ProjectName}</StartupProject>
+- </Options>
+-
+- <Project name = "${ProjectName}" directory = ".">
+- <Options/>
+-
+- <References>
+- <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+- <Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- </References>
+-
+- <Files>
+- <File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
+-using System;
+-using Gtk;
+-
+-class MainClass
+-{
+- public static void Main (string[] args)
+- {
+- Application.Init ();
+- new MyWindow ();
+- Application.Run ();
+- }
+-}]]></File>
+- <File name="MyWindow.cs"><![CDATA[using System;
+-using Gtk;
+-
+-public class MyWindow : Window
+-{
+- public MyWindow () : base ("MyWindow")
+- {
+- this.SetDefaultSize (400, 300);
+- this.DeleteEvent += new DeleteEventHandler (OnMyWindowDelete);
+- this.ShowAll ();
+- }
+-
+- void OnMyWindowDelete (object sender, DeleteEventArgs a)
+- {
+- Application.Quit ();
+- a.RetVal = true;
+- }
+-}]]></File>
+- <File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
+-using System.Runtime.CompilerServices;
+-
+-// Information about this assembly is defined by the following
+-// attributes.
+-//
+-// change them to the information which is associated with the assembly
+-// you compile.
+-
+-[assembly: AssemblyTitle("")]
+-[assembly: AssemblyDescription("")]
+-[assembly: AssemblyConfiguration("")]
+-[assembly: AssemblyCompany("")]
+-[assembly: AssemblyProduct("")]
+-[assembly: AssemblyCopyright("")]
+-[assembly: AssemblyTrademark("")]
+-[assembly: AssemblyCulture("")]
+-
+-// The assembly version has following format :
+-//
+-// Major.Minor.Build.Revision
+-//
+-// You can specify all values by your own or you can build default build and revision
+-// numbers with the '*' character (the default):
+-
+-[assembly: AssemblyVersion("1.0.*")]
+-
+-// The following attributes specify the key for the sign of your assembly. See the
+-// .NET Framework documentation for more information about signing.
+-// This is not required, if you don't want signing let these attributes like they're.
+-[assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("")]
+-]]></File>
+- </Files>
+- </Project>
+- </Combine>
+-</Template>
+diff -Naur tmp/monodevelop-0.10/Extras/VBNetBinding/Makefile.am monodevelop-0.10/Extras/VBNetBinding/Makefile.am
+--- tmp/monodevelop-0.10/Extras/VBNetBinding/Makefile.am 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/VBNetBinding/Makefile.am 2006-04-13 12:19:04.196000000 +0200
+@@ -45,7 +45,6 @@
+ templates/EmptyVBFile.xft.xml \
+ templates/EmptyVBProject.xpt.xml \
+ templates/VBConsoleApplicationProject.xpt.xml \
+-templates/VBGtkSharpProject.xpt.xml \
+ templates/VBGtkSharp2Project.xpt.xml \
+ icons/VB.File.EmptyFile \
+ icons/VB.File.Form \
+diff -Naur tmp/monodevelop-0.10/Extras/VBNetBinding/Makefile.in monodevelop-0.10/Extras/VBNetBinding/Makefile.in
+--- tmp/monodevelop-0.10/Extras/VBNetBinding/Makefile.in 2006-04-04 23:55:47.000000000 +0200
++++ monodevelop-0.10/Extras/VBNetBinding/Makefile.in 2006-04-13 12:19:12.144000000 +0200
+@@ -293,7 +293,6 @@
+ templates/EmptyVBFile.xft.xml \
+ templates/EmptyVBProject.xpt.xml \
+ templates/VBConsoleApplicationProject.xpt.xml \
+-templates/VBGtkSharpProject.xpt.xml \
+ templates/VBGtkSharp2Project.xpt.xml \
+ icons/VB.File.EmptyFile \
+ icons/VB.File.Form \
+diff -Naur tmp/monodevelop-0.10/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml monodevelop-0.10/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml
+--- tmp/monodevelop-0.10/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/VBNetBinding/templates/VBGtkSharpProject.xpt.xml 1970-01-01 01:00:00.000000000 +0100
+@@ -1,107 +0,0 @@
+-<?xml version="1.0"?>
+-<Template originator = "Ben Motmans"
+- created = "02/16/2005"
+- lastModified = "02/16/2005">
+-
+- <!-- Template Header -->
+- <TemplateConfiguration>
+- <_Name>Gtk# Project</_Name>
+- <Category>VBNet</Category>
+- <Icon>res:VB.Project.Form</Icon>
+- <LanguageName>VBNet</LanguageName>
+- <_Description>Creates a VB.NET Gtk# project.</_Description>
+- </TemplateConfiguration>
+-
+- <!-- Actions -->
+- <Actions>
+- <Open filename = "Main.vb"/>
+- </Actions>
+-
+- <!-- Template Content -->
+- <Combine name = "${ProjectName}" directory = ".">
+- <Options>
+- <StartupProject>${ProjectName}</StartupProject>
+- </Options>
+-
+- <Project name = "${ProjectName}" directory = ".">
+- <Options/>
+-
+- <References>
+- <Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="glade-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- <Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+- </References>
+-
+- <Files>
+- <File name="Main.vb"><![CDATA[' project created on ${Date} at ${Time}
+-Imports System
+-Imports Gtk
+-
+-Public Class MainClass
+-
+- Public Shared Sub Main ()
+- Application.Init ()
+- new MyWindow ()
+- Application.Run ()
+- End Sub
+-
+-End Class]]></File>
+- <File name="MyWindow.vb"><![CDATA[Imports System
+-Imports Gtk
+-
+-Public Class MyWindow
+- Inherits Window
+-
+- Public Sub New ()
+- MyBase.New("MyWindow")
+-
+- Me.SetDefaultSize (400, 300)
+- AddHandler MyBase.DeleteEvent, AddressOf OnMyWindowDelete
+- Me.ShowAll ()
+- End Sub
+-
+- Private Sub OnMyWindowDelete (ByVal sender As Object, ByVal a As DeleteEventArgs)
+- Application.Quit ()
+- a.RetVal = true
+- End Sub
+-
+-End Class]]></File>
+- <File name="AssemblyInfo.cs"><![CDATA[Imports System.Reflection
+-Imports System.Runtime.InteropServices
+-
+-' Information about this assembly is defined by the following
+-' attributes.
+-'
+-' change them to the information which is associated with the assembly
+-' you compile.
+-
+-<Assembly: AssemblyTitle("")>
+-<Assembly: AssemblyDescription("")>
+-<Assembly: AssemblyConfiguration("")>
+-<Assembly: AssemblyCompany("")>
+-<Assembly: AssemblyProduct("")>
+-<Assembly: AssemblyCopyright("")>
+-<Assembly: AssemblyTrademark("")>
+-<Assembly: AssemblyCulture("")>
+-
+-' The assembly version has following format :
+-'
+-' Major.Minor.Build.Revision
+-'
+-' You can specify all values by your own or you can build default build and revision
+-' numbers with the '*' character (the default):
+-
+-<Assembly: AssemblyVersion("1.0.*")>
+-
+-' The following attributes specify the key for the sign of your assembly. See the
+-' .NET Framework documentation for more information about signing.
+-' This is not required, if you don't want signing let these attributes like they're.
+-<Assembly: AssemblyDelaySign(false)>
+-<Assembly: AssemblyKeyFile("")>
+-]]></File>
+- </Files>
+- </Project>
+- </Combine>
+-</Template>
+diff -Naur tmp/monodevelop-0.10/Extras/VBNetBinding/VBNetBinding.addin.xml monodevelop-0.10/Extras/VBNetBinding/VBNetBinding.addin.xml
+--- tmp/monodevelop-0.10/Extras/VBNetBinding/VBNetBinding.addin.xml 2006-04-04 21:29:34.000000000 +0200
++++ monodevelop-0.10/Extras/VBNetBinding/VBNetBinding.addin.xml 2006-04-13 12:19:26.616000000 +0200
+@@ -33,7 +33,6 @@
+ <Extension path = "/MonoDevelop/ProjectTemplates">
+ <ProjectTemplate id = "EmptyVBProject" resource = "EmptyVBProject.xpt.xml"/>
+ <ProjectTemplate id = "VBConsoleApplicationProject" resource = "VBConsoleApplicationProject.xpt.xml"/>
+- <ProjectTemplate id = "VBGtkSharpProject" resource = "VBGtkSharpProject.xpt.xml"/>
+ <ProjectTemplate id = "VBGtkSharp2Project" resource = "VBGtkSharp2Project.xpt.xml"/>
+ </Extension>
+
Deleted: non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch 2006-04-14 11:05:01 UTC (rev 2432)
+++ non-group/monodevelop/trunk/debian/patches/use_real_log4net_and_firebird.dpatch 2006-04-14 11:42:22 UTC (rev 2433)
@@ -1,160 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- ../monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.am 2005-11-15 18:59:50.000000000 +0100
-+++ monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.am 2006-03-19 19:28:38.925077088 +0100
-@@ -127,7 +127,7 @@
- REFS = -r:Mono.Posix.dll \
- -r:System.Runtime.Remoting \
- -r:ICSharpCode.SharpZipLib.dll \
-- -r:$(top_builddir)/build/bin/log4net.dll \
-+ `pkg-config --libs log4net` \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll
-
- all: $(DLL) $(ADDIN_BUILD)/$(ADDIN)
---- ../monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.in 2005-11-23 21:45:11.000000000 +0100
-+++ monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.in 2006-03-19 19:27:17.123512816 +0100
-@@ -366,7 +366,7 @@
- REFS = -r:Mono.Posix.dll \
- -r:System.Runtime.Remoting \
- -r:ICSharpCode.SharpZipLib.dll \
-- -r:$(top_builddir)/build/bin/log4net.dll \
-+ `pkg-config --libs log4net` \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll
-
- ADDIN = MonoDevelop.Core.addin.xml
---- ../monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.am 2005-11-15 11:37:23.000000000 +0100
-+++ monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.am 2006-03-19 19:30:12.766810976 +0100
-@@ -10,7 +10,7 @@
- /r:Mono.Posix.dll \
- /r:Mono.GetOptions.dll \
- /r:System.Runtime.Remoting \
-- /r:$(top_builddir)/build/bin/log4net.dll \
-+ `pkg-config --libs log4net` \
- $(GTK_SHARP_LIBS) \
- $(GNOME_SHARP_LIBS) \
- $(GNOME_VFS_SHARP_LIBS) \
---- ../monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.in 2005-11-23 21:45:12.000000000 +0100
-+++ monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.in 2006-03-19 19:30:35.479358144 +0100
-@@ -253,7 +253,7 @@
- /r:Mono.Posix.dll \
- /r:Mono.GetOptions.dll \
- /r:System.Runtime.Remoting \
-- /r:$(top_builddir)/build/bin/log4net.dll \
-+ `pkg-config --libs log4net` \
- $(GTK_SHARP_LIBS) \
- $(GNOME_SHARP_LIBS) \
- $(GNOME_VFS_SHARP_LIBS) \
---- ../monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2005-09-23 22:11:15.000000000 +0200
-+++ monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2006-03-19 19:37:12.247040288 +0100
-@@ -44,7 +44,7 @@
- -r:Mono.Data.SqliteClient \
- -r:System.Data.OracleClient \
- -r:Mono.Data.SybaseClient \
---r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
-+-r:FirebirdSql.Data.Firebird
-
- ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
-
---- ../monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2005-11-23 21:45:18.000000000 +0100
-+++ monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2006-03-19 19:37:23.302359624 +0100
-@@ -282,7 +282,7 @@
- -r:Mono.Data.SqliteClient \
- -r:System.Data.OracleClient \
- -r:Mono.Data.SybaseClient \
---r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
-+-r:FirebirdSql.Data.Firebird
-
- ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
- DLL = $(ADDIN_BUILD)/Mono.Data.Sql.dll
-
---- ../monodevelop-0.9/contrib/Makefile.am 2005-09-23 22:11:15.000000000 +0200
-+++ monodevelop-0.9/contrib/Makefile.am 2006-03-19 19:40:43.207969352 +0100
-@@ -1,34 +1,17 @@
-
- BINDIR=$(top_builddir)/build/bin
--LOG4NET_DLL=log4net.dll
--LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
- CECIL_DLL=Mono.Cecil.dll
- CECIL = $(BINDIR)/$(CECIL_DLL)
-
--# We need to copy Firebird to the same directory as where
--# mono.data.sql builds. otherwise, mono.data.sql cant find the
--# firebird provider when monoquery links against mono.data.sql.
--FIREBIRDDIR=$(top_builddir)/build/AddIns/MonoQuery
--FIREBIRD_DLL=FirebirdSql.Data.Firebird.dll
--FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
--
--all: $(LOG4NET) $(CECIL) $(FIREBIRD)
--
--$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
-- mkdir -p $(BINDIR)
-- cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
-+all: $(CECIL)
-
- $(CECIL): $(srcdir)/$(CECIL_DLL)
- mkdir -p $(BINDIR)
- cp $(srcdir)/$(CECIL_DLL) $(CECIL)
-
--$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
-- mkdir -p $(FIREBIRDDIR)
-- cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
--
- assemblydir = $(MD_ASSEMBLY_DIR)
--assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
-+assembly_DATA = $(CECIL)
-
--CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
--EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
-+CLEANFILES = $(CECIL)
-+EXTRA_DIST = $(CECIL_DLL)
-
---- ../monodevelop-0.9/contrib/Makefile.in 2005-11-23 21:45:23.000000000 +0100
-+++ monodevelop-0.9/contrib/Makefile.in 2006-03-19 19:41:25.750501904 +0100
-@@ -238,21 +238,16 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- BINDIR = $(top_builddir)/build/bin
--LOG4NET_DLL = log4net.dll
--LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
- CECIL_DLL = Mono.Cecil.dll
- CECIL = $(BINDIR)/$(CECIL_DLL)
-
- # We need to copy Firebird to the same directory as where
- # mono.data.sql builds. otherwise, mono.data.sql cant find the
- # firebird provider when monoquery links against mono.data.sql.
--FIREBIRDDIR = $(top_builddir)/build/AddIns/MonoQuery
--FIREBIRD_DLL = FirebirdSql.Data.Firebird.dll
--FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
- assemblydir = $(MD_ASSEMBLY_DIR)
--assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
--CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
--EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
-+assembly_DATA = $(CECIL)
-+CLEANFILES = $(CECIL)
-+EXTRA_DIST = $(CECIL_DLL)
- all: all-am
-
- .SUFFIXES:
-@@ -426,19 +421,12 @@
- uninstall-info-am
-
-
--all: $(LOG4NET) $(CECIL) $(FIREBIRD)
--
--$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
-- mkdir -p $(BINDIR)
-- cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
-+all: $(CECIL)
-
- $(CECIL): $(srcdir)/$(CECIL_DLL)
- mkdir -p $(BINDIR)
- cp $(srcdir)/$(CECIL_DLL) $(CECIL)
-
--$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
-- mkdir -p $(FIREBIRDDIR)
-- cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
More information about the Pkg-mono-svn-commits
mailing list