[Pkg-mono-svn-commits] rev 3735 - in xsp/trunk/debian: . patches

[Jo Shields]

Author: directhex-guest
Date: 2008-10-16 10:11:19 +0000 (Thu, 16 Oct 2008)
New Revision: 3735

Removed:
   xsp/trunk/debian/patches/disable_building_unittests.dpatch
   xsp/trunk/debian/patches/fix_dbpage1_typo.dpatch
   xsp/trunk/debian/patches/fix_mono_nunit.dpatch
Modified:
   xsp/trunk/debian/changelog
   xsp/trunk/debian/control
   xsp/trunk/debian/patches/00list
   xsp/trunk/debian/rules
Log:
And xsp. ~50% of packages in pkg-mono transitioned.


Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog	2008-10-16 09:12:08 UTC (rev 3734)
+++ xsp/trunk/debian/changelog	2008-10-16 10:11:19 UTC (rev 3735)
@@ -1,3 +1,14 @@
+xsp (2.0-1) unstable; urgency=low
+
+  * New upstream release
+    + debian/rules:
+      - Bump MONO_ABI_COMP_VERSION
+    + debian/patches:
+    + debian/control:
+      - We use mono-nunit.pc now, so disable patch and change Depends
+
+ -- Jo Shields <directhex at apebox.org>  Thu, 16 Oct 2008 11:06:07 +0100
+
 xsp (1.9.1-3) unstable; urgency=low
 
   [ Jo Shields ]

Modified: xsp/trunk/debian/control
===================================================================
--- xsp/trunk/debian/control	2008-10-16 09:12:08 UTC (rev 3734)
+++ xsp/trunk/debian/control	2008-10-16 10:11:19 UTC (rev 3735)
@@ -22,7 +22,7 @@
  libmono-system-messaging1.0-cil,
  libmono-system-ldap1.0-cil,
  libmono-cscompmgd7.0-cil,
- libnunit2.4-cil
+ libmono-nunit2.2-cil
 Standards-Version: 3.8.0
 Homepage: http://www.mono-project.com/ASP.NET
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/xsp/trunk/

Modified: xsp/trunk/debian/patches/00list
===================================================================
--- xsp/trunk/debian/patches/00list	2008-10-16 09:12:08 UTC (rev 3734)
+++ xsp/trunk/debian/patches/00list	2008-10-16 10:11:19 UTC (rev 3735)
@@ -1,2 +0,0 @@
-#fix_dbpage1_typo.dpatch
-fix_mono_nunit.dpatch

Deleted: xsp/trunk/debian/patches/disable_building_unittests.dpatch
===================================================================
--- xsp/trunk/debian/patches/disable_building_unittests.dpatch	2008-10-16 09:12:08 UTC (rev 3734)
+++ xsp/trunk/debian/patches/disable_building_unittests.dpatch	2008-10-16 10:11:19 UTC (rev 3735)
@@ -1,14 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disable_building_unittests.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad xsp-1.2.6~/Makefile.am xsp-1.2.6/Makefile.am
---- xsp-1.2.6~/Makefile.am	2007-11-16 23:58:08.000000000 +0100
-+++ xsp-1.2.6/Makefile.am	2008-03-01 16:38:32.000000000 +0100
-@@ -1,2 +1,2 @@
--SUBDIRS=man src test tools scripts docs packaging unittests
-+SUBDIRS=man src test tools scripts docs packaging
- 

Deleted: xsp/trunk/debian/patches/fix_dbpage1_typo.dpatch
===================================================================
--- xsp/trunk/debian/patches/fix_dbpage1_typo.dpatch	2008-10-16 09:12:08 UTC (rev 3734)
+++ xsp/trunk/debian/patches/fix_dbpage1_typo.dpatch	2008-10-16 10:11:19 UTC (rev 3735)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_dbpage1_typo.dpatch by  <dylan at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad xsp-1.2.4~/test/1.1/webcontrols/dbpage1.aspx xsp-1.2.4/test/1.1/webcontrols/dbpage1.aspx
---- xsp-1.2.4~/test/1.1/webcontrols/dbpage1.aspx	2007-04-19 23:11:28.000000000 -0500
-+++ xsp-1.2.4/test/1.1/webcontrols/dbpage1.aspx	2007-06-20 18:01:04.000000000 -0500
-@@ -30,7 +30,7 @@
- 			providerAssembly = "Npgsql";
- 		
- 		if (cncTypeName == null || cncTypeName == "")
--			cncTypeName = "Npgsql.NpgqlConnection";
-+			cncTypeName = "Npgsql.NpgsqlConnection";
- 		
- 		if (cncString == null || cncString == "")
- 			cncString = "server=127.0.0.1;user id=monotest;password=monotest;dbname=monotest";

Deleted: xsp/trunk/debian/patches/fix_mono_nunit.dpatch
===================================================================
--- xsp/trunk/debian/patches/fix_mono_nunit.dpatch	2008-10-16 09:12:08 UTC (rev 3734)
+++ xsp/trunk/debian/patches/fix_mono_nunit.dpatch	2008-10-16 10:11:19 UTC (rev 3735)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_mono_nunit.dpatch by Jo Shields <directhex at apebox.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change pkg-config requests from 'mono-nunit' to 'nunit'
-
- at DPATCH@
-diff -urNad xsp-1.9.1~/unittests/Tests.XSP.Security/Makefile.am xsp-1.9.1/unittests/Tests.XSP.Security/Makefile.am
---- xsp-1.9.1~/unittests/Tests.XSP.Security/Makefile.am	2008-06-16 10:34:15.000000000 +0100
-+++ xsp-1.9.1/unittests/Tests.XSP.Security/Makefile.am	2008-06-16 10:34:37.000000000 +0100
-@@ -9,7 +9,7 @@
- unittests_DATA = $(security_test_sources) Tests.XSP.Security.dll Makefile
- 
- Tests.XSP.Security.dll: $(security_test_sources)
--	mcs -debug -pkg:mono-nunit -out:$@ -t:library $(security_test_sources)
-+	mcs -debug -pkg:nunit -out:$@ -t:library $(security_test_sources)
- 
- run-test: Tests.XSP.Security.dll
- 	nunit-console Tests.XSP.Security.dll
-diff -urNad xsp-1.9.1~/unittests/Tests.XSP.Security/Makefile.in xsp-1.9.1/unittests/Tests.XSP.Security/Makefile.in
---- xsp-1.9.1~/unittests/Tests.XSP.Security/Makefile.in	2008-06-16 10:34:15.000000000 +0100
-+++ xsp-1.9.1/unittests/Tests.XSP.Security/Makefile.in	2008-06-16 10:34:46.000000000 +0100
-@@ -337,7 +337,7 @@
- 
- 
- Tests.XSP.Security.dll: $(security_test_sources)
--	mcs -debug -pkg:mono-nunit -out:$@ -t:library $(security_test_sources)
-+	mcs -debug -pkg:nunit -out:$@ -t:library $(security_test_sources)
- 
- run-test: Tests.XSP.Security.dll
- 	nunit-console Tests.XSP.Security.dll
-

Modified: xsp/trunk/debian/rules
===================================================================
--- xsp/trunk/debian/rules	2008-10-16 09:12:08 UTC (rev 3734)
+++ xsp/trunk/debian/rules	2008-10-16 10:11:19 UTC (rev 3735)
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
-MONO_ABI_COMP_VERSION = 1.9
+MONO_ABI_COMP_VERSION = 2.0
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)