[Pkg-mono-svn-commits] rev 2103 - in non-group/nemerle/trunk/debian: . patches

Sebastian Dröge slomo-guest at costa.debian.org
Sat Nov 5 00:27:01 UTC 2005 

Author: slomo-guest
Date: 2005-11-05 00:27:00 +0000 (Sat, 05 Nov 2005)
New Revision: 2103

Added:
   non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch
Removed:
   non-group/nemerle/trunk/debian/patches/12_fix_tools_Makefile.dpatch
   non-group/nemerle/trunk/debian/patches/13_fix_scripts.dpatch
Modified:
   non-group/nemerle/trunk/debian/changelog
   non-group/nemerle/trunk/debian/control
   non-group/nemerle/trunk/debian/patches/00list
   non-group/nemerle/trunk/debian/patches/10_configuration.dpatch
   non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch
   non-group/nemerle/trunk/debian/rules
Log:
* Updated nemerle to new upstream version 0.9.1


Modified: non-group/nemerle/trunk/debian/changelog
===================================================================
--- non-group/nemerle/trunk/debian/changelog	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/changelog	2005-11-05 00:27:00 UTC (rev 2103)
@@ -1,3 +1,9 @@
+nemerle (0.9.1-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Sat,  5 Nov 2005 01:09:04 +0100
+
 nemerle (0.3.2-2) unstable; urgency=low
 
   * Took Jacek's package from nemerle.org and made me the new maintainer as he

Modified: non-group/nemerle/trunk/debian/control
===================================================================
--- non-group/nemerle/trunk/debian/control	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/control	2005-11-05 00:27:00 UTC (rev 2103)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends-Indep: debhelper (>= 4.0.0), libmono-dev (>= 1.0.0), cli-common (>= 0.2.0), mono-mcs (>= 1.0) | c-sharp-compiler, dpatch, mono-gac
+Build-Depends-Indep: debhelper (>= 4.0.0), libmono-dev (>= 1.1.9), cli-common (>= 0.2.0), mono-gmcs (>= 1.1.9) | c-sharp-2.0-compiler, dpatch, mono-gac
 Standards-Version: 3.6.2
 
 Package: nemerle

Modified: non-group/nemerle/trunk/debian/patches/00list
===================================================================
--- non-group/nemerle/trunk/debian/patches/00list	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/patches/00list	2005-11-05 00:27:00 UTC (rev 2103)
@@ -1,4 +1,3 @@
 10_configuration.dpatch
 11_nemerle_pc.dpatch
-12_fix_tools_Makefile.dpatch
-13_fix_scripts.dpatch
+12_fix_scripts.dpatch

Modified: non-group/nemerle/trunk/debian/patches/10_configuration.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/10_configuration.dpatch	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/patches/10_configuration.dpatch	2005-11-05 00:27:00 UTC (rev 2103)
@@ -5,17 +5,17 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./config.mak /tmp/dpep-work.8O8sgz/nemerle-0.3.2/config.mak
+diff -urNad --exclude=CVS --exclude=.svn ./config.mak /tmp/dpep-work.AUZjL1/nemerle-0.9.0/config.mak
 --- ./config.mak	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep-work.8O8sgz/nemerle-0.3.2/config.mak	2005-07-24 18:30:57.151199832 +0200
-@@ -0,0 +1,44 @@
++++ /tmp/dpep-work.AUZjL1/nemerle-0.9.0/config.mak	2005-09-30 13:18:21.292602072 +0200
+@@ -0,0 +1,43 @@
 +# Created by Jacek Sliwerski for Debian package.
 +
 +Q          = @
 +
 +PACKAGE    = nemerle
-+VERSION    = 0.3
-+REVISION   = 2
++VERSION    = 0.9
++REVISION   = 1
 +SVN_REV    = 
 +
 +NET_ENGINE = mono
@@ -25,7 +25,7 @@
 +NGEN       = true
 +DASM       = monodis
 +ASM        = ilasm
-+CSC        = mcs
++CSC        = gmcs
 +PEVERIFY   = 
 +TIME       = 
 +ANTLR      = 
@@ -52,4 +52,3 @@
 +GACUTIL_COMMAND = gacutil -root $(DESTDIR)/usr/lib -package nemerle -i
 +GACUTIL_UNINSTALL_COMMAND = gacutil -root $(DESTDIR)/usr/lib -package nemerle -u
 +NGEN_GAC = true
-+

Modified: non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch	2005-11-05 00:27:00 UTC (rev 2103)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./nemerle.pc /tmp/dpep-work.fZ2asp/nemerle-0.3.2/nemerle.pc
+diff -urNad --exclude=CVS --exclude=.svn ./nemerle.pc /tmp/dpep-work.qUODxk/nemerle-0.9.0/nemerle.pc
 --- ./nemerle.pc	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep-work.fZ2asp/nemerle-0.3.2/nemerle.pc	2005-07-24 18:38:37.457222680 +0200
++++ /tmp/dpep-work.qUODxk/nemerle-0.9.0/nemerle.pc	2005-09-30 13:17:59.477918408 +0200
 @@ -0,0 +1,8 @@
 +prefix=/usr
 +exec_prefix=${prefix}
@@ -15,5 +15,5 @@
 +
 +Name: Nemerle
 +Description: Nemerle - a .NET object-functional language
-+Version: 0.3.2
++Version: 0.9.1
 +Libs: -r:/usr/lib/mono/nemerle/Nemerle.dll -r:/usr/lib/mono/nemerle/Nemerle.Compiler.dll -r:/usr/lib/mono/nemerle/Nemerle.Macros.dll

Added: non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch	2005-11-05 00:27:00 UTC (rev 2103)
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_fix_scripts.dpatch by  <sliwers at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./ncc/Makefile /tmp/dpep-work.B8b1hb/nemerle-0.9.0/ncc/Makefile
+--- ./ncc/Makefile	2005-09-30 12:57:49.000000000 +0200
++++ /tmp/dpep-work.B8b1hb/nemerle-0.9.0/ncc/Makefile	2005-09-30 13:07:46.087167976 +0200
+@@ -449,9 +449,9 @@
+ 	export MONO_PATH=$$MONO_PATH:$$PWD/out.stage3 ; $(NGEN_GAC)
+ 	$(INST) "[$(BINDIR)]" ncc.exe
+ 	$(Q)$(INSTALL) -m 755 out.stage3/ncc.exe $(DESTDIR)$(BINDIR)/ncc.exe
+-	echo "#!/bin/sh" > $(DESTDIR)$(SCRDIR)/ncc && \
+-	echo '$(NET_ENGINE) $(BINDIR)/ncc.exe "$$@"' >> $(DESTDIR)$(SCRDIR)/ncc ; \
+-	chmod 755 $(DESTDIR)$(SCRDIR)/ncc ;
++#	echo "#!/bin/sh" > $(DESTDIR)$(SCRDIR)/ncc && \
++#	echo '$(NET_ENGINE) $(BINDIR)/ncc.exe "$$@"' >> $(DESTDIR)$(SCRDIR)/ncc ; \
++#	chmod 755 $(DESTDIR)$(SCRDIR)/ncc ;
+ 
+ clean:
+ 	cd testsuite && $(MAKE) clean
+diff -urNad --exclude=CVS --exclude=.svn ./tools/cs2n/Makefile /tmp/dpep-work.B8b1hb/nemerle-0.9.0/tools/cs2n/Makefile
+--- ./tools/cs2n/Makefile	2005-09-30 12:57:49.000000000 +0200
++++ /tmp/dpep-work.B8b1hb/nemerle-0.9.0/tools/cs2n/Makefile	2005-09-30 13:08:34.706776672 +0200
+@@ -108,11 +108,11 @@
+ 	$(Q)$(GACUTIL_COMMAND) antlr.runtime.dll
+ 	$(INST) "[$(BINDIR)]" cs2n.exe
+ 	$(Q)$(INSTALL) -m 755 cs2n.exe $(DESTDIR)$(BINDIR)/cs2n.exe
+-	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
+-		echo "#!/bin/sh" > $(DESTDIR)$(SCRDIR)/cs2n && \
+-		echo '$(NET_ENGINE) $(BINDIR)/cs2n.exe "$$@"' >> $(DESTDIR)$(SCRDIR)/cs2n ; \
+-		chmod 755 $(DESTDIR)$(SCRDIR)/cs2n ; \
+-	fi
++#	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
++#		echo "#!/bin/sh" > $(DESTDIR)$(SCRDIR)/cs2n && \
++#		echo '$(NET_ENGINE) $(BINDIR)/cs2n.exe "$$@"' >> $(DESTDIR)$(SCRDIR)/cs2n ; \
++#		chmod 755 $(DESTDIR)$(SCRDIR)/cs2n ; \
++#	fi
+ 
+ uninstall:
+ 	$(RM) Nemerle.CSharp
+diff -urNad --exclude=CVS --exclude=.svn ./tools/nemerlish/Makefile /tmp/dpep-work.B8b1hb/nemerle-0.9.0/tools/nemerlish/Makefile
+--- ./tools/nemerlish/Makefile	2005-09-30 12:57:49.000000000 +0200
++++ /tmp/dpep-work.B8b1hb/nemerle-0.9.0/tools/nemerlish/Makefile	2005-09-30 13:10:12.343933568 +0200
+@@ -35,11 +35,11 @@
+ 	$(INST) "[$(BINDIR)]" nemish.exe
+ 	$(Q)$(INSTALL) -m 755 nemish.exe $(DESTDIR)$(BINDIR)/nemish.exe
+ # Set a `nemish' script if binfmt_misc is not available.
+-	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
+-		echo "#!/bin/sh" > $(DESTDIR)$(SCRDIR)/nemish && \
+-		echo '$(NET_ENGINE) $(BINDIR)/nemish.exe "$$@"' >> $(DESTDIR)$(SCRDIR)/nemish ; \
+-		chmod 755 $(DESTDIR)$(SCRDIR)/nemish ; \
+-	fi
++#	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
++#		echo "#!/bin/sh" > $(DESTDIR)$(SCRDIR)/nemish && \
++#		echo '$(NET_ENGINE) $(BINDIR)/nemish.exe "$$@"' >> $(DESTDIR)$(SCRDIR)/nemish ; \
++#		chmod 755 $(DESTDIR)$(SCRDIR)/nemish ; \
++#	fi
+ 
+ 
+ uninstall:


Property changes on: non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: non-group/nemerle/trunk/debian/patches/12_fix_tools_Makefile.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/12_fix_tools_Makefile.dpatch	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/patches/12_fix_tools_Makefile.dpatch	2005-11-05 00:27:00 UTC (rev 2103)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_fix_tools_Makefile.dpatch by  <rzyj at plusnet.pl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./tools/Makefile /tmp/dpep-work.snVaki/nemerle-0.3.2/tools/Makefile
---- ./tools/Makefile	2005-07-24 18:56:53.486600888 +0200
-+++ /tmp/dpep-work.snVaki/nemerle-0.3.2/tools/Makefile	2005-05-28 10:31:26.000000000 +0200
-@@ -36,7 +36,7 @@
- all:
- 	$(Q)if test $(ANTLR); then \
- 		$(MAKE) -C cs2n all; \
--	elif find tools/cs2n/CSharpParser.cs -cnewer tools/cs2n/csharpgrammar.g | grep -q "" ; then \
-+	elif find cs2n/CSharpParser.cs -cnewer cs2n/csharpgrammar.g | grep -q "" ; then \
- 		$(MAKE) -C cs2n all; \
- 	fi
- 	$(Q)$(MAKE) -C nemerlish all

Deleted: non-group/nemerle/trunk/debian/patches/13_fix_scripts.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/13_fix_scripts.dpatch	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/patches/13_fix_scripts.dpatch	2005-11-05 00:27:00 UTC (rev 2103)
@@ -1,67 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_fix_scripts.dpatch by  <rzyj at plusnet.pl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./ncc/Makefile /tmp/dpep-work.fytnkW/nemerle-0.3.2/ncc/Makefile
---- ./ncc/Makefile	2005-06-01 11:54:57.000000000 +0200
-+++ /tmp/dpep-work.fytnkW/nemerle-0.3.2/ncc/Makefile	2005-07-24 21:25:52.262700368 +0200
-@@ -447,11 +447,11 @@
- 	export MONO_PATH=$$MONO_PATH:$$PWD/out.stage3 ; $(NGEN_GAC)
- 	$(INST) "[$(BINDIR)]" ncc.exe
- 	$(Q)$(INSTALL) -m 755 out.stage3/ncc.exe $(DESTDIR)$(BINDIR)/ncc.exe
--	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
--		echo "#!/bin/sh" > $(DESTDIR)$(BINDIR)/ncc && \
--		echo '$(NET_ENGINE) $(BINDIR)/ncc.exe "$$@"' >> $(DESTDIR)$(BINDIR)/ncc ; \
--		chmod 755 $(DESTDIR)$(BINDIR)/ncc ; \
--	fi
-+#	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
-+#		echo "#!/bin/sh" > $(DESTDIR)$(BINDIR)/ncc && \
-+#		echo '$(NET_ENGINE) $(BINDIR)/ncc.exe "$$@"' >> $(DESTDIR)$(BINDIR)/ncc ; \
-+#		chmod 755 $(DESTDIR)$(BINDIR)/ncc ; \
-+#	fi
- 
- clean:
- 	cd testsuite && $(MAKE) clean
-diff -urNad --exclude=CVS --exclude=.svn ./tools/cs2n/Makefile /tmp/dpep-work.fytnkW/nemerle-0.3.2/tools/cs2n/Makefile
---- ./tools/cs2n/Makefile	2005-05-02 20:37:58.000000000 +0200
-+++ /tmp/dpep-work.fytnkW/nemerle-0.3.2/tools/cs2n/Makefile	2005-07-24 21:26:59.386496000 +0200
-@@ -108,11 +108,11 @@
- 	$(Q)$(GACUTIL_COMMAND) antlr.runtime.dll
- 	$(INST) "[$(BINDIR)]" cs2n.exe
- 	$(Q)$(INSTALL) -m 755 cs2n.exe $(DESTDIR)$(BINDIR)/cs2n.exe
--	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
--		echo "#!/bin/sh" > $(DESTDIR)$(BINDIR)/cs2n && \
--		echo '$(NET_ENGINE) $(BINDIR)/cs2n.exe "$$@"' >> $(DESTDIR)$(BINDIR)/cs2n ; \
--		chmod 755 $(DESTDIR)$(BINDIR)/cs2n ; \
--	fi
-+#	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
-+#		echo "#!/bin/sh" > $(DESTDIR)$(BINDIR)/cs2n && \
-+#		echo '$(NET_ENGINE) $(BINDIR)/cs2n.exe "$$@"' >> $(DESTDIR)$(BINDIR)/cs2n ; \
-+#		chmod 755 $(DESTDIR)$(BINDIR)/cs2n ; \
-+#	fi
- 
- uninstall:
- 	$(RM) Nemerle.CSharp
-diff -urNad --exclude=CVS --exclude=.svn ./tools/nemerlish/Makefile /tmp/dpep-work.fytnkW/nemerle-0.3.2/tools/nemerlish/Makefile
---- ./tools/nemerlish/Makefile	2005-06-01 11:01:18.000000000 +0200
-+++ /tmp/dpep-work.fytnkW/nemerle-0.3.2/tools/nemerlish/Makefile	2005-07-24 21:26:33.503430824 +0200
-@@ -27,11 +27,11 @@
- 	$(INST) "[$(BINDIR)]" nemish.exe
- 	$(Q)$(INSTALL) -m 755 nemish.exe $(DESTDIR)$(BINDIR)/nemish.exe
- # Set a `nemish' script if binfmt_misc is not available.
--	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
--		echo "#!/bin/sh" > $(DESTDIR)$(BINDIR)/nemish && \
--		echo '$(NET_ENGINE) $(BINDIR)/nemish.exe "$$@"' >> $(DESTDIR)$(BINDIR)/nemish ; \
--		chmod 755 $(DESTDIR)$(BINDIR)/nemish ; \
--	fi
-+#	$(Q)if [ "$(NET_ENGINE)" != "" ] ; then \
-+#		echo "#!/bin/sh" > $(DESTDIR)$(BINDIR)/nemish && \
-+#		echo '$(NET_ENGINE) $(BINDIR)/nemish.exe "$$@"' >> $(DESTDIR)$(BINDIR)/nemish ; \
-+#		chmod 755 $(DESTDIR)$(BINDIR)/nemish ; \
-+#	fi
- 
- 
- uninstall:

Modified: non-group/nemerle/trunk/debian/rules
===================================================================
--- non-group/nemerle/trunk/debian/rules	2005-11-03 17:17:25 UTC (rev 2102)
+++ non-group/nemerle/trunk/debian/rules	2005-11-05 00:27:00 UTC (rev 2103)
@@ -7,6 +7,9 @@
 # This is for the .wapi directory for Mono.
 export MONO_SHARED_DIR=$(CURDIR)
 
+UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
+NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
+
 # provide patch and unpatch targets
 include /usr/share/dpatch/dpatch.make
 
@@ -53,7 +56,7 @@
 	dh_installemacsen
 	dh_compress
 	dh_fixperms
-	dh_makeclilibs -V
+	dh_makeclilibs -m $(UPVERSION) -l $(NEXT_UPVERSION)
 	dh_clideps
 	dh_installdeb
 	dh_gencontrol

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