[Pkg-mono-svn-commits] [SCM] mono-debugger branch, master, updated. debian/2.6.3-2

[Jo Shields]

The following commit has been merged in the master branch:
commit 2c3b46b3d07c868ea2d6d3f5106a03eb02ef61b2
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Jun 6 23:09:59 2010 +0100

    Refresh nunit patch, for modified build system

diff --git a/debian/changelog b/debian/changelog
index d99a319..b29a0b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mono-debugger (2.6.3-1) UNRELEASED; urgency=low
   * New upstream release
   * debian/rules:
     + Stop using ../tarballs in get-orig-source rule
+  * debian/patches/use_real_nunit.dpatch:
+    + Refreshed
 
  -- Jo Shields <directhex at apebox.org>  Sun, 06 Jun 2010 22:58:05 +0100
 
diff --git a/debian/patches/use_real_nunit.dpatch b/debian/patches/use_real_nunit.dpatch
index 0214851..c1a44df 100755
--- a/debian/patches/use_real_nunit.dpatch
+++ b/debian/patches/use_real_nunit.dpatch
@@ -5,44 +5,11 @@
 ## DP: No description.
 
 @DPATCH@
-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
-@@ -179,9 +179,9 @@
-    AC_MSG_ERROR([Can't find "mcs" in your PATH])
- fi
- 
--AC_PATH_PROG(NUNIT_CONSOLE, nunit-console2)
-+AC_PATH_PROG(NUNIT_CONSOLE, nunit-console)
- if test "x$NUNIT_CONSOLE" = "x" ; then
--  AC_MSG_ERROR([Can't find "nunit-console2" in your PATH])
-+  AC_MSG_ERROR([Can't find "nunit-console" in your PATH])
- fi
- 
- target_mono_prefix="$prefix"
-@@ -205,13 +205,13 @@
-   TARGET_MONO="$MONO"
- 
-   ## Check NUnit
--  if pkg-config --modversion mono-nunit>/dev/null; then
--    AC_MSG_RESULT("Found mono-nunit.pc")
-+  if pkg-config --modversion nunit>/dev/null; then
-+    AC_MSG_RESULT("Found nunit.pc")
-   else
--    AC_MSG_ERROR([Cannot find mono-nunit (mono-unit.pc for packageconfig)])
-+    AC_MSG_ERROR([Cannot find nunit (mono-unit.pc for packageconfig)])
-   fi
--  NUNIT_PREFIX=`pkg-config --variable=prefix mono-nunit`
--  NUNIT_VERSION=`pkg-config --modversion mono-nunit`
-+  NUNIT_PREFIX=`pkg-config --variable=prefix nunit`
-+  NUNIT_VERSION=`pkg-config --modversion nunit`
- 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 @@
+diff --git a/build/Makefile.am b/build/Makefile.am
+index 3454bff..0edea29 100644
+--- a/build/Makefile.am
++++ b/build/Makefile.am
+@@ -99,9 +99,7 @@ TEST_FRAMEWORK_DEPS = \
  	-r:./Mono.Debugger.dll				\
  	-r:./Mono.Debugger.Frontend.dll			\
  	-r:System.Runtime.Remoting			\
@@ -53,7 +20,7 @@ diff -urNad mono-debugger-2.4.3~/build/Makefile.am mono-debugger-2.4.3/build/Mak
  
  TEST_SRCLIST = \
  	$(top_srcdir)/test/testsuite/*.cs		\
-@@ -122,9 +120,7 @@
+@@ -137,9 +135,7 @@ TEST_DEPS = \
  	-r:./Mono.Debugger.dll				\
  	-r:./Mono.Debugger.Frontend.dll			\
  	-r:./Mono.Debugger.Test.Framework.dll		\
@@ -64,7 +31,7 @@ diff -urNad mono-debugger-2.4.3~/build/Makefile.am mono-debugger-2.4.3/build/Mak
  
  DEBUGGER_TEST_SERVER_SRCLIST = \
  	$(top_srcdir)/test/framework/DebuggerTestServer.cs
-@@ -132,10 +128,7 @@
+@@ -147,10 +143,7 @@ DEBUGGER_TEST_SERVER_SRCLIST = \
  DEBUGGER_TEST_SERVER_DEPS = \
  	-r:Mono.Debugger.Test.Framework.dll		\
  	-r:System.Runtime.Remoting			\
@@ -76,12 +43,47 @@ diff -urNad mono-debugger-2.4.3~/build/Makefile.am mono-debugger-2.4.3/build/Mak
  
  if MARTIN_PRIVATE
  MCS_FLAGS += -define:MARTIN_PRIVATE
-@@ -207,7 +200,7 @@
+@@ -222,7 +215,7 @@ mdb-symbolreader: mdb-symbolreader.in Makefile
  		< $(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
+ runtests: runtests.in Makefile ulimit-check
  	builddir=$(top_builddir) ; the_builddir=`cd $$builddir && pwd` ; \
+diff --git a/configure.in b/configure.in
+index 5518bec..e0d882a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -192,9 +192,9 @@ if test "x$MONODIS" = "x" ; then
+    AC_MSG_ERROR([Can't find "monodis" in your PATH])
+ fi
+ 
+-AC_PATH_PROG(NUNIT_CONSOLE, nunit-console2)
++AC_PATH_PROG(NUNIT_CONSOLE, nunit-console)
+ if test "x$NUNIT_CONSOLE" = "x" ; then
+-  AC_MSG_ERROR([Can't find "nunit-console2" in your PATH])
++  AC_MSG_ERROR([Can't find "nunit-console" in your PATH])
+ fi
+ 
+ target_mono_prefix="$prefix"
+@@ -220,13 +220,13 @@ else
+   TARGET_MONODIS="$MONODIS"
+ 
+   ## Check NUnit
+-  if pkg-config --modversion mono-nunit>/dev/null; then
+-    AC_MSG_RESULT("Found mono-nunit.pc")
++  if pkg-config --modversion nunit>/dev/null; then
++    AC_MSG_RESULT("Found nunit.pc")
+   else
+-    AC_MSG_ERROR([Cannot find mono-nunit (mono-unit.pc for packageconfig)])
++    AC_MSG_ERROR([Cannot find nunit (nunit.pc for packageconfig)])
+   fi
+-  NUNIT_PREFIX=`pkg-config --variable=prefix mono-nunit`
+-  NUNIT_VERSION=`pkg-config --modversion mono-nunit`
++  NUNIT_PREFIX=`pkg-config --variable=prefix nunit`
++  NUNIT_VERSION=`pkg-config --modversion nunit`
+ 
+ fi
+ NUNIT_PREFIX=`cd $NUNIT_PREFIX && pwd`

-- 
mono-debugger