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

[Mirco Bauer]

Author: meebey
Date: 2007-12-20 23:31:51 +0000 (Thu, 20 Dec 2007)
New Revision: 3531

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/mono-1.0-devel.manpages
   mono/trunk/debian/mono-2.0-devel.manpages
   mono/trunk/debian/rules
Log:
- more fixes



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-12-20 22:20:26 UTC (rev 3530)
+++ mono/trunk/debian/changelog	2007-12-20 23:31:51 UTC (rev 3531)
@@ -15,6 +15,7 @@
       (this is pretty error prone when upstream introduces new libraries and
        the rm list became way too long)
     + Copy various 1.0 manpages to 2.0 manpages for missing 2.0 manpages.
+    + Remove +dfsg part in upstream version detection (UPVERSION variable).
   * debian/control:
     + Added new packages (mono-mcs/gmcs needed to be split as some parts of the
       runtime relies on the compiler, like the XmlSerializer class):

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2007-12-20 22:20:26 UTC (rev 3530)
+++ mono/trunk/debian/control	2007-12-20 23:31:51 UTC (rev 3531)
@@ -1049,25 +1049,25 @@
  The gmcs compiler supports two different featuresets (C# versions).
  .
  With C# 2.0 (which is the default) it supports:
- - generics
- - iterators (yield)
- - nullable value types
- - partial types
- - anonymous methods
- - static classes
- - coalesce operator: ??
+  - generics
+  - iterators (yield)
+  - nullable value types
+  - partial types
+  - anonymous methods
+  - static classes
+  - coalesce operator: ??
  .
  With C# 3.0 it supports:
- - Language Integrated Query (LINQ)
- - object initializers
- - collection initializers
- - anonymous types
- - local variable type inference
- - implicitly-typed arrays
- - lambda expressions
- - automatic properties
- - extension methods
- - partial methods
+  - Language Integrated Query (LINQ)
+  - object initializers
+  - collection initializers
+  - anonymous types
+  - local variable type inference
+  - implicitly-typed arrays
+  - lambda expressions
+  - automatic properties
+  - extension methods
+  - partial methods
  .
  This compiler targets the CLI 2.0 runtime version.
  .
@@ -1080,7 +1080,7 @@
 Package: mono-smcs
 Section: devel
 Architecture: all
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, libmono-corlib2.1-cil, libmono-system2.1-cil
 Recommends: pkg-config
 Description: Mono C# 3.0 compiler for CLI 2.1 (Moonlight / Silverlight)
  This is a special C# (C-Sharp) 3.0 compiler for Moonlight (Silverlight)

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2007-12-20 22:20:26 UTC (rev 3530)
+++ mono/trunk/debian/dh_clideps	2007-12-20 23:31:51 UTC (rev 3531)
@@ -212,6 +212,7 @@
 
 our $needs_net_1_0;
 our $needs_net_2_0;
+our $needs_net_2_1;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
   my $tmp = tmpdir($package);

Modified: mono/trunk/debian/mono-1.0-devel.manpages
===================================================================
--- mono/trunk/debian/mono-1.0-devel.manpages	2007-12-20 22:20:26 UTC (rev 3530)
+++ mono/trunk/debian/mono-1.0-devel.manpages	2007-12-20 23:31:51 UTC (rev 3531)
@@ -11,8 +11,8 @@
 debian/tmp/usr/share/man/man1/macpack.1
 debian/tmp/usr/share/man/man1/makecert.1
 debian/tmp/usr/share/man/man1/mkbundle.1
-debian/tmp/usr/share/man/man1/mono-service.1
 debian/tmp/usr/share/man/man1/mono-shlib-cop.1
+debian/tmp/usr/share/man/man1/mono-xmltool.1
 debian/tmp/usr/share/man/man1/monolinker.1
 debian/tmp/usr/share/man/man1/monop.1
 debian/tmp/usr/share/man/man1/mozroots.1

Modified: mono/trunk/debian/mono-2.0-devel.manpages
===================================================================
--- mono/trunk/debian/mono-2.0-devel.manpages	2007-12-20 22:20:26 UTC (rev 3530)
+++ mono/trunk/debian/mono-2.0-devel.manpages	2007-12-20 23:31:51 UTC (rev 3531)
@@ -1,5 +1,8 @@
+debian/tmp/usr/share/man/man1/al2.1
 debian/tmp/usr/share/man/man1/wsdl2.1
 debian/tmp/usr/share/man/man1/monop2.1
+debian/tmp/usr/share/man/man1/mkbundle2.1
 debian/tmp/usr/share/man/man1/ilasm2.1
 debian/tmp/usr/share/man/man1/resgen2.1
+debian/tmp/usr/share/man/man1/sgen.1
 debian/tmp/usr/share/man/man1/httpcfg.1

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-12-20 22:20:26 UTC (rev 3530)
+++ mono/trunk/debian/rules	2007-12-20 23:31:51 UTC (rev 3531)
@@ -6,7 +6,7 @@
 MONO_API = 1.2.6
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
-UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
+UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+.*,,') 
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
 
 RUN_MONO = LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0 debian/tmp/usr/bin/mono
@@ -140,12 +140,16 @@
 	  $(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
+	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 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/gmcs.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/smcs.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mono-service.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/mono-service2.1
+	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mkbundle.1 \
+	   $(CURDIR)/debian/tmp/usr/share/man/man1/mkbundle2.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/wsdl.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/wsdl2.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/monop.1 \