[Pkg-haskell-commits] r727 - in /packages/hat/trunk/debian: changelog control mk-haskell-depends patches/00list patches/17_fix-ghcsym-detection.dpatch

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Mon May 28 17:50:09 UTC 2007 

Author: arjan
Date: Mon May 28 17:50:08 2007
New Revision: 727

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=727
Log:
 r1975 at nebula:  arjan | 2007-05-28 19:49:38 +0200
     repository on svn.debian.org.
   - Add libgch6-mtl-prof to the Build-Depends.
 * debian/{mk-haskell-depends,rules}:
   - Small cleanups.
 * debian/patches/17_fix-ghcsym-detection.dpatch: Added to fix the
   detection of the GHC version number.
 

Added:
    packages/hat/trunk/debian/patches/17_fix-ghcsym-detection.dpatch   (with props)
Modified:
    packages/hat/trunk/debian/changelog
    packages/hat/trunk/debian/control
    packages/hat/trunk/debian/mk-haskell-depends
    packages/hat/trunk/debian/patches/00list

Modified: packages/hat/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/changelog?rev=727&op=diff
==============================================================================
--- packages/hat/trunk/debian/changelog (original)
+++ packages/hat/trunk/debian/changelog Mon May 28 17:50:08 2007
@@ -2,8 +2,13 @@
 
   * debian/control:
     - Adjust Xs-Vcs-* fields as the package has moved to the pkg-haskell
-      repository on svn.debian.org.	
-
+      repository on svn.debian.org.
+    - Add libgch6-mtl-prof to the Build-Depends.
+  * debian/{mk-haskell-depends,rules}:
+    - Small cleanups.
+  * debian/patches/17_fix-ghcsym-detection.dpatch: Added to fix the
+    detection of the GHC version number.
+  
  -- Arjan Oosting <arjan at debian.org>  Sun, 13 May 2007 14:11:48 +0200
 
 hat (2.05+rerolled-2) unstable; urgency=low

Modified: packages/hat/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/control?rev=727&op=diff
==============================================================================
--- packages/hat/trunk/debian/control (original)
+++ packages/hat/trunk/debian/control Mon May 28 17:50:08 2007
@@ -6,7 +6,8 @@
 Standards-Version: 3.7.2
 Build-Depends: dctrl-tools, debhelper (>= 5), dpatch, 
  dpkg-dev (>= 1.13.19), libncurses5-dev, libglib1.2-dev, 
- hmake (>= 3.08-4), ghc6, ghc6-prof, sharutils, libghc6-mtl-dev
+ hmake (>= 3.08-4), ghc6, ghc6-prof, sharutils, libghc6-mtl-dev,
+ libghc6-mtl-prof
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/hat
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/hat
 

Modified: packages/hat/trunk/debian/mk-haskell-depends
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/mk-haskell-depends?rev=727&op=diff
==============================================================================
--- packages/hat/trunk/debian/mk-haskell-depends (original)
+++ packages/hat/trunk/debian/mk-haskell-depends Mon May 28 17:50:08 2007
@@ -63,29 +63,29 @@
 }
 
 dependency(){
-    local deb
+    local package
     local version
     local next_upstream_version
-    deb=$1
-    version=`dpkg-query --showformat='${Version}' -W $deb` 
+    package=$1
+    version=`dpkg-query --showformat='${Version}' -W $package` 
     next_upstream_version=`echo $version | sed -e 's/-[^-]*$/+/'`
-    echo "$deb (>= $version), $deb (<< $next_upstream_version)"
+    echo "$package (>= $version), $package (<< $next_upstream_version)"
 }
 
 dependencies(){
-    local deb
-    local debs
+    local package
+    local packages
     local deps
-    debs=$@
-    for deb in `sort_uniq $debs` ; do
-	deps="$deps, `dependency $deb`"
+    packages=$@
+    for package in `sort_uniq $packages` ; do
+	deps="$deps, `dependency $package`"
     done
 
     echo $deps | sed -e 's/^,[ ]*//'
 }
 
 providing_package_for_ghc6(){
-    local deb
+    local package
     local dep
     local dir
     local dirs
@@ -95,15 +95,15 @@
     lib=`ghc-pkg6 field $dep hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
     for dir in $dirs ; do
 	if [ -e "$dir/lib$lib.a" ] ; then
-	    deb=`dpkg-query -S $dir/lib$lib.a | cut -d':' -f 1` || exit $?
+	    package=`dpkg-query -S $dir/lib$lib.a | cut -d':' -f 1` || exit $?
 	    continue
 	fi
     done
-    echo $deb
+    echo $package
 }
 
 providing_package_for_ghc6_prof(){
-    local deb
+    local package
     local dep
     local dir
     local dirs
@@ -113,11 +113,11 @@
     lib=`ghc-pkg6 field $dep hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
     for dir in $dirs ; do
 	if [ -e "$dir/lib$lib_p.a" ] ; then
-	    deb=`dpkg-query -S $dir/lib$lib.a | cut -d':' -f 1` || exit $?
+	    package=`dpkg-query -S $dir/lib$lib.a | cut -d':' -f 1` || exit $?
 	    continue
 	fi
     done
-    echo $deb
+    echo $package
 }
 
 cabal_depends(){
@@ -145,22 +145,22 @@
 
 depends_for_ghc6(){
     local dep
-    local debs
+    local packages
     for dep in `cabal_depends $@` ; do
-	debs="$debs `providing_package_for_ghc6 $dep`"
+	packages="$packages `providing_package_for_ghc6 $dep`"
     done
  
-    dependencies $debs
+    dependencies $packages
 }
 
 depends_for_ghc6_prof(){
     local dep
-    local debs
+    local packages
     for dep in `cabal_depends $@` ; do
-	debs="$debs `providing_package_for_ghc6_prof $dep`"
+	packages="$packages `providing_package_for_ghc6_prof $dep`"
     done
  
-    dependencies $debs
+    dependencies $packages
 }
 
 find_config_for_ghc6(){

Modified: packages/hat/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/00list?rev=727&op=diff
==============================================================================
--- packages/hat/trunk/debian/patches/00list (original)
+++ packages/hat/trunk/debian/patches/00list Mon May 28 17:50:08 2007
@@ -3,6 +3,7 @@
 13_byteorder
 14_fix-manpage
 16_fix-buildflags
+17_fix-ghcsym-detection
 21_no-register
 22_configure-incx-flag
 23_debian-haskell-packages-path

Added: packages/hat/trunk/debian/patches/17_fix-ghcsym-detection.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/hat/trunk/debian/patches/17_fix-ghcsym-detection.dpatch?rev=727&op=file
==============================================================================
--- packages/hat/trunk/debian/patches/17_fix-ghcsym-detection.dpatch (added)
+++ packages/hat/trunk/debian/patches/17_fix-ghcsym-detection.dpatch Mon May 28 17:50:08 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_fix-ghcsym-detection.dpatch by Arjan Oosting <arjan at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad hat~/script/confhat hat/script/confhat
+--- hat~/script/confhat	2007-05-28 19:17:07.000000000 +0200
++++ hat/script/confhat	2007-05-28 19:23:07.000000000 +0200
+@@ -24,7 +24,7 @@
+   # discover ghc version (technique courtesy of Simon Marlow)
+   echo __GLASGOW_HASKELL__ >ghcsym.hs;
+   $COMP -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
+-  GHCSYM=`grep -v '^#' ghcsym.out | grep -v '^$'`
++  GHCSYM=`grep -v '^#' ghcsym.out | grep -v '^$' | grep -v '^{-'` 
+   rm -f ghcsym.hs ghcsym.out;
+ 
+ #  # discover ghc location
+diff -urNad hat~/script/confhc-hat hat/script/confhc-hat
+--- hat~/script/confhc-hat	2007-05-28 19:17:07.000000000 +0200
++++ hat/script/confhc-hat	2007-05-28 19:23:07.000000000 +0200
+@@ -56,7 +56,7 @@
+ ghcsym () {
+   echo __GLASGOW_HASKELL__ >ghcsym.hs;
+   $1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
+-  grep -v '^#' ghcsym.out | grep -v '^$' > $2
++  grep -v '^#' ghcsym.out | grep -v '^$' | grep -v '^{-' > $2
+   rm -f ghcsym.hs ghcsym.out;
+ }
+ 

Propchange: packages/hat/trunk/debian/patches/17_fix-ghcsym-detection.dpatch
------------------------------------------------------------------------------
    svn:executable = *

More information about the Pkg-haskell-commits mailing list