[Pkg-mono-svn-commits] rev 2093 - in non-group/monodevelop/trunk/debian: . patches

Mirco Bauer meebey-guest at costa.debian.org
Sat Oct 22 15:15:16 UTC 2005 

Author: meebey-guest
Date: 2005-10-22 15:15:15 +0000 (Sat, 22 Oct 2005)
New Revision: 2093

Added:
   non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch
Modified:
   non-group/monodevelop/trunk/debian/changelog
   non-group/monodevelop/trunk/debian/control
   non-group/monodevelop/trunk/debian/patches/00list
   non-group/monodevelop/trunk/debian/rules
Log:
- 0.8 release



Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog	2005-10-22 15:06:40 UTC (rev 2092)
+++ non-group/monodevelop/trunk/debian/changelog	2005-10-22 15:15:15 UTC (rev 2093)
@@ -1,3 +1,23 @@
+monodevelop (0.8-0pre1) unstable; urgency=low
+
+   * New upstream release
+   * debian/rules:
+     - Enabled NUnit support.
+     - Enabled VersionControl (SVN) support.
+   * debian/control:
+     - Added libnunit-cil (>= 1.1.8) to build-deps.
+     - Added monodevelop-java, monodevelop-nunit and monodevelop-versioncontrol
+       package.
+   * debian/patches/00list:
+     - Removed 01_remove_bashism, parsing_mcs_1.1.9_output,
+       update_templates_for_gtk_sharp_2.3.x and boo_0.6.0_compat, they are
+       already applied upstream.
+     - Added 01_use_real_nunit.
+   * debian/patches/01_use_real_nunit.dpatch:
+     - Created patch to use nunit instead of mono-nunit.
+
+ -- Mirco Bauer <meebey at meebey.net>  Sun, 16 Oct 2005 21:26:16 +0200
+
 monodevelop (0.7-3) unstable; urgency=low
 
    * Rebuilt against MonoDoc 1.1.9

Modified: non-group/monodevelop/trunk/debian/control
===================================================================
--- non-group/monodevelop/trunk/debian/control	2005-10-22 15:06:40 UTC (rev 2092)
+++ non-group/monodevelop/trunk/debian/control	2005-10-22 15:15:15 UTC (rev 2093)
@@ -2,20 +2,20 @@
 Section: devel
 Priority: optional
 Maintainer: Mirco Bauer <meebey at meebey.net>
-Build-Depends-Indep: debhelper (>= 4.0.0), cli-common (>= 0.2.0), dpatch, mono-mcs (>= 1.1.2) | c-sharp-compiler, libmono-dev (>= 1.1.2), boo (>= 0.6.0.1858), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, mozilla-dev, gtk-sharp2-gapi (>= 2.3.91), libgtk2.0-cil (>= 2.3.91), libgnome2.0-cil (>= 2.3.91), libgconf2.0-cil (>= 2.3.91), libglade2.0-cil (>= 2.3.91), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10)
+Build-Depends-Indep: debhelper (>= 4.0.0), cli-common (>= 0.2.0), dpatch, mono-mcs (>= 1.1.4) | c-sharp-compiler, libmono-dev (>= 1.1.4), boo (>= 0.6.0.1858), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, mozilla-dev, gtk-sharp2-gapi (>= 2.3.90), libgtk2.0-cil (>= 2.3.90), libgnome2.0-cil (>= 2.3.90), libgconf2.0-cil (>= 2.3.90), libglade2.0-cil (>= 2.3.90), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit-cil (>= 1.1.8)
 Standards-Version: 3.6.2.1
 
 Package: monodevelop
 Architecture: all
-Suggests: monodevelop-boo, monodevelop-java
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs, monodoc-manual, pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator
+Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.4), 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
  MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
  languages.
  .
  Features: Debugger Integration, Class Browser, Monodoc Integration,
- Code Completion, Embedded HTML viewer, Gettext support, boo project support,
+ Code Completion, Embedded HTML viewer, Gettext support, Boo project support,
  Java project support, Nemerle project support, ILAsm project support.
 
 Package: monodevelop-boo
@@ -25,4 +25,32 @@
  MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
  languages.
  .
- This package enables boo integration for MonoDevelop.
+ This package enables Boo integration for MonoDevelop.
+
+Package: monodevelop-java
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${Source-Version}), ikvm (>= 0.10)
+Description: Java plugin for MonoDevelop
+ MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
+ languages.
+ .
+ This package enables Java integration for MonoDevelop.
+
+Package: monodevelop-nunit
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${Source-Version})
+Description: NUnit plugin for MonoDevelop
+ MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
+ languages.
+ .
+ This package enables NUnit integration for MonoDevelop.
+
+Package: monodevelop-versioncontrol
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${Source-Version}), libsvn0, libapr0
+Description: VersionControl plugin for MonoDevelop
+ MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
+ languages.
+ .
+ This package enables version control integration (currently only Subversion)
+ for MonoDevelop.

Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list	2005-10-22 15:06:40 UTC (rev 2092)
+++ non-group/monodevelop/trunk/debian/patches/00list	2005-10-22 15:15:15 UTC (rev 2093)
@@ -1,4 +1 @@
-01_remove_bashism
-parsing_mcs_1.1.9_output
-update_templates_for_gtk_sharp_2.3.x
-boo_0.6.0_compat
+01_use_real_nunit

Added: non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch	2005-10-22 15:06:40 UTC (rev 2092)
+++ non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch	2005-10-22 15:15:15 UTC (rev 2093)
@@ -0,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_use_real_nunit.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-0.8~/Extras/MonoDeveloperExtensions/Makefile.in monodevelop-0.8/Extras/MonoDeveloperExtensions/Makefile.in
+--- monodevelop-0.8~/Extras/MonoDeveloperExtensions/Makefile.in	2005-10-12 18:55:17.000000000 +0200
++++ monodevelop-0.8/Extras/MonoDeveloperExtensions/Makefile.in	2005-10-16 22:19:08.000000000 +0200
+@@ -250,7 +250,7 @@
+        /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \
+        /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
+        /r:$(top_builddir)/build/AddIns/NUnit/MonoDevelop.NUnit.dll \
+-       /r:nunit.core.dll \
++       $(NUNIT_LIBS) \
+        $(GTK_SHARP_LIBS) \
+        $(GLADE_SHARP_LIBS) \
+        $(GCONF_SHARP_LIBS) \
+diff -urNad monodevelop-0.8~/Extras/NUnit/Makefile.in monodevelop-0.8/Extras/NUnit/Makefile.in
+--- monodevelop-0.8~/Extras/NUnit/Makefile.in	2005-10-12 18:55:18.000000000 +0200
++++ monodevelop-0.8/Extras/NUnit/Makefile.in	2005-10-16 22:18:44.000000000 +0200
+@@ -238,8 +238,7 @@
+ target_alias = @target_alias@
+ ADDIN_BUILD = $(top_builddir)/build/AddIns/NUnit
+ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.NUnit.dll
+-DLLS = /r:nunit.framework.dll \
+-	/r:nunit.core.dll \
++DLLS =	$(MONO_NUNIT_LIBS) \
+ 	/r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ 	/r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
+ 	/r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \
+diff -urNad monodevelop-0.8~/configure monodevelop-0.8/configure
+--- monodevelop-0.8~/configure	2005-10-12 18:55:21.000000000 +0200
++++ monodevelop-0.8/configure	2005-10-16 22:18:44.000000000 +0200
+@@ -4259,23 +4259,23 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION" >&5
+-echo $ECHO_N "checking for mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION... $ECHO_C" >&6
++        echo "$as_me:$LINENO: checking for nunit >= $MONO_NUNIT_REQUIRED_VERSION" >&5
++echo $ECHO_N "checking for nunit >= $MONO_NUNIT_REQUIRED_VERSION... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION" ; then
++        if $PKG_CONFIG --exists "nunit >= $MONO_NUNIT_REQUIRED_VERSION" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking MONO_NUNIT_CFLAGS" >&5
+ echo $ECHO_N "checking MONO_NUNIT_CFLAGS... $ECHO_C" >&6
+-            MONO_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
++            MONO_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
+             echo "$as_me:$LINENO: result: $MONO_NUNIT_CFLAGS" >&5
+ echo "${ECHO_T}$MONO_NUNIT_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking MONO_NUNIT_LIBS" >&5
+ echo $ECHO_N "checking MONO_NUNIT_LIBS... $ECHO_C" >&6
+-            MONO_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
++            MONO_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
+             echo "$as_me:$LINENO: result: $MONO_NUNIT_LIBS" >&5
+ echo "${ECHO_T}$MONO_NUNIT_LIBS" >&6
+         else
+@@ -4283,7 +4283,7 @@
+             MONO_NUNIT_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            MONO_NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
++            MONO_NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit >= $MONO_NUNIT_REQUIRED_VERSION"`
+ 
+         fi
+ 
+diff -urNad monodevelop-0.8~/configure.in monodevelop-0.8/configure.in
+--- monodevelop-0.8~/configure.in	2005-10-12 18:52:47.000000000 +0200
++++ monodevelop-0.8/configure.in	2005-10-16 22:18:44.000000000 +0200
+@@ -130,7 +130,7 @@
+ AC_ARG_ENABLE(nunit,
+ 	AC_HELP_STRING([--enable-nunit],
+ 		[enable support for NUnit [default=no]]),
+-		[PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=yes, enable_nunit=no)],
++		[PKG_CHECK_MODULES(MONO_NUNIT, nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=yes, enable_nunit=no)],
+ 		enable_nunit=no)
+ 
+ AM_CONDITIONAL(ENABLE_NUNIT, test x$enable_nunit = xyes)


Property changes on: non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: non-group/monodevelop/trunk/debian/rules
===================================================================
--- non-group/monodevelop/trunk/debian/rules	2005-10-22 15:06:40 UTC (rev 2092)
+++ non-group/monodevelop/trunk/debian/rules	2005-10-22 15:15:15 UTC (rev 2093)
@@ -12,7 +12,7 @@
 	  --mandir=\$${prefix}/share/man \
 	  --infodir=\$${prefix}/share/info \
 	  --disable-update-mimedb --disable-update-desktopdb \
-	  --enable-boo --enable-java
+	  --enable-boo --enable-java --enable-nunit --enable-versioncontrol
 	# debugger is not ready yet, needs mono from SVN
 	#  --enable-debugger
 	touch configure-stamp
@@ -56,6 +56,10 @@
 	rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/Java*
 	rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/EmptyJava*
 	rm -f debian/monodevelop/usr/lib/monodevelop/AddIns/BackendBindings/templates/Ikvm*
+	# remove nunit files (shipped in monodevelop-nunit)
+	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/NUnit
+	# remove versioncontrol files (shipped in monodevelop-versioncontrol)
+	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl
 	cp $(CURDIR)/ChangeLog $(CURDIR)/changelog
 	dh_installchangelogs
 	dh_installdocs
@@ -72,7 +76,7 @@
 	dh_clideps -d
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb -Nmonodevelop-java
+	dh_builddeb
 
 binary: binary-indep
 .PHONY: build clean binary-indep binary install

More information about the Pkg-mono-svn-commits mailing list