[Pkg-mono-svn-commits] rev 3611 - mono/trunk/debian

Mirco Bauer meebey at alioth.debian.org
Thu Mar 27 21:36:56 UTC 2008 

Author: meebey
Date: 2008-03-27 21:36:56 +0000 (Thu, 27 Mar 2008)
New Revision: 3611

Added:
   mono/trunk/debian/libmono-mozilla0.2-cil.install
Removed:
   mono/trunk/debian/libmono-mozilla0.1-cil.install
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/libmono2.0-cil.install
   mono/trunk/debian/rules
Log:
- preparing upload to experimental



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2008-03-24 16:30:27 UTC (rev 3610)
+++ mono/trunk/debian/changelog	2008-03-27 21:36:56 UTC (rev 3611)
@@ -1,4 +1,4 @@
-mono (1.9+dfsg-1~pre1) UNRELEASED; urgency=low
+mono (1.9+dfsg-1) experimental; urgency=low
 
   [ Mirco Bauer ]
   * DFSG version of Mono 1.9
@@ -7,6 +7,8 @@
       is licensed under Creative Commons Attribution 2.5 which is not
       DFSG-free.
   * New upstream release.
+  * debian/rules:
+    + Bumped clilibs to 1.9
   * debian/mono-api-check:
     + Implemented -k switch to keep and inspect the XML diff file.
     + Fixed application invocation.
@@ -14,6 +16,13 @@
     debian/patches/fix_Mono.Cecil_linkage.dpatch
     debian/patches/ppc_fix_flushing_of_icache_r92014.dpatch:
     + Removed, already applied upstream.
+  * debian/libmono2.0-cil.install:
+    + Added Mono.Web.dll
+  * debian/control
+    debian/libmono-mozilla0.1-cil.install
+    debian/libmono-mozilla0.2-cil.install:
+    + Renamed libmono-mozilla0.1-cil to libmono-mozilla0.2-cil, as the assembly
+      version (ABI) was bumped from 0.1 to 0.2.
 
   [ Sebastian Dröge ]
   * debian/patches/method-signature-testing.dpatch:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2008-03-24 16:30:27 UTC (rev 3610)
+++ mono/trunk/debian/control	2008-03-27 21:36:56 UTC (rev 3611)
@@ -170,7 +170,7 @@
  .
  This package contains the Mono C5 library.
 
-Package: libmono-mozilla0.1-cil
+Package: libmono-mozilla0.2-cil
 Section: libs
 Architecture: all
 Depends: ${cli:Depends}

Deleted: mono/trunk/debian/libmono-mozilla0.1-cil.install
===================================================================
--- mono/trunk/debian/libmono-mozilla0.1-cil.install	2008-03-24 16:30:27 UTC (rev 3610)
+++ mono/trunk/debian/libmono-mozilla0.1-cil.install	2008-03-27 21:36:56 UTC (rev 3611)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/mono/gac/Mono.Mozilla/
-debian/tmp/usr/lib/mono/2.0/Mono.Mozilla.dll

Copied: mono/trunk/debian/libmono-mozilla0.2-cil.install (from rev 3604, mono/trunk/debian/libmono-mozilla0.1-cil.install)
===================================================================
--- mono/trunk/debian/libmono-mozilla0.2-cil.install	                        (rev 0)
+++ mono/trunk/debian/libmono-mozilla0.2-cil.install	2008-03-27 21:36:56 UTC (rev 3611)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/
+debian/tmp/usr/lib/mono/2.0/Mono.Mozilla.dll

Modified: mono/trunk/debian/libmono2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono2.0-cil.install	2008-03-24 16:30:27 UTC (rev 3610)
+++ mono/trunk/debian/libmono2.0-cil.install	2008-03-27 21:36:56 UTC (rev 3611)
@@ -6,6 +6,7 @@
 debian/tmp/usr/lib/mono/2.0/Mono.Http.dll
 debian/tmp/usr/lib/mono/2.0/Mono.Posix.dll
 debian/tmp/usr/lib/mono/2.0/Mono.Security.Win32.dll
+debian/tmp/usr/lib/mono/2.0/Mono.Web.dll
 debian/tmp/usr/lib/mono/2.0/OpenSystem.C.dll
 debian/tmp/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/
@@ -15,5 +16,6 @@
 debian/tmp/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/
+debian/tmp/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/mono-service/2.0.0.0__*/

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2008-03-24 16:30:27 UTC (rev 3610)
+++ mono/trunk/debian/rules	2008-03-27 21:36:56 UTC (rev 3611)
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
-MONO_API = 1.2.6
+MONO_API = 1.9
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,') 
@@ -16,10 +16,6 @@
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-# Mono's build system doesn't like -j > 1
-MAKE_FLAGS += -j1
-export MAKEFLAGS=$(MAKE_FLAGS)
-
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	CONF_FLAGS += --build $(DEB_HOST_GNU_TYPE)
 else
@@ -31,7 +27,6 @@
 endif
 
 ifeq ($(DEB_BUILD_ARCH), i386)
-#	MAKE_FLAGS += RUNTIME=$(CURDIR)/debian/mono-aot-wrapper
 	CONF_FLAGS += --with-sigaltstack=yes
 else ifeq ($(DEB_BUILD_ARCH), amd64)
 	CONF_FLAGS += --with-sigaltstack=yes
@@ -64,6 +59,14 @@
 		  --with-moonlight=yes \
 		  --with-oprofile=yes
 
+# Mono's build system doesn't like -j > 1
+MAKE_FLAGS += -j1
+export MAKEFLAGS=$(MAKE_FLAGS)
+
+ifeq ($(DEB_BUILD_ARCH), i386)
+#	MAKE_FLAGS += RUNTIME=$(CURDIR)/debian/mono-aot-wrapper
+endif
+
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
@@ -101,7 +104,11 @@
 build-indep-stamp:
 	dh_testdir
 	LC_ALL=C $(MAKE) $(MAKE_FLAGS) EXTERNAL_MCS=false EXTERNAL_MONO=false
-	chmod +x debian/dh_makeclilibs debian/dh_clideps debian/dh_clistrip debian/dh_clifixperms debian/dh_monoaot
+	chmod +x debian/dh_makeclilibs \
+	         debian/dh_clideps \
+	         debian/dh_clistrip \
+	         debian/dh_clifixperms \
+	         debian/dh_monoaot
 	touch build-indep-stamp
 
 build: build-arch
@@ -114,9 +121,6 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f configure-*-stamp
-	rm -f build-*-stamp
-	rm -f install-*-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	# distclean misses stuff
 	find -name "*.mdb" -delete
@@ -125,6 +129,9 @@
 	-cd debian/detector && $(MAKE) clean
 	rm -f cli-wrapper debian/MonoGetAssemblyName.exe
 	rm -rf $(MONO_SHARED_DIR)/.wapi
+	rm -f configure-*-stamp
+	rm -f build-*-stamp
+	rm -f install-*-stamp
 	dh_clean
 
 install: install-arch install-indep
@@ -150,7 +157,7 @@
 	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \
 	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_0
 	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_1
-	# copy missing 2.0 manpage
+	# copy missing 2.0 manpages
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/al.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/al2.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \

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