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

Eduard Bloch blade@haydn.debian.org
Mon, 28 Jun 2004 10:23:50 -0600


Author: blade
Date: 2004-06-28 10:23:48 -0600 (Mon, 28 Jun 2004)
New Revision: 1152

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/dh_makenetlibs
   mono/trunk/debian/libmono-dev.files
   mono/trunk/debian/libmono0.files
   mono/trunk/debian/mono-utils.files
   mono/trunk/debian/mono-utils.manpages
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
mono rc1 update


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/changelog	2004-06-28 16:23:48 UTC (rev 1152)
@@ -1,8 +1,11 @@
-mono (0.96-2) unstable; urgency=low
+mono (0.97-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * (NOT RELEASED YET) New upstream release
+  * Eduard Bloch
+    + Added libMonoPosixHelper... to libmono... packages
+    + monosn is gone, using sn to get the signature strings now
 
- -- Eduard Bloch <blade@debian.org>  Sat, 19 Jun 2004 14:46:32 +0200
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Mon, 28 Jun 2004 01:14:32 +0200
 
 mono (0.96-1) unstable; urgency=low
 

Modified: mono/trunk/debian/dh_makenetlibs
===================================================================
--- mono/trunk/debian/dh_makenetlibs	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/dh_makenetlibs	2004-06-28 16:23:48 UTC (rev 1152)
@@ -172,9 +172,8 @@
             chomp;
             my ( $library, $ver, $libfile );
             $libfile = $_;
-            my $sig = `monosn -T $_`;
-            $sig =~ s/.*token is //;
-            chomp($sig);
+            my $sig = `sn -T $_ 2>/dev/null`;
+            $sig =~ s/.*key token: (\w+).*/$1/is;
             if($sig=~/\s/) {
                warning "$libfile has no valid signature, ignoring";
                next dll;

Modified: mono/trunk/debian/libmono-dev.files
===================================================================
--- mono/trunk/debian/libmono-dev.files	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/libmono-dev.files	2004-06-28 16:23:48 UTC (rev 1152)
@@ -1,4 +1,6 @@
 usr/lib/libmono*.a
+usr/lib/libMono*.a
 usr/lib/libmono*.so
+usr/lib/libMono*.so
 usr/lib/pkgconfig/mono.pc
 usr/include

Modified: mono/trunk/debian/libmono0.files
===================================================================
--- mono/trunk/debian/libmono0.files	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/libmono0.files	2004-06-28 16:23:48 UTC (rev 1152)
@@ -1 +1,2 @@
 usr/lib/libmono*.so.*
+usr/lib/libMono*.so.*

Modified: mono/trunk/debian/mono-utils.files
===================================================================
--- mono/trunk/debian/mono-utils.files	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/mono-utils.files	2004-06-28 16:23:48 UTC (rev 1152)
@@ -1,4 +1,3 @@
 usr/bin/pedump
 usr/bin/monodis
 usr/bin/monograph
-usr/bin/monosn

Modified: mono/trunk/debian/mono-utils.manpages
===================================================================
--- mono/trunk/debian/mono-utils.manpages	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/mono-utils.manpages	2004-06-28 16:23:48 UTC (rev 1152)
@@ -1,5 +1,4 @@
 debian/man/pedump.1
 debian/man/monograph.1
-debian/man/monosn.1
 debian/tmp/usr/share/man/man1/monodis.1
 debian/dh_*.1

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/patches/00list	2004-06-28 16:23:48 UTC (rev 1152)
@@ -1 +0,0 @@
-04_monodiscrash

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2004-06-21 22:46:31 UTC (rev 1151)
+++ mono/trunk/debian/rules	2004-06-28 16:23:48 UTC (rev 1152)
@@ -65,8 +65,8 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	cd debian ; for x in dh_netdeps dh_makenetlibs dh_installxsp ; \
 		do chmod +x $$x; pod2man $$x > $$x.1 ; done
-	# this is no longer installed by the build system, why?
-	cp -a ./mono/metadata/monosn $(CURDIR)/debian/tmp/usr/bin
+#	# this is no longer installed by the build system, why?
+#	cp -a ./mono/metadata/monosn $(CURDIR)/debian/tmp/usr/bin
 	# removing trash (real assemblies/libs get build by the mcs source package)
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libMonoPosixHelper*
 	rm -f $(CURDIR)/debian/tmp/usr/lib/mscorlib.dll