[Pkg-mono-svn-commits] rev 3583 - in mono-tools/trunk/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Thu Jan 10 14:30:05 UTC 2008 

Author: sho
Date: 2008-01-10 14:30:05 +0000 (Thu, 10 Jan 2008)
New Revision: 3583

Modified:
   mono-tools/trunk/debian/changelog
   mono-tools/trunk/debian/control
   mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
Log:
  * debian/patches/01_use_real_nunit.dpatch:
    + Look for nunit.pc instead of now deprecated nunit-2.2.pc.
    + Implement a few missing interface memebers that allow gnunit and gnunit2
      to build with newer versions of nunit. Now nunit-console, gnunit and
      gnunit2 are in sync and don't require rebuilds (Closes: #439835).

  * debian/control:
    + Build-depend on libnunit2.2.6-cil instead of libnunit2.2-cil.


Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog	2008-01-09 05:54:34 UTC (rev 3582)
+++ mono-tools/trunk/debian/changelog	2008-01-10 14:30:05 UTC (rev 3583)
@@ -1,3 +1,18 @@
+mono-tools (1.2.6-3) unstable; urgency=low
+
+  [ Sam Hocevar ]
+
+  * debian/patches/01_use_real_nunit.dpatch:
+    + Look for nunit.pc instead of now deprecated nunit-2.2.pc.
+    + Implement a few missing interface memebers that allow gnunit and gnunit2
+      to build with newer versions of nunit. Now nunit-console, gnunit and
+      gnunit2 are in sync and don't require rebuilds (Closes: #439835).
+
+  * debian/control:
+    + Build-depend on libnunit2.2.6-cil instead of libnunit2.2-cil.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 10 Jan 2008 14:26:41 +0000
+
 mono-tools (1.2.6-2) unstable; urgency=low
 
   * debian/control:

Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control	2008-01-09 05:54:34 UTC (rev 3582)
+++ mono-tools/trunk/debian/control	2008-01-10 14:30:05 UTC (rev 3583)
@@ -4,7 +4,7 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5.0.0), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), mono-1.0-devel, libnunit2.2-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), monodoc-base (>= 1.1.9), libxul-dev
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), mono-1.0-devel, libnunit2.2.6-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), monodoc-base (>= 1.1.9), libxul-dev
 Standards-Version: 3.7.3
 
 Package: monodoc-browser

Modified: mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch	2008-01-09 05:54:34 UTC (rev 3582)
+++ mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch	2008-01-10 14:30:05 UTC (rev 3583)
@@ -1,76 +1,119 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
 @DPATCH@
-
---- mono-tools-1.2.4/configure.in.old	2007-05-17 10:39:15.000000000 +0200
-+++ mono-tools-1.2.4/configure.in	2007-05-17 10:41:04.000000000 +0200
-@@ -30,7 +30,7 @@
- AC_SUBST(RUNTIME)
- AC_SUBST(RESGEN)
- 
--PKG_CHECK_MODULES(NUNIT, mono-nunit)
-+PKG_CHECK_MODULES(NUNIT, nunit-2.2)
- AC_SUBST(NUNIT_LIBS)
- 
- PKG_CHECK_MODULES(MONODOC, monodoc)
---- mono-tools-1.2.4/configure.old	2007-05-17 10:39:18.000000000 +0200
-+++ mono-tools-1.2.4/configure	2007-05-17 10:41:30.000000000 +0200
-@@ -2795,12 +2795,12 @@
+diff -urNad mono-tools-1.2.6~/configure mono-tools-1.2.6/configure
+--- mono-tools-1.2.6~/configure	2007-12-06 21:43:50.000000000 +0000
++++ mono-tools-1.2.6/configure	2008-01-10 14:20:22.000000000 +0000
+@@ -2835,12 +2835,12 @@
          pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit-2.2\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "nunit-2.2") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit\"") >&5
++  ($PKG_CONFIG --exists --print-errors "nunit") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit" 2>/dev/null`
-+  pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit-2.2" 2>/dev/null`
++  pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -2813,12 +2813,12 @@
+@@ -2853,12 +2853,12 @@
          pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit-2.2\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "nunit-2.2") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit\"") >&5
++  ($PKG_CONFIG --exists --print-errors "nunit") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit" 2>/dev/null`
-+  pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit-2.2" 2>/dev/null`
++  pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -2837,14 +2837,14 @@
+@@ -2877,14 +2877,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
 -	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono-nunit"`
-+	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nunit-2.2"`
++	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nunit"`
          else
 -	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono-nunit"`
-+	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit-2.2"`
++	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit"`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$NUNIT_PKG_ERRORS" >&5
  
 -	{ { echo "$as_me:$LINENO: error: Package requirements (mono-nunit) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (nunit-2.2) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements (nunit) were not met:
  
  $NUNIT_PKG_ERRORS
  
-@@ -2855,7 +2855,7 @@
+@@ -2895,7 +2895,7 @@
  and NUNIT_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
 -echo "$as_me: error: Package requirements (mono-nunit) were not met:
-+echo "$as_me: error: Package requirements (nunit-2.2) were not met:
++echo "$as_me: error: Package requirements (nunit) were not met:
  
  $NUNIT_PKG_ERRORS
  
+diff -urNad mono-tools-1.2.6~/configure.in mono-tools-1.2.6/configure.in
+--- mono-tools-1.2.6~/configure.in	2007-12-06 21:43:46.000000000 +0000
++++ mono-tools-1.2.6/configure.in	2008-01-10 14:20:22.000000000 +0000
+@@ -30,7 +30,7 @@
+ AC_SUBST(RUNTIME)
+ AC_SUBST(RESGEN)
+ 
+-PKG_CHECK_MODULES(NUNIT, mono-nunit)
++PKG_CHECK_MODULES(NUNIT, nunit)
+ AC_SUBST(NUNIT_LIBS)
+ 
+ PKG_CHECK_MODULES(MONODOC, monodoc)
+diff -urNad mono-tools-1.2.6~/gnunit/src/AssemblyStore.cs mono-tools-1.2.6/gnunit/src/AssemblyStore.cs
+--- mono-tools-1.2.6~/gnunit/src/AssemblyStore.cs	2007-12-06 21:43:44.000000000 +0000
++++ mono-tools-1.2.6/gnunit/src/AssemblyStore.cs	2008-01-10 14:21:08.000000000 +0000
+@@ -574,6 +574,11 @@
+ 			idle.Set ();
+ 		}
+ 
++		void EventListener.TestOutput (TestOutput testOutput)
++		{
++			;
++		}
++
+ 		void SetIconFromResult (TestResult result)
+ 		{
+ 			CircleColor color;
+diff -urNad mono-tools-1.2.6~/gnunit/src/main.cs mono-tools-1.2.6/gnunit/src/main.cs
+--- mono-tools-1.2.6~/gnunit/src/main.cs	2007-12-06 21:43:44.000000000 +0000
++++ mono-tools-1.2.6/gnunit/src/main.cs	2008-01-10 14:21:13.000000000 +0000
+@@ -284,6 +284,11 @@
+ 			return inner_filter.Pass (test);
+ 		}
+ 
++		public bool Exclude
++		{
++			get { return false; }
++		}
++
+ 		static string _ (string key)
+ 		{
+ 			return Catalog.GetString (key);
+@@ -767,6 +772,11 @@
+ 			ClockUpdater (this, EventArgs.Empty);
+ 		}
+ 
++		void EventListener.TestOutput (TestOutput testOutput)
++		{
++			;
++		}
++
+ 		// Misc.
+ 
+ 		void UpdateRunStatus ()

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