[Pkg-haskell-commits] r755 - in /packages: haskell-edison/trunk/debian/changelog haskell-edison/trunk/debian/rules haskell-src-exts/trunk/debian/rules

[arjan at users.alioth.debian.org]

Author: arjan
Date: Fri Jun 22 22:09:15 2007
New Revision: 755

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=755
Log:
  * debian/rules: 
    - Make the determination of package names and versions more robust.

Modified:
    packages/haskell-edison/trunk/debian/changelog
    packages/haskell-edison/trunk/debian/rules
    packages/haskell-src-exts/trunk/debian/rules

Modified: packages/haskell-edison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/changelog?rev=755&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/changelog (original)
+++ packages/haskell-edison/trunk/debian/changelog Fri Jun 22 22:09:15 2007
@@ -1,3 +1,10 @@
+haskell-edison (1.2.1-5~pre1) unstable; urgency=low
+
+  * debian/rules: 
+    - Make the determination of package names and versions more robust.
+
+ -- Arjan Oosting <arjan at debian.org>  Fri, 22 Jun 2007 22:36:03 +0100
+
 haskell-edison (1.2.1-4) unstable; urgency=low
 
   * debian/control:

Modified: packages/haskell-edison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-edison/trunk/debian/rules?rev=755&op=diff
==============================================================================
--- packages/haskell-edison/trunk/debian/rules (original)
+++ packages/haskell-edison/trunk/debian/rules Fri Jun 22 22:09:15 2007
@@ -52,8 +52,8 @@
 	for d in $(EDISON_DIRS) ; do \
 	    cd "$(CURDIR)/$$d" && \
 	    "$(CURDIR)/debian/ghc6" --make Setup.hs -o setup -package Cabal && \
-	    name=`grep "Name:" *.cabal | sed "s|.* \(.*\)|\1|"` && \
-	    vers=`grep "Version:" *.cabal | sed "s|.* \(.*\)|\1|"` && \
+	    name=`grep "Name:" *.cabal | sed "s|Name:[ \t]*\(.*\)|\1|"` && \
+	    vers=`grep "Version:" *.cabal | sed "s|Version:[ \t]*\(.*\)|\1|"` && \
 	    sed -e "s|@LIBRARY@|$$name|g" -e "s|@VERSION@|$$vers|g" \
 		"$(CURDIR)/debian/postinst.in" > \
 		"$(CURDIR)/debian/libghc6-$$d-dev.postinst" && \

Modified: packages/haskell-src-exts/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/rules?rev=755&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/debian/rules (original)
+++ packages/haskell-src-exts/trunk/debian/rules Fri Jun 22 22:09:15 2007
@@ -53,8 +53,8 @@
 	for d in $(MODULES) ; do \
 	    cd "$(CURDIR)/src/$$d" && \
 	    "$(CURDIR)/debian/ghc6" --make Setup.hs -o setup -package Cabal && \
-	    name=`grep "Name:" *.cabal | sed "s|.* \(.*\)|\1|"` && \
-	    vers=`grep "Version:" *.cabal | sed "s|.* \(.*\)|\1|"` && \
+	    name=`grep "Name:" *.cabal | sed "s|Name:[ \t]*\(.*\)|\1|"` && \
+	    vers=`grep "Version:" *.cabal | sed "s|Version:[ \t]*\(.*\)|\1|"` && \
 	    sed -e "s|@LIBRARY@|$$name|g" -e "s|@VERSION@|$$vers|g" \
 		"$(CURDIR)/debian/postinst.in" > \
 		"$(CURDIR)/debian/libghc6-$$d-dev.postinst" && \
@@ -62,6 +62,8 @@
 		"$(CURDIR)/debian/prerm.in" > \
 		"$(CURDIR)/debian/libghc6-$$d-dev.prerm" ; \
 	done
+	mv debian/libghc6-haskell-src-exts-dev.postinst debian/libghc6-src-exts-dev.postinst
+	mv debian/libghc6-haskell-src-exts-dev.prerm debian/libghc6-src-exts-dev.prerm
 	cd src/trhsx && "$(CURDIR)/debian/ghc6" --make Setup.hs -o setup -package Cabal
 	touch configure-stamp
 
@@ -127,10 +129,8 @@
 	    done && \
 	    find "$(CURDIR)/debian/libghc6-$$d-dev/usr/" -empty -type d -delete ; \
 	done
+	mv debian/libghc6-haskell-src-exts-dev/* debian/libghc6-src-exts-dev/ 
 	cd src/trhsx && ./setup copy --destdir="$(CURDIR)/debian/libghc6-harp-dev/"
-	mv debian/libghc6-haskell-src-exts-dev.postinst debian/libghc6-src-exts-dev.postinst
-	mv debian/libghc6-haskell-src-exts-dev.prerm debian/libghc6-src-exts-dev.prerm
-	mv debian/libghc6-haskell-src-exts-dev/* debian/libghc6-src-exts-dev/ 
 	dh_install -s
 
 install-indep: build-indep-stamp