[Pkg-mono-svn-commits] rev 2146 - non-group/nemerle/trunk/debian

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-01-02 15:07:09 +0000 (Mon, 02 Jan 2006)
New Revision: 2146

Modified:
   non-group/nemerle/trunk/debian/control
   non-group/nemerle/trunk/debian/rules
Log:
* some minor nemerle cleanups


Modified: non-group/nemerle/trunk/debian/control
===================================================================
--- non-group/nemerle/trunk/debian/control	2006-01-02 13:06:16 UTC (rev 2145)
+++ non-group/nemerle/trunk/debian/control	2006-01-02 15:07:09 UTC (rev 2146)
@@ -8,7 +8,6 @@
 Package: nemerle
 Architecture: all
 Depends: ${cli:Depends}
-Suggests: emacsen
 Description: Nemerle Compiler
  Nemerle is a new functional language designed from the ground
  up for the .NET platform. Nemerle supports:

Modified: non-group/nemerle/trunk/debian/rules
===================================================================
--- non-group/nemerle/trunk/debian/rules	2006-01-02 13:06:16 UTC (rev 2145)
+++ non-group/nemerle/trunk/debian/rules	2006-01-02 15:07:09 UTC (rev 2146)
@@ -7,12 +7,12 @@
 # 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
 
+UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
+NEXT_MAJORVERSION = $(shell perl -e '$$_=pop; s/(\d+).\d+$$/$$1+1/e; print' $(UPVERSION))
+
 configure: configure-stamp
 configure-stamp:
 	./configure --prefix=/usr --bindir=/usr/lib/nemerle --mandir=/usr/share/man/man1
@@ -40,6 +40,8 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+	# workaround for weird mono dir (/usr/lib/pkgconfig/../../lib)
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	# fix permissions
 	find debian/tmp -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
@@ -56,7 +58,7 @@
 	dh_installemacsen
 	dh_compress
 	dh_fixperms
-	dh_makeclilibs -m $(UPVERSION) -l $(NEXT_UPVERSION)
+	dh_makeclilibs -m $(UPVERSION) -l $(NEXT_MAJORVERSION)
 	dh_clideps
 	dh_installdeb
 	dh_gencontrol