[Pkg-mono-svn-commits] rev 4071 - in mono-debugger/trunk/debian: . patches

[Jo Shields]

Author: directhex
Date: 2009-12-24 12:04:50 +0000 (Thu, 24 Dec 2009)
New Revision: 4071

Modified:
   mono-debugger/trunk/debian/changelog
   mono-debugger/trunk/debian/control
   mono-debugger/trunk/debian/patches/use_real_nunit.dpatch
   mono-debugger/trunk/debian/rules
Log:
  * New upstream release
  * debian/control:
    + Build-depend on mono-devel 2.4.3, remove individual library
      dependencies which are no longer required
  * debian/rules:
    + Use mono-csc as compiler, not csc
  * debian/patches/use_real_nunit.dpatch:
    + Refresh


Modified: mono-debugger/trunk/debian/changelog
===================================================================
--- mono-debugger/trunk/debian/changelog	2009-12-18 21:41:37 UTC (rev 4070)
+++ mono-debugger/trunk/debian/changelog	2009-12-24 12:04:50 UTC (rev 4071)
@@ -1,3 +1,16 @@
+mono-debugger (2.4.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Build-depend on mono-devel 2.4.3, remove individual library 
+      dependencies which are no longer required
+  * debian/rules:
+    + Use mono-csc as compiler, not csc
+  * debian/patches/use_real_nunit.dpatch:
+    + Refresh
+
+ -- Jo Shields <directhex at apebox.org>  Thu, 24 Dec 2009 11:39:50 +0000
+
 mono-debugger (2.4.2-2) unstable; urgency=low
 
   * debian/control:

Modified: mono-debugger/trunk/debian/control
===================================================================
--- mono-debugger/trunk/debian/control	2009-12-18 21:41:37 UTC (rev 4070)
+++ mono-debugger/trunk/debian/control	2009-12-24 12:04:50 UTC (rev 4071)
@@ -6,9 +6,7 @@
 Build-Depends: debhelper (>= 5),
  dpatch,
  cli-common-dev (>= 0.4.4),
- mono-devel (>= 2.0),
- libmono-cecil-private-cil,
- libmono-system-runtime2.0-cil,
+ mono-devel (>= 2.4.3),
  nunit-console,
  libnunit2.4-cil,
  autoconf,

Modified: mono-debugger/trunk/debian/patches/use_real_nunit.dpatch
===================================================================
--- mono-debugger/trunk/debian/patches/use_real_nunit.dpatch	2009-12-18 21:41:37 UTC (rev 4070)
+++ mono-debugger/trunk/debian/patches/use_real_nunit.dpatch	2009-12-24 12:04:50 UTC (rev 4071)
@@ -5,19 +5,6 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad mono-debugger-2.4.2~/build/Makefile.am mono-debugger-2.4.2/build/Makefile.am
---- mono-debugger-2.4.2~/build/Makefile.am	2009-06-30 15:25:54.000000000 +0100
-+++ mono-debugger-2.4.2/build/Makefile.am	2009-06-30 15:26:47.000000000 +0100
-@@ -101,8 +101,7 @@
- 	-r:Mono.GetOptions				\
- 	-r:./Mono.Debugger.dll				\
- 	-r:./Mono.Debugger.Frontend.dll			\
--	-r:nunit.framework				\
--	-r:nunit.core
-+	-pkg:nunit
- 
- if MARTIN_PRIVATE
- MCS_FLAGS += -define:MARTIN_PRIVATE
 diff -urNad mono-debugger-2.4.2~/configure.in mono-debugger-2.4.2/configure.in
 --- mono-debugger-2.4.2~/configure.in	2009-06-30 15:25:54.000000000 +0100
 +++ mono-debugger-2.4.2/configure.in	2009-06-30 15:27:52.000000000 +0100
@@ -52,3 +39,49 @@
  fi
  NUNIT_PREFIX=`cd $NUNIT_PREFIX && pwd`
  AC_SUBST(TARGET_MCS)
+diff -urNad mono-debugger-2.4.3~/build/Makefile.am mono-debugger-2.4.3/build/Makefile.am
+--- mono-debugger-2.4.3~/build/Makefile.am	2009-12-24 11:50:35.000000000 +0000
++++ mono-debugger-2.4.3/build/Makefile.am	2009-12-24 11:59:02.000000000 +0000
+@@ -84,9 +84,7 @@
+ 	-r:./Mono.Debugger.dll				\
+ 	-r:./Mono.Debugger.Frontend.dll			\
+ 	-r:System.Runtime.Remoting			\
+-	-r:nunit.framework				\
+-	-r:nunit.core					\
+-	-r:nunit.core.interfaces
++	-pkg:nunit
+ 
+ TEST_SRCLIST = \
+ 	$(top_srcdir)/test/testsuite/*.cs		\
+@@ -122,9 +120,7 @@
+ 	-r:./Mono.Debugger.dll				\
+ 	-r:./Mono.Debugger.Frontend.dll			\
+ 	-r:./Mono.Debugger.Test.Framework.dll		\
+-	-r:nunit.framework				\
+-	-r:nunit.core					\
+-	-r:nunit.core.interfaces
++	-pkg:nunit
+ 
+ DEBUGGER_TEST_SERVER_SRCLIST = \
+ 	$(top_srcdir)/test/framework/DebuggerTestServer.cs
+@@ -132,10 +128,7 @@
+ DEBUGGER_TEST_SERVER_DEPS = \
+ 	-r:Mono.Debugger.Test.Framework.dll		\
+ 	-r:System.Runtime.Remoting			\
+-	-r:nunit.framework				\
+-	-r:nunit.core					\
+-	-r:nunit.core.interfaces			\
+-	-r:nunit.util
++	-pkg:nunit
+ 
+ if MARTIN_PRIVATE
+ MCS_FLAGS += -define:MARTIN_PRIVATE
+@@ -207,7 +200,7 @@
+ 		< $(srcdir)/mdb-symbolreader.in > mdb-symbolreader.tmp \
+ 	&& mv mdb-symbolreader.tmp mdb-symbolreader
+ 
+-NUNIT_CONSOLE_EXE = $(NUNIT_PREFIX)/lib/mono/2.0/nunit-console.exe
++NUNIT_CONSOLE_EXE = $(NUNIT_PREFIX)/lib/nunit/nunit-console.exe
+ 
+ runtests: runtests.in Makefile
+ 	builddir=$(top_builddir) ; the_builddir=`cd $$builddir && pwd` ; \

Modified: mono-debugger/trunk/debian/rules
===================================================================
--- mono-debugger/trunk/debian/rules	2009-12-18 21:41:37 UTC (rev 4070)
+++ mono-debugger/trunk/debian/rules	2009-12-24 12:04:50 UTC (rev 4071)
@@ -28,7 +28,7 @@
 	autoconf
 	automake --add-missing --copy	
 
-	./configure --prefix=/usr MCS=/usr/bin/csc
+	./configure --prefix=/usr MCS=/usr/bin/mono-csc
 	touch configure-stamp
 
 build: build-stamp