[Pkg-haskell-commits] r704 - in /packages/haskell-http/trunk/debian: changelog control mk-haskell-depends rules

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Mon May 28 03:37:46 UTC 2007 

Author: arjan
Date: Mon May 28 03:37:46 2007
New Revision: 704

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=704
Log:
 r1931 at nebula:  arjan | 2007-05-28 05:23:46 +0200
   - Add the missing (build) dependencies on lib*parsec-* packages.
 * debian/{mk-haskell-depends,rules}:
   - Small cleanups.
 * Generate links to other API documentation packages:
   - debian/control:
     + Add libghc6-base-doc, libghc6-network-doc and libghc6-parsec-doc
       to the Build-Depends-Indep so haddock can link to names in other
       packages.
     + Add libghc6-base-doc, libghc6-network-doc and libghc5-parsec-doc
       to the Recommends of haskell-http-doc.
 

Modified:
    packages/haskell-http/trunk/debian/changelog
    packages/haskell-http/trunk/debian/control
    packages/haskell-http/trunk/debian/mk-haskell-depends
    packages/haskell-http/trunk/debian/rules

Modified: packages/haskell-http/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/changelog?rev=704&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/changelog (original)
+++ packages/haskell-http/trunk/debian/changelog Mon May 28 03:37:46 2007
@@ -3,8 +3,18 @@
   * debian/control:
     - Update XS-Vcs-* fields as the packages has moved to the pkg-haskell
       subversion archive.
-
- -- Arjan Oosting <arjan at debian.org>  Fri, 11 May 2007 14:28:30 +0200
+    - Add the missing (build) dependencies on lib*parsec-* packages.
+  * debian/{mk-haskell-depends,rules}:
+    - Small cleanups.
+  * Generate links to other API documentation packages:
+    - debian/control:
+      + Add libghc6-base-doc, libghc6-network-doc and libghc6-parsec-doc
+        to the Build-Depends-Indep so haddock can link to names in other
+        packages.
+      + Add libghc6-base-doc, libghc6-network-doc and libghc5-parsec-doc
+        to the Recommends of haskell-http-doc.
+  
+ -- Arjan Oosting <arjan at debian.org>  Mon, 28 May 2007 04:47:52 +0200
 
 haskell-http (20060707-4) unstable; urgency=low
 

Modified: packages/haskell-http/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/control?rev=704&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/control (original)
+++ packages/haskell-http/trunk/debian/control Mon May 28 03:37:46 2007
@@ -3,8 +3,12 @@
 Section: net
 Maintainer: Arjan Oosting <arjan at debian.org>
 Build-Depends: dctrl-tools, dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), dpatch, 
- haskell-devscripts (>= 0.5.6), ghc6 (>= 6.4.2), libghc6-network-dev
-Build-Depends-Indep: haddock, hugs, libhugs-network | hugs (<< 98.200609.21)
+ haskell-devscripts (>= 0.5.6), ghc6 (>= 6.4.2), libghc6-network-dev,
+ libghc6-parsec-dev 
+Build-Depends-Indep: haddock, hugs, 
+ libhugs-network | hugs (<< 98.200609.21),
+ libhugs-parsec  | hugs (<< 98.200609.21),
+ libghc6-base-doc, libghc6-network-doc, libghc6-parsec-doc
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-http
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http
@@ -24,7 +28,8 @@
 Package: libhugs-http
 Section: devel
 Architecture: all
-Depends: ${haskell:Depends}, libhugs-network | hugs (<< 98.200609.21), ${misc:Depends}
+Depends: ${haskell:Depends}, libhugs-network | hugs (<< 98.200609.21),
+ libhugs-parsec | hugs (<< 98.200609.21), ${misc:Depends}
 Suggests: haskell-http-doc (= ${source:Version})
 Description: Hugs libraries for the Haskell HTTP client library
  HTTP is a set of Haskell client libraries for HTTP/1.0 and HTTP/1.1.
@@ -37,7 +42,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: doc-base
+Recommends: doc-base, libghc6-base-doc, libghc6-network-doc, libghc6-parsec-doc
 Description: Haskell HTTP client library documentation
  HTTP is a set of Haskell client libraries for HTTP/1.0 and HTTP/1.1.
  .

Modified: packages/haskell-http/trunk/debian/mk-haskell-depends
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/mk-haskell-depends?rev=704&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/mk-haskell-depends (original)
+++ packages/haskell-http/trunk/debian/mk-haskell-depends Mon May 28 03:37:46 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/haskell-http/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/rules?rev=704&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/rules (original)
+++ packages/haskell-http/trunk/debian/rules Mon May 28 03:37:46 2007
@@ -23,10 +23,10 @@
 	dh_clean -k -s
 	dh_installdirs -s
 	dh_haskell -s
-	[ ! -d debian/libghc6-http-dev/usr/lib/haskell-packages/ghc6/bin ] || \
-	  rmdir debian/libghc6-http-dev/usr/lib/haskell-packages/ghc6/bin
+	find "$(CURDIR)/debian/libghc6-http-dev/usr/lib/haskell-packages/" -empty -type d -delete
 	sed -i -e "s%haddock-interfaces:.*%haddock-interfaces: /usr/share/doc/haskell-http-doc/html/HTTP.haddock%" \
 	    -e "s%haddock-html: .*%haddock-html: /usr/share/doc/haskell-http-doc/html%" \
+	    -e "s%include-dirs: .*%include-dirs:%" \
 	    debian/libghc6-http-dev/usr/lib/haskell-packages/ghc6/lib/*/installed-pkg-config
 	dh_install -s

More information about the Pkg-haskell-commits mailing list