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

[Eduard Bloch]

Author: blade
Date: 2004-02-05 21:25:05 +0100 (Thu, 05 Feb 2004)
New Revision: 161

Removed:
   mono/trunk/debian/mono_config
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/rules
Log:
Perl hook to fix sonames
Changelog rewritten to show authors


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2004-02-05 20:14:29 UTC (rev 160)
+++ mono/trunk/debian/changelog	2004-02-05 20:25:05 UTC (rev 161)
@@ -2,15 +2,17 @@
 
   * NOT RELEASED YET
   * the last release of 0.29* series
-  * Included modified icu-config to use libicu26-dev
-  * included my binary /usr/bin/cli wrapper to mono-common
-  * added libtool to Build-Deps (closes: #231271)
-  * added automake1.7 to Build-Deps
-  * TODO: test it extensively!
-  * added corrected /etc/mono/config file, which maps to actual SONAMEs
-    (Closes: #231191)
-  * TODO: check this
+  * Teófilo Ruiz Suárez:
+    + added automake1.7 to Build-Deps
+  * Eduard Bloch:
+    + Included modified icu-config to use libicu26-dev
+    + added libtool to Build-Deps (closes: #231271)
 
+    + TODO: TEST ALL OF THIS BELOW
+    + hook to correct SONAMEs in /etc/mono/config file (Closes: #231191)
+    + included a generic binary wrapper to mono-common to be used as
+      PROGRAM to run /usr/bin/PROGRAM.exe with /usr/bin/cli
+
  -- Eduard Bloch <blade@debian.org>  Thu, 22 Jan 2004 00:57:56 +0100
 
 mono (0.29.99.20040114-2) unstable; urgency=low

Deleted: mono/trunk/debian/mono_config
===================================================================
--- mono/trunk/debian/mono_config	2004-02-05 20:14:29 UTC (rev 160)
+++ mono/trunk/debian/mono_config	2004-02-05 20:25:05 UTC (rev 161)
@@ -1,22 +0,0 @@
-<configuration>
-        <dllmap dll="cygwin1.dll" target="@LIBC@" />
-        <dllmap dll="libc" target="@LIBC@" />
-        <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.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.2" />
-        <dllmap dll="db2cli" target="libdb2_36.so"/>
-        <dllmap dll="gstreamer" target="libgstreamer-0.6.so" />
-</configuration>
-

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2004-02-05 20:14:29 UTC (rev 160)
+++ mono/trunk/debian/rules	2004-02-05 20:25:05 UTC (rev 161)
@@ -58,7 +58,7 @@
 	$(MAKE) install DESTDIR=$(PWD)/debian/tmp
 	install -D -m755 cli-wrapper $(CURDIR)/debian/mono-common/usr/bin/cli-wrapper
 	cd $(CURDIR)/debian/detector && $(MAKE) && install -D -m755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli
-	cp debian/mono_config $(CURDIR)/debian/mono-common/etc/mono/config
+#	cp debian/mono_config $(CURDIR)/debian/mono-common/etc/mono/config
 	install -o root -g root -m 644 debian/cli.binfmt \
 	  debian/mono-common/usr/share/binfmts/cli
 
@@ -89,6 +89,8 @@
 	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/' 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