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

Sebastian Dröge slomo-guest at costa.debian.org
Mon Nov 7 14:03:41 UTC 2005 

Author: slomo-guest
Date: 2005-11-07 14:03:40 +0000 (Mon, 07 Nov 2005)
New Revision: 2108

Removed:
   non-group/nemerle/trunk/debian/patches/10_configuration.dpatch
   non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch
   non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch
Modified:
   non-group/nemerle/trunk/debian/nemerle.install
   non-group/nemerle/trunk/debian/patches/00list
   non-group/nemerle/trunk/debian/rules
Log:
* polished nemerle package


Modified: non-group/nemerle/trunk/debian/nemerle.install
===================================================================
--- non-group/nemerle/trunk/debian/nemerle.install	2005-11-07 12:18:37 UTC (rev 2107)
+++ non-group/nemerle/trunk/debian/nemerle.install	2005-11-07 14:03:40 UTC (rev 2108)
@@ -1,3 +1,6 @@
 debian/tmp/usr/share
-debian/tmp/usr/bin
 debian/tmp/usr/lib/nemerle
+debian/ncc /usr/bin
+debian/nemish /usr/bin
+debian/cs2n /usr/bin
+misc/nemerle.el /usr/share/emacs/site-lisp/nemerle

Modified: non-group/nemerle/trunk/debian/patches/00list
===================================================================
--- non-group/nemerle/trunk/debian/patches/00list	2005-11-07 12:18:37 UTC (rev 2107)
+++ non-group/nemerle/trunk/debian/patches/00list	2005-11-07 14:03:40 UTC (rev 2108)
@@ -1,3 +1 @@
-10_configuration.dpatch
-11_nemerle_pc.dpatch
-12_fix_scripts.dpatch
+10_fix-Makefiles.dpatch

Deleted: non-group/nemerle/trunk/debian/patches/10_configuration.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/10_configuration.dpatch	2005-11-07 12:18:37 UTC (rev 2107)
+++ non-group/nemerle/trunk/debian/patches/10_configuration.dpatch	2005-11-07 14:03:40 UTC (rev 2108)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_configuration.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 ./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.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.9
-+REVISION   = 1
-+SVN_REV    = 
-+
-+NET_ENGINE = mono
-+NET_VERSION = 1.1
-+NET_FLAGS  = 
-+DLL_PATH   = 
-+NGEN       = true
-+DASM       = monodis
-+ASM        = ilasm
-+CSC        = gmcs
-+PEVERIFY   = 
-+TIME       = 
-+ANTLR      = 
-+BROKEN_SWF = 1
-+
-+MONO_GACUTIL = yes
-+
-+NANT       = 
-+NANT_DIR   = 
-+
-+NEM_FLAGS  =  -def:BROKEN_SWF -bar+ -def:RUNTIME_MONO
-+
-+PYTHON  = false
-+XSPP    = false
-+XSLT    = false
-+
-+INSTALL = install
-+
-+prefix = /usr
-+BINDIR = /usr/lib/nemerle
-+MANDIR = /usr/share/man/man1
-+LIBDIR = /usr/lib
-+PKGCONFIGDIR = /usr/lib/pkgconfig
-+GACUTIL_COMMAND = gacutil -root $(DESTDIR)/usr/lib -package nemerle -i
-+GACUTIL_UNINSTALL_COMMAND = gacutil -root $(DESTDIR)/usr/lib -package nemerle -u
-+NGEN_GAC = true

Deleted: non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch	2005-11-07 12:18:37 UTC (rev 2107)
+++ non-group/nemerle/trunk/debian/patches/11_nemerle_pc.dpatch	2005-11-07 14:03:40 UTC (rev 2108)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_nemerle_pc.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 ./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.qUODxk/nemerle-0.9.0/nemerle.pc	2005-09-30 13:17:59.477918408 +0200
-@@ -0,0 +1,8 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=/usr/lib
-+
-+Name: Nemerle
-+Description: Nemerle - a .NET object-functional language
-+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

Deleted: non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch
===================================================================
--- non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch	2005-11-07 12:18:37 UTC (rev 2107)
+++ non-group/nemerle/trunk/debian/patches/12_fix_scripts.dpatch	2005-11-07 14:03:40 UTC (rev 2108)
@@ -1,63 +0,0 @@
-#! /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:

Modified: non-group/nemerle/trunk/debian/rules
===================================================================
--- non-group/nemerle/trunk/debian/rules	2005-11-07 12:18:37 UTC (rev 2107)
+++ non-group/nemerle/trunk/debian/rules	2005-11-07 14:03:40 UTC (rev 2108)
@@ -13,11 +13,15 @@
 # provide patch and unpatch targets
 include /usr/share/dpatch/dpatch.make
 
-# This is where we install Nemerle mode for Emacs.
-LISPDIR = /usr/share/emacs/site-lisp/nemerle
+configure: configure-stamp
+configure-stamp:
+	./configure --prefix=/usr --bindir=/usr/lib/nemerle --mandir=/usr/share/man/man1
+	touch configure-stamp
 
-build: patch-stamp
+build: patch-stamp configure-stamp build-stamp
+build-stamp:
 	$(MAKE)
+	touch build-stamp
 
 clean: unpatch
 	dh_testdir
@@ -26,8 +30,9 @@
 	rm -f tools/nemerlish/*.{dll,exe}
 	rm -f tools/nant-task/*.{dll,exe}
 	rm -f tools/cs2n/*.{dll,exe}
-	rm -f config.mak configure.log
+	rm -f config.mak nemerle.pc configure.log
 	rm -rf $(MONO_SHARED_DIR)/.wapi
+	rm -f build-stamp configure-stamp
 	dh_clean 
 
 install: build
@@ -36,12 +41,7 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	mkdir -p $(CURDIR)/debian/tmp$(LISPDIR)
-	install -m 755 $(CURDIR)/debian/ncc $(CURDIR)/debian/tmp/usr/bin/ncc
-	install -m 755 $(CURDIR)/debian/nemish $(CURDIR)/debian/tmp/usr/bin/nemish
-	install -m 755 $(CURDIR)/debian/cs2n $(CURDIR)/debian/tmp/usr/bin/cs2n
-	install -m 644 $(CURDIR)/misc/nemerle.el $(CURDIR)/debian/tmp$(LISPDIR)
+	# fix permissions
 	find debian/tmp -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
 	find debian/tmp -type f -name "*.exe" | xargs chmod +x
 
@@ -63,8 +63,8 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: build install
+binary-arch: configure build install
 
 binary: binary-indep binary-arch
 
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean configure binary-indep binary-arch binary install

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