[Pkg-haskell-commits] darcs: haskell-devscripts: Parse cabal files more liberaly in hlibrary.mk

[Joachim Breitner]

Sat Feb 20 18:54:25 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Parse cabal files more liberaly in hlibrary.mk 
  Ignore-this: 19f7641c7590d0885b1b0d8c29a6ce15

    M! ./debian/changelog -36 +6
    M! ./hlibrary.mk -2 +2

Sat Feb 20 18:54:25 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Parse cabal files more liberaly in hlibrary.mk 
  Ignore-this: 19f7641c7590d0885b1b0d8c29a6ce15
diff -rN -u old-haskell-devscripts/debian/changelog new-haskell-devscripts/debian/changelog
--- old-haskell-devscripts/debian/changelog	2010-04-05 09:57:23.621927709 +0000
+++ new-haskell-devscripts/debian/changelog	2010-04-05 09:57:23.629928146 +0000
@@ -1,33 +1,3 @@
-haskell-devscripts (0.7.7) unstable; urgency=low
-
-  * Fix "Haskell cleanup fails if optional hlibrary.setup is missing"
-    changing the way the shell conditional is done.  Thanks to Jonas
-    Smedegaard <dr at jones.dk>. (Closes: #576447)
-
- -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Sun, 04 Apr 2010 22:36:51 -0300
-
-haskell-devscripts (0.7.6) unstable; urgency=low
-
-  * Remove Dh_Haskell.pm.
-  * source/format: Use 3.0 (native).
-  * Fix "GREP_OPTIONS breaks build" cleaning GREP_OPTIONS in hlibrary.mk
-    (Closes: #573925)
-  * Move DEB_BUILD_DEPENDENCIES = build-arch to hlibrary.mk, instead of
-    all packages debian/rules.
-  * Fix "hlibrary.mk should do cleanup" by including Setup clean in the
-    clean:: target of hlibrary.mk.  (Closes: #575128)
-
- -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Tue, 30 Mar 2010 21:06:16 -0300
-
-haskell-devscripts (0.7.5) unstable; urgency=low
-
-  * hlibrary.mk: Create HASKELL_HIDE_PACKAGES variable, to make it
-    possible to create packages hidden by default.
-  * hlibrary.mk: Include package.conf file in md5sums, since it doesn't
-    change.
-
- -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Tue, 09 Mar 2010 21:37:30 -0300
-
 haskell-devscripts (0.7.4) unstable; urgency=low
 
   * Prevent building of packages with ghc6 << 6.12.1-10 
diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
--- old-haskell-devscripts/hlibrary.mk	2010-04-05 09:57:23.589925961 +0000
+++ new-haskell-devscripts/hlibrary.mk	2010-04-05 09:57:23.625927928 +0000
@@ -21,9 +21,9 @@
 
 DEB_CABAL_PACKAGE ?= $(shell cat *.cabal |\
  perl -ne \
- 'if (/^name\s*:\s*(.*)$$/i) {$$_ = $$1; tr/A-Z/a-z/; print; exit 0;}')
+ 'if (/^name\s*:\s*(.*?)\s*$$/i) {$$_ = $$1; tr/A-Z/a-z/; print; exit 0;}')
 CABAL_PACKAGE=$(DEB_CABAL_PACKAGE)
-CABAL_VERSION=$(shell cat *.cabal | egrep -i '^\s*version:' | head -n1 | sed -r 's,^\s*version:\s*,,i')
+CABAL_VERSION=$(shell cat *.cabal | egrep -i '^\s*version:' | head -n1 | sed -r 's,^\s*version:\s*,,i'| sed -r 's,\s*$$,,i')
 
 ENABLE_PROFILING = $(shell egrep -qe '^Package: libghc6-.*-prof$$' debian/control && echo --enable-library-profiling; exit 0)