[Pkg-mono-svn-commits] rev 474 - in mono/trunk/debian: . patches
Eduard Bloch
blade@haydn.debian.org
Tue, 06 Apr 2004 02:21:30 -0600
Author: blade
Date: 2004-04-06 02:21:10 -0600 (Tue, 06 Apr 2004)
New Revision: 474
Added:
mono/trunk/debian/patches/02_soname_map.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/control
mono/trunk/debian/patches/00list
mono/trunk/debian/rules
Log:
changelog to 0.31
DLL map updates, perl hacks disabled
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2004-04-06 07:33:15 UTC (rev 473)
+++ mono/trunk/debian/changelog 2004-04-06 08:21:10 UTC (rev 474)
@@ -1,8 +1,9 @@
-mono (0.30.2-2) unstable; urgency=low
+mono (0.31-1) unstable; urgency=low
- * NOT RELEASED YET
+ * (NOT RELEASED YET) New upstream release
+ * added additional entries to the hard-coded DLL map (closes: #236782)
- -- Eduard Bloch <blade@debian.org> Sat, 6 Mar 2004 13:39:08 +0100
+ -- Eduard Bloch <blade@debian.org> Tue, 6 Apr 2004 09:44:35 +0200
mono (0.30.2-1) unstable; urgency=low
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2004-04-06 07:33:15 UTC (rev 473)
+++ mono/trunk/debian/control 2004-04-06 08:21:10 UTC (rev 474)
@@ -55,13 +55,16 @@
Package: mono
Architecture: all
-Depends: mono-jit (= ${Source-Version}) | mono-mint (= ${Source-Version}), mono-common (= ${Source-Version}), mono-utils (= ${Source-Version}), mono-mcs, mono-assemblies-arch
+Depends: mono-jit (= ${Source-Version}) | mono-mint (= ${Source-Version}), mono-utils (= ${Source-Version}), mono-mcs, mono-assemblies-arch
Description: The Mono .NET development environment
The Mono Project is an open development initiative sponsored by Ximian that is
working to develop an open source, Linux-based version of the Microsoft .NET
development platform.
.
- mono is a metapackage containing dependencies for the components of Mono.
+ mono is a metapackage containing dependencies for the components of
+ Mono. If you do not need all of them (or try to work around X11
+ dependencies), install the core packages manualy: mono-jit (or
+ mono-mint if JIT is not available), mono-mcs, mono-utils.
Package: mono-utils
Architecture: alpha arm hppa powerpc s390 sparc i386
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2004-04-06 07:33:15 UTC (rev 473)
+++ mono/trunk/debian/patches/00list 2004-04-06 08:21:10 UTC (rev 474)
@@ -1 +1,2 @@
01_arch_fallback
+02_soname_map
Added: mono/trunk/debian/patches/02_soname_map.dpatch
===================================================================
--- mono/trunk/debian/patches/02_soname_map.dpatch 2004-04-06 07:33:15 UTC (rev 473)
+++ mono/trunk/debian/patches/02_soname_map.dpatch 2004-04-06 08:21:10 UTC (rev 474)
@@ -0,0 +1,64 @@
+#! /bin/sh -e
+## 02_soname_map.dpatch by Eduard Bloch <blade@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for the hard-coded DLL map
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /tmp/mono-0.31/data/config.in mono-0.31/data/config.in
+--- /tmp/mono-0.31/data/config.in 2004-03-13 20:21:12.000000000 +0100
++++ mono-0.31/data/config.in 2004-04-06 10:16:05.000000000 +0200
+@@ -4,18 +4,24 @@
+ <dllmap dll="libxslt.dll" target="libxslt.so" />
+ <dllmap dll="libmySQL.dll" target="libmysqlclient.so" />
+ <dllmap dll="odbc32.dll" target="libodbc.so" />
+- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so" />
+- <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so" />
+- <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so" />
+- <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0.so" />
+- <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so" />
+- <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so" />
+- <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so" />
+- <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so" />
+- <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so" />
+- <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0.so" />
++ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" />
++ <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" />
++ <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so.0" />
++ <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0.so.0" />
++ <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0" />
++ <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" />
++ <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0" />
++ <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0" />
++ <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0" />
++ <dllmap dll="libglade-2.0-0.dll" target="libglade-2.0.so.0" />
+ <dllmap dll="oci" target="clntsh" />
+ <dllmap dll="gtkhtml-3.0" target="libgtkhtml-3.0.so" />
+ <dllmap dll="db2cli" target="libdb2_36.so"/>
+- <dllmap dll="gstreamer" target="libgstreamer-0.6.so" />
++ <dllmap dll="gnome-2" target="libgnome-2.so.0" />
++ <dllmap dll="gconf-2" target="libgconf-2.so.4" />
++ <dllmap dll="gstreamer" target="libgstreamer-0.6.so.0" />
++ <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0.so.0">
++ <dllmap dll="gnomeui-2" target="libgnomeui-2.so.0" />
++ <dllmap dll="gnomevfs-2" target="libgnomevfs-2.so.0" />
++ <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2.so.0" />
+ </configuration>
Property changes on: mono/trunk/debian/patches/02_soname_map.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2004-04-06 07:33:15 UTC (rev 473)
+++ mono/trunk/debian/rules 2004-04-06 08:21:10 UTC (rev 474)
@@ -82,10 +82,10 @@
dh_movefiles -s
dh_link -s
install -m644 -D debian/lintian debian/mono/usr/share/lintian/overrides/mono
- # the SONAMEs fix
- perl -pe 's/-0.dll(.*)\.so/-0.dll$$1.so.0/; s/libgstreamer-0.6.so/libgstreamer-0.6.so.0/;' -i debian/mono-common/etc/mono/config
+ # the SONAMEs fix, done via dpatch now
+# perl -pe 's/-0.dll(.*)\.so/-0.dll$$1.so.0/; s/libgstreamer-0.6.so/libgstreamer-0.6.so.0/;' -i debian/mono-common/etc/mono/config
# gnomeui soname fix, it sucks
- perl -pe 's!<configuration>!<configuration>\n<dllmap dll="gnomeui-2" target="libgnomeui-2.so.0" />!' -i debian/mono-common/etc/mono/config
+ # perl -pe 's!<configuration>!<configuration>\n<dllmap dll="gnomeui-2" target="libgnomeui-2.so.0" />!' -i debian/mono-common/etc/mono/config
# cd debian; for s in *.shlibs.in ; do sed -e "s/_VERSION_/$(VERSION)/g" < $$s | tee $${s%%.in} | tee $${s%%.shlibs.in}/DEBIAN/shlibs >> shlibs.local ; done
# cd debian; for s in *.shlibs.in ; do sed -e "s/_VERSION_/$(VERSION)/g" < $$s | tee $${s%%.in} >> shlibs.local ; done
dh_installchangelogs -s