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

Sebastian Dröge slomo at alioth.debian.org
Tue Feb 27 09:48:29 CET 2007 

Author: slomo
Date: 2007-02-27 09:48:28 +0100 (Tue, 27 Feb 2007)
New Revision: 2959

Added:
   mono/trunk/debian/System.Data.dll.config
   mono/trunk/debian/libmono-system-data1.0-cil.clideps-override
   mono/trunk/debian/libmono-system-data2.0-cil.clideps-override
   mono/trunk/debian/patches/firebird-fbclient.dpatch
Modified:
   mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/libmono-system1.0-cil.install
   mono/trunk/debian/libmono-system2.0-cil.clideps-override
   mono/trunk/debian/libmono-system2.0-cil.install
   mono/trunk/debian/libmono-winforms1.0-cil.clideps-override
   mono/trunk/debian/libmono-winforms2.0-cil.clideps-override
   mono/trunk/debian/mono-common.install
   mono/trunk/debian/mono-gac.install
   mono/trunk/debian/mono-gmcs.install
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
   mono/trunk/debian/shlibs.local
Log:
* fix various build failures and update to 1.2.3.1-1


Modified: mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config
===================================================================
--- mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,3 +1,3 @@
 <configuration>
-	<dllmap dll="libfbembed" target="libfbembed.so.1"/>
+	<dllmap dll="libfbclient" target="libfbclient.so.1"/>
 </configuration>

Added: mono/trunk/debian/System.Data.dll.config
===================================================================
--- mono/trunk/debian/System.Data.dll.config	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/System.Data.dll.config	2007-02-27 08:48:28 UTC (rev 2959)
@@ -0,0 +1,4 @@
+<configuration>
+	<dllmap dll="gda-2" target="libgda-2.so.3"/>
+	<dllmap dll="gobject-2.0" target="libglib-2.0.so.0"/>
+</configuration>

Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/changelog	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,4 +1,4 @@
-mono (1.2.2.1-3~pre1) unstable; urgency=low
+mono (1.2.3.1-1) experimental; urgency=low
 
   * Mirco 'meebey' Bauer:
     + debian/rules:
@@ -18,13 +18,48 @@
       - Adds kfreebsd support to Mono.
         (Closes: #394456, thanks to Petr Salinger <Petr.Salinger at seznam.cz>
          and Aurelien Jarno <aurelien at aurel32.net> for the patch)
-    + debian/changelog:
-      - Using now the email address of the maintainer who approves the upload
-        and is responsible for it, instead of the Debian Mono Group address, as
-        requested by the Debian Release Manager Andreas Barth.
 
- -- Mirco Bauer <meebey at meebey.net>  Sat, 24 Feb 2007 17:21:18 +0100
+  * Sebastian 'slomo' Dröge:
+    + New upstream release (Closes: #411924):
+      - Fixes assertion failures on PPC (Closes: #403495)
+    + debian/libmono-system2.0-cil.clideps-override:
+      - Move libasound2 to Suggests
+    + debian/libmono-system1.0-cil.install,
+      debian/libmono-system2.0-cil.install:
+      - Add CustomMarshalers.dll
+    + debian/libmono-system-data1.0-cil.clideps-override,
+      debian/libmono-system-data2.0-cil.clideps-override:
+      - Move libgda2-3 to Suggests
+    + debian/libmono-winforms1.0-cil.clideps-override,
+      debian/libmono-winforms2.0-cil.clideps-override:
+      - Move librsvg2-2 to Suggests
+    + debian/mono-common.install:
+      - Update path for cil-opcodes.xml
+    + debian/mono-gmcs.install:
+      - Add /usr/bin/al2 utility
+      - Update path for xbuild stuff
+    + debian/rules:
+      - Install new System.Data.dll.config file
+      - Remove new utilities from mono-mcs as they're already elsewhere
+      - Update MONO_API to 1.2.3
+    + debian/shlibs.local:
+      - Add shlibs entry for libasound2
+    + debian/System.Data.dll.config:
+      - Added new dllmaps
+    + debian/shlibs.local,
+      debian/patches/firebird-fbclient.dpatch,
+      debian/FirebirdSql.Data.Firebird.dll.config:
+      - Use libfbclient1 instead of the embedded libfbembed1
+        library which is not thread-safe (Closes: #410379)
+    + debian/control:
+      - Clean up Build-Depends-Indep
+    + debian/rules,
+      debian/mono-gac.install:
+      - Fix various build failures caused by the binary-arch / binary-indep
+        split
 
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 27 Feb 2007 09:44:02 +0100
+
 mono (1.2.2.1-2) unstable; urgency=high
 
   * Sebastian 'slomo' Dröge:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/control	2007-02-27 08:48:28 UTC (rev 2959)
@@ -4,7 +4,7 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev
-Build-Depends-Indep: libfam-dev, libgamin-dev, libx11-dev, libcupsys2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev, libglib2.0-dev
+Build-Depends-Indep: libgamin-dev, libcupsys2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev, libgda2-dev
 Standards-Version: 3.7.2
 
 Package: mono-common

Added: mono/trunk/debian/libmono-system-data1.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system-data1.0-cil.clideps-override	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/libmono-system-data1.0-cil.clideps-override	2007-02-27 08:48:28 UTC (rev 2959)
@@ -0,0 +1 @@
+suggests libgda2-3

Added: mono/trunk/debian/libmono-system-data2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system-data2.0-cil.clideps-override	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/libmono-system-data2.0-cil.clideps-override	2007-02-27 08:48:28 UTC (rev 2959)
@@ -0,0 +1 @@
+suggests libgda2-3

Modified: mono/trunk/debian/libmono-system1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system1.0-cil.install	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/libmono-system1.0-cil.install	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,2 +1,4 @@
 debian/tmp/usr/lib/mono/gac/System*/1.0.*/
+debian/tmp/usr/lib/mono/gac/CustomMarshalers/1.0.*/
 debian/tmp/usr/lib/mono/1.0/System*.dll
+debian/tmp/usr/lib/mono/1.0/CustomMarshalers.dll*

Modified: mono/trunk/debian/libmono-system2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system2.0-cil.clideps-override	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/libmono-system2.0-cil.clideps-override	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,5 +1,6 @@
 suggests libfam0
 suggests libgamin0
 suggests libx11-6
+suggests libasound2
 suggests libcupsys2
 suggests libgdiplus

Modified: mono/trunk/debian/libmono-system2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system2.0-cil.install	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/libmono-system2.0-cil.install	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,2 +1,4 @@
 debian/tmp/usr/lib/mono/gac/System*/2.0.*/
+debian/tmp/usr/lib/mono/gac/CustomMarshalers/2.0.*/
 debian/tmp/usr/lib/mono/2.0/System*.dll
+debian/tmp/usr/lib/mono/2.0/CustomMarshalers.dll*

Modified: mono/trunk/debian/libmono-winforms1.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-winforms1.0-cil.clideps-override	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/libmono-winforms1.0-cil.clideps-override	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,2 +1,3 @@
 suggests libgtk2.0-0
 suggests libgnomeui-0
+suggests librsvg2-2

Modified: mono/trunk/debian/libmono-winforms2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-winforms2.0-cil.clideps-override	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/libmono-winforms2.0-cil.clideps-override	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,2 +1,3 @@
 suggests libgtk2.0-0
 suggests libgnomeui-0
+suggests librsvg2-2

Modified: mono/trunk/debian/mono-common.install
===================================================================
--- mono/trunk/debian/mono-common.install	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/mono-common.install	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,2 +1,2 @@
 debian/tmp/etc/mono
-debian/tmp/usr/share/mono/cil/cil-opcodes.xml
+debian/tmp/usr/share/mono-1.0/mono/cil/cil-opcodes.xml

Modified: mono/trunk/debian/mono-gac.install
===================================================================
--- mono/trunk/debian/mono-gac.install	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/mono-gac.install	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,3 +1,2 @@
 debian/tmp/usr/bin/gacutil
 debian/tmp/usr/lib/mono/1.0/gacutil.exe
-debian/MonoGetAssemblyName.exe	/usr/share/mono/

Modified: mono/trunk/debian/mono-gmcs.install
===================================================================
--- mono/trunk/debian/mono-gmcs.install	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/mono-gmcs.install	2007-02-27 08:48:28 UTC (rev 2959)
@@ -7,5 +7,12 @@
 debian/tmp/usr/bin/mkbundle2
 debian/tmp/usr/bin/xbuild
 debian/tmp/usr/bin/sgen
+debian/tmp/usr/bin/al2
 debian/tmp/usr/lib/mono/2.0/*.exe*
-debian/tmp/usr/lib/mono/xbuild/
+debian/tmp/usr/lib/mono/2.0/xbuild.rsp
+debian/tmp/usr/lib/mono/2.0/MSBuild/
+debian/tmp/usr/lib/mono/2.0/Microsoft.Build.xsd
+debian/tmp/usr/lib/mono/2.0/Microsoft.CSharp.targets
+debian/tmp/usr/lib/mono/2.0/Microsoft.Common.tasks
+debian/tmp/usr/lib/mono/2.0/Microsoft.Common.targets
+debian/tmp/usr/lib/mono/2.0/Microsoft.VisualBasic.targets

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/patches/00list	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,3 +1,4 @@
 remove_broken_dllmap_from_mono-shlib-cop.dpatch
 console-no-utf8-bom.dpatch
 kfreebsd_support.dpatch
+firebird-fbclient.dpatch

Added: mono/trunk/debian/patches/firebird-fbclient.dpatch
===================================================================
--- mono/trunk/debian/patches/firebird-fbclient.dpatch	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/patches/firebird-fbclient.dpatch	2007-02-27 08:48:28 UTC (rev 2959)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono/mcs/class/FirebirdSql.Data.Firebird/Makefile.old	2007-02-26 23:06:40.510241854 +0100
++++ mono/mcs/class/FirebirdSql.Data.Firebird/Makefile	2007-02-26 23:07:08.607843047 +0100
+@@ -8,7 +8,7 @@
+ LIB_DEFINE_FLAGS = 
+ 
+ ifeq ($(PLATFORM), linux)
+-LIB_DEFINE_FLAGS = /d:LINUX
++LIB_DEFINE_FLAGS = /d:LINUX /d:FBCLIENT
+ endif
+ 
+ LIB_MCS_FLAGS = \

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/rules	2007-02-27 08:48:28 UTC (rev 2959)
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
-MONO_API = 1.2.2
+MONO_API = 1.2.3
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
@@ -105,7 +105,7 @@
 	dh_installdirs -s
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	cd mcs/jay && \
-	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp prefix=/usr INSTALL=../../install-sh
 	touch install-arch-stamp
 
 install-indep: install-indep-stamp
@@ -115,7 +115,8 @@
 	#dh_clean -k -i
 	dh_installdirs -i
 	cd mcs && \
-	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \
+	  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_0
 	touch install-indep-stamp
 
 binary: binary-arch binary-indep
@@ -149,8 +150,10 @@
 	# using the built Mono runtime from debian/tmp
 	# (thus the install-arch target dependency!)
 	$(RUN_MONO) mcs/class/lib/default/mcs.exe /t:exe \
-	  /out:debian/MonoGetAssemblyName.exe \
+	  /out:debian/mono-gac/usr/share/mono/MonoGetAssemblyName.exe \
 	  debian/MonoGetAssemblyName.cs
+	install -m 644 debian/System.Data.dll.config debian/libmono-system-data1.0-cil/usr/lib/mono/gac/System.Data/1.0.*/
+	install -m 644 debian/System.Data.dll.config debian/libmono-system-data2.0-cil/usr/lib/mono/gac/System.Data/2.0.*/
 	install -m 644 debian/System.Drawing.dll.config debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Drawing/1.0.*/
 	install -m 644 debian/System.Drawing.dll.config debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Drawing/2.0.*/
 	install -m 644 debian/System.Windows.Forms.dll.config debian/libmono-winforms1.0-cil/usr/lib/mono/gac/System.Windows.Forms/1.0.*/
@@ -188,6 +191,10 @@
 	rm debian/mono-mcs/usr/bin/mkbundle2
 	# delete sgen from mono-mcs (this is already in mono-gmcs)
 	rm debian/mono-mcs/usr/bin/sgen
+	# delete al2 from mono-mcs (this is already in mono-gmcs)
+	rm debian/mono-mcs/usr/bin/al2
+	# FIXME delete httpcfg from mono-mcs (this has no corresponding binary)
+	rm debian/mono-mcs/usr/bin/httpcfg
 	# delete Mono.Data.Tds from libmono1.0/2.0-cil (those are already in libmono-data-tds*-cil)
 	rm -r debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
 	rm -r debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data.Tds/

Modified: mono/trunk/debian/shlibs.local
===================================================================
--- mono/trunk/debian/shlibs.local	2007-02-26 21:28:48 UTC (rev 2958)
+++ mono/trunk/debian/shlibs.local	2007-02-27 08:48:28 UTC (rev 2959)
@@ -1,6 +1,7 @@
 libgdiplus 0 libgdiplus (>= 1.1.18)
 libcairo 2 libcairo2 (>= 1.2.4)
-libfbembed 1 libfbembed1
+libfbclient 1 libfbclient1
 libsqlite 0 libsqlite0 (>= 2.8.17)
 libsqlite3 0 libsqlite3-0 (>= 3.3.8)
 libMonoPosixHelper 0 libmono0 (>= 1.2.2)
+libasound 2 libasound2 (>> 1.0.12)

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