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

Mirco Bauer meebey at alioth.debian.org
Wed Apr 23 19:53:14 UTC 2008


Author: meebey
Date: 2008-04-23 19:53:13 +0000 (Wed, 23 Apr 2008)
New Revision: 3629

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/libmono1.0-cil.install
   mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch
   mono/trunk/debian/rules
Log:
finialize mono 1.9.1+dfsg-1



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2008-04-22 23:02:44 UTC (rev 3628)
+++ mono/trunk/debian/changelog	2008-04-23 19:53:13 UTC (rev 3629)
@@ -1,3 +1,25 @@
+mono (1.9.1+dfsg-1) unstable; urgency=low
+
+  * DFSG version of Mono 1.9.1
+    + Deleted the mcs/class/System.Web.Extensions/ directory as
+      mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JSON/*.cs
+      is licensed under Creative Commons Attribution 2.5 which is not
+      DFSG-free.
+  * New upstream release.
+  * debian/libmono1.0-cil.install:
+    + Added internal cecil.pc as mono-tools >= 1.9 needs it.
+  * debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch:
+    + Updated
+  * debian/mono-api-check:
+    + Fixed bashism. (Closes: #471879)
+    + Implemented support to check APIs on .deb and .changes files.
+  * debian/rules:
+    + clilibs are now defined much more granularly now (per package).
+      Checked APIs of mono 1.2.2.1 vs 1.2.6 and 1.2.6 vs 1.9.
+    + Bumped clilibs of libmono-system-web2.0-cil to 1.9.1
+
+ -- Mirco Bauer <meebey at debian.org>  Tue, 22 Apr 2008 20:09:39 +0200
+
 mono (1.9+dfsg-3) unstable; urgency=low
 
   * debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch:

Modified: mono/trunk/debian/libmono1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono1.0-cil.install	2008-04-22 23:02:44 UTC (rev 3628)
+++ mono/trunk/debian/libmono1.0-cil.install	2008-04-23 19:53:13 UTC (rev 3629)
@@ -19,3 +19,4 @@
 debian/tmp/usr/lib/mono/gac/Mono.Cecil/
 debian/tmp/usr/lib/mono/gac/Mono.Cecil.Mdb/
 debian/tmp/usr/lib/mono/gac/mono-service/1.0.5000.0__*/
+debian/tmp/usr/lib/pkgconfig/cecil.pc

Modified: mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch
===================================================================
--- mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch	2008-04-22 23:02:44 UTC (rev 3628)
+++ mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch	2008-04-23 19:53:13 UTC (rev 3629)
@@ -5,21 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad mono-1.9+dfsg~/ChangeLog mono-1.9+dfsg/ChangeLog
---- mono-1.9+dfsg~/ChangeLog	2008-01-29 23:02:47.000000000 +0100
-+++ mono-1.9+dfsg/ChangeLog	2008-04-15 22:27:07.000000000 +0200
-@@ -1,3 +1,8 @@
-+2008-03-22  Zoltan Varga  <vargaz at gmail.com>
-+
-+      * configure.in: Pass CPPFLAGS to libgc configure using ac_configure_args instead
-+      of exporting it. Fixes #373113.
-+
- 2008-01-28  Wade Berrier  <wberrier at novell.com>
- 
- 	* configure.in: version bump -> 1.9
-diff -urNad mono-1.9+dfsg~/configure.in mono-1.9+dfsg/configure.in
---- mono-1.9+dfsg~/configure.in	2008-04-15 22:27:03.000000000 +0200
-+++ mono-1.9+dfsg/configure.in	2008-04-15 22:27:07.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/configure.in mono-1.9.1+dfsg/configure.in
+--- mono-1.9.1+dfsg~/configure.in	2008-04-22 20:16:11.000000000 +0200
++++ mono-1.9.1+dfsg/configure.in	2008-04-22 20:16:15.000000000 +0200
 @@ -670,13 +670,6 @@
  		;;
  

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2008-04-22 23:02:44 UTC (rev 3628)
+++ mono/trunk/debian/rules	2008-04-23 19:53:13 UTC (rev 3629)
@@ -3,8 +3,6 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
-MONO_API = 1.9
-
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,') 
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
@@ -203,7 +201,8 @@
 	# don't want docs of bundled libgc
 	rm -rf debian/tmp/usr/share/libgc-mono
 	# never ever install cecil.pc! mono ships an internal version for GAC only
-	rm -f debian/tmp/usr/lib/pkgconfig/cecil.pc
+	# args, mono-tools >= 1.9 needs this now :(
+	#rm -f debian/tmp/usr/lib/pkgconfig/cecil.pc
 	# Mono.Mozilla.dll is linked with CLI 2.0, thus the symlink in 1.0/ doesn't make sense
 	rm -f debian/tmp/usr/lib/mono/1.0/Mono.Mozilla.dll
 
@@ -246,20 +245,38 @@
 	dh_installdeb -i
 	#DH_VERBOSE=1 DH_AUTOSCRIPTDIR=$(CURDIR)/debian debian/dh_monoaot -i
 	debian/dh_makeclilibs -i -m 1.0 internal-mono
-	# APIs that grow need tighter deps
-	debian/dh_makeclilibs \
-	  -plibmono-corlib2.0-cil \
-	  -plibmono-system2.0-cil \
-	  -plibmono-microsoft8.0-cil \
-	  -plibmono-winforms1.0-cil \
-	  -plibmono-winforms2.0-cil \
-	  -plibmono1.0-cil \
-	  -plibmono2.0-cil \
-	  -m $(MONO_API) internal-mono
-	debian/dh_clideps -i internal-mono -l debian/tmp
-	#DH_VERBOSE=1 debian/dh_clideps -i internal-mono -l debian/tmp
+	debian/dh_makeclilibs -p libmono1.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono2.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1 internal-mono
+	debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1 internal-mono
+	debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-microsoft-build2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-system1.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-system2.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-system-data1.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-system-data2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-system-ldap2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-system-web2.0-cil -m 1.9.1 internal-mono
+	debian/dh_makeclilibs -p libmono-security1.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-security2.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-sqlite1.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-web1.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-web2.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-winforms1.0-cil -m 1.2.6 internal-mono
+	debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-relaxng1.0-cil -m 1.9 internal-mono
+	debian/dh_makeclilibs -p libmono-relaxng2.0-cil -m 1.9 internal-mono
+	debian/dh_clideps -i -l debian/tmp internal-mono
+	#DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp internal-mono
 	# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
-	debian/dh_clideps -pmono-gac -r internal-mono
+	debian/dh_clideps -p mono-gac -r internal-mono
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i




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