[Pkg-cli-apps-commits] r5292 - in /packages/monodevelop/trunk/debian: ./ patches/

directhex at users.alioth.debian.org directhex at users.alioth.debian.org
Tue Feb 2 13:04:04 UTC 2010


Author: directhex
Date: Tue Feb  2 13:04:03 2010
New Revision: 5292

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5292
Log:
* split "disable stuff" patch into 2 distinct patches, to make it easier to re-enable one component
* create (disabled) packaging data for monodevelop-moonlight and monodevelop-debugger-sdb, for the same reason. yes it works.

Added:
    packages/monodevelop/trunk/debian/monodevelop-debugger-sdb.install
      - copied, changed from r5291, packages/monodevelop/trunk/debian/monodevelop-nunit.install
    packages/monodevelop/trunk/debian/monodevelop-moonlight.install
      - copied, changed from r5291, packages/monodevelop/trunk/debian/monodevelop-nunit.install
    packages/monodevelop/trunk/debian/patches/remove_support_for_moonlight.patch
    packages/monodevelop/trunk/debian/patches/remove_support_for_soft_debugger.patch
Removed:
    packages/monodevelop/trunk/debian/patches/remove_support_for_non_debian_functionality.patch
Modified:
    packages/monodevelop/trunk/debian/changelog
    packages/monodevelop/trunk/debian/control
    packages/monodevelop/trunk/debian/patches/series
    packages/monodevelop/trunk/debian/rules

Modified: packages/monodevelop/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/changelog?rev=5292&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/changelog (original)
+++ packages/monodevelop/trunk/debian/changelog Tue Feb  2 13:04:03 2010
@@ -1,3 +1,20 @@
+monodevelop (2.2+dfsg-3) UNRELEASED; urgency=low
+
+  * debian/patches/remove_support_for_non_debian_functionality.patch,
+    debian/patches/remove_support_for_soft_debugger.patch,
+    debian/patches/remove_support_for_moonlight.patch,
+    debian/rules:
+    + Split patch into two pieces, to make it easier to enable either
+      SDB or Moonlight support with a rebuild
+  * debian/monodevelop-moonlight.install,
+    debian/monodevelop-debugger-sdb.install,
+    debian/control:
+    + Create packaging data for the Soft Debugger addin and Moonlight addin -
+      and comment them out of debian/control as we can't provide them on
+      Debian for now
+
+ -- Jo Shields <directhex at apebox.org>  Tue, 02 Feb 2010 11:39:59 +0000
+
 monodevelop (2.2+dfsg-2) unstable; urgency=low
 
   * debian/rules/remove_support_for_non_debian_functionality.patch:

Modified: packages/monodevelop/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/control?rev=5292&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/control (original)
+++ packages/monodevelop/trunk/debian/control Tue Feb  2 13:04:03 2010
@@ -101,3 +101,28 @@
  .
  This package enables version control integration (currently only Subversion)
  for MonoDevelop.
+
+#Package: monodevelop-moonlight
+#Architecture: all
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends},
+#         ${cli:Depends},
+#         monodevelop (= ${source:Version}),
+#         moonlight-web-devel
+#Description: Moonlight plugin for MonoDevelop
+# MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
+# languages.
+# .
+# This package enables Moonlight developnment with MonoDevelop.
+
+#Package: monodevelop-debugger-sdb
+#Architecture: all
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends},
+#         ${cli:Depends},
+#         monodevelop (= ${source:Version})
+#Description: Mono Soft Debugger plugin for MonoDevelop
+# MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
+# languages.
+# .
+# This package enables the Mono Soft Debugger integrationfor MonoDevelop.

Copied: packages/monodevelop/trunk/debian/monodevelop-debugger-sdb.install (from r5291, packages/monodevelop/trunk/debian/monodevelop-nunit.install)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/monodevelop-debugger-sdb.install?rev=5292&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/monodevelop-nunit.install (original)
+++ packages/monodevelop/trunk/debian/monodevelop-debugger-sdb.install Tue Feb  2 13:04:03 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/monodevelop/AddIns/NUnit/
+debian/tmp/usr/lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/

Copied: packages/monodevelop/trunk/debian/monodevelop-moonlight.install (from r5291, packages/monodevelop/trunk/debian/monodevelop-nunit.install)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/monodevelop-moonlight.install?rev=5292&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/monodevelop-nunit.install (original)
+++ packages/monodevelop/trunk/debian/monodevelop-moonlight.install Tue Feb  2 13:04:03 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/monodevelop/AddIns/NUnit/
+debian/tmp/usr/lib/monodevelop/AddIns/MonoDevelop.Moonlight/

Added: packages/monodevelop/trunk/debian/patches/remove_support_for_moonlight.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/remove_support_for_moonlight.patch?rev=5292&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/remove_support_for_moonlight.patch (added)
+++ packages/monodevelop/trunk/debian/patches/remove_support_for_moonlight.patch Tue Feb  2 13:04:03 2010
@@ -1,0 +1,21 @@
+Index: monodevelop-2.2+dfsg/monodevelop-core-addins.pc.in
+===================================================================
+--- monodevelop-2.2+dfsg.orig/monodevelop-core-addins.pc.in	2010-02-02 11:36:32.333625099 +0000
++++ monodevelop-2.2+dfsg/monodevelop-core-addins.pc.in	2010-02-02 11:36:38.573657907 +0000
+@@ -6,4 +6,4 @@
+ Name: MonoDevelop Core Add-ins
+ Description: MonoDevelop Core Add-ins
+ Version: @VERSION@
+-Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll
++Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll
+Index: monodevelop-2.2+dfsg/src/addins/Makefile.am
+===================================================================
+--- monodevelop-2.2+dfsg.orig/src/addins/Makefile.am	2010-02-02 11:36:21.673635424 +0000
++++ monodevelop-2.2+dfsg/src/addins/Makefile.am	2010-02-02 11:36:24.791133318 +0000
+@@ -27,6 +27,5 @@
+ 	MonoDevelop.RegexToolkit \
+ 	CBinding \
+ 	MonoDevelop.AssemblyBrowser \
+-	MonoDevelop.Moonlight \
+ 	MonoDevelop.CodeMetrics \
+ 	WindowsPlatform

Added: packages/monodevelop/trunk/debian/patches/remove_support_for_soft_debugger.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/remove_support_for_soft_debugger.patch?rev=5292&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/remove_support_for_soft_debugger.patch (added)
+++ packages/monodevelop/trunk/debian/patches/remove_support_for_soft_debugger.patch Tue Feb  2 13:04:03 2010
@@ -1,0 +1,79 @@
+Index: monodevelop-2.2+dfsg/src/addins/Makefile.am
+===================================================================
+--- monodevelop-2.2+dfsg.orig/src/addins/Makefile.am	2009-09-11 00:00:00.000000000 +0100
++++ monodevelop-2.2+dfsg/src/addins/Makefile.am	2010-02-02 11:34:05.013657615 +0000
+@@ -1,33 +1,32 @@
+ 
+-SUBDIRS = \
+-	MacPlatform \
+-	GnomePlatform \
+-	MonoDevelop.DesignerSupport \
+-	MonoDevelop.Debugger \
+-	Deployment \
+-	VersionControl/Diff \
+-	MonoDevelop.Refactoring \
+-	MonoDevelop.SourceEditor2 \
+-	VersionControl \
+-	MonoDevelop.Autotools \
+-	MonoDevelop.Gettext \
+-	CSharpBinding \
+-	ILAsmBinding \
+-	NUnit \
+-	MonoDeveloperExtensions \
+-	VBNetBinding \
+-	prj2make-sharp-lib \
+-	WelcomePage \
+-	MonoDevelop.GtkCore \
+-	ChangeLogAddIn \
+-	MonoDevelop.XmlEditor \
+-	TextTemplating \
+-	AspNet \
+-	MonoDevelop.WebReferences \
+-	MonoDevelop.RegexToolkit \
+-	CBinding \
+-	MonoDevelop.AssemblyBrowser \
+-	MonoDevelop.Moonlight \
+-	MonoDevelop.CodeMetrics \
+-	MonoDevelop.Debugger.Soft \
+-	WindowsPlatform
++SUBDIRS = \
++	MacPlatform \
++	GnomePlatform \
++	MonoDevelop.DesignerSupport \
++	MonoDevelop.Debugger \
++	Deployment \
++	VersionControl/Diff \
++	MonoDevelop.Refactoring \
++	MonoDevelop.SourceEditor2 \
++	VersionControl \
++	MonoDevelop.Autotools \
++	MonoDevelop.Gettext \
++	CSharpBinding \
++	ILAsmBinding \
++	NUnit \
++	MonoDeveloperExtensions \
++	VBNetBinding \
++	prj2make-sharp-lib \
++	WelcomePage \
++	MonoDevelop.GtkCore \
++	ChangeLogAddIn \
++	MonoDevelop.XmlEditor \
++	TextTemplating \
++	AspNet \
++	MonoDevelop.WebReferences \
++	MonoDevelop.RegexToolkit \
++	CBinding \
++	MonoDevelop.AssemblyBrowser \
++	MonoDevelop.Moonlight \
++	MonoDevelop.CodeMetrics \
++	WindowsPlatform
+Index: monodevelop-2.2+dfsg/monodevelop-core-addins.pc.in
+===================================================================
+--- monodevelop-2.2+dfsg.orig/monodevelop-core-addins.pc.in	2009-09-11 00:00:00.000000000 +0100
++++ monodevelop-2.2+dfsg/monodevelop-core-addins.pc.in	2010-02-02 11:34:58.741133807 +0000
+@@ -6,4 +6,4 @@
+ Name: MonoDevelop Core Add-ins
+ Description: MonoDevelop Core Add-ins
+ Version: @VERSION@
+-Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll
++Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll

Modified: packages/monodevelop/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/series?rev=5292&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/series (original)
+++ packages/monodevelop/trunk/debian/patches/series Tue Feb  2 13:04:03 2010
@@ -7,4 +7,5 @@
 boo_mimetype.patch
 use_csc.patch
 #monodevelop_fix_addin_highlights_r130904.patch
-remove_support_for_non_debian_functionality.patch
+remove_support_for_soft_debugger.patch
+remove_support_for_moonlight.patch

Modified: packages/monodevelop/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/rules?rev=5292&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/rules (original)
+++ packages/monodevelop/trunk/debian/rules Tue Feb  2 13:04:03 2010
@@ -50,9 +50,6 @@
 	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl/
 	# remove ChangeLogAddIn files (shipped in monodevelop-versioncontrol)
 	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/ChangeLogAddIn/
-	# remove Moonlight stuff, since we don't have packages
-	# for the Moonlight SDK yet
-	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/MonoDevelop.Moonlight/
 
 get-orig-source:
 	mkdir -p ../tarballs




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