[Pkg-haskell-commits] r714 - in /packages/haxml/branches/stable/debian: changelog control mk-haskell-depends patches/00list

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Mon May 28 12:43:17 UTC 2007 

Author: arjan
Date: Mon May 28 12:43:17 2007
New Revision: 714

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=714
Log:
 r1951 at nebula:  arjan | 2007-05-28 13:50:11 +0200
   - Add doc-base to the Recommends of haxml-doc.
 * debian/mk-haskell-depends:
   - Small cleanups.
 * Generate links to other API documentation packages:
   - debian/control:
     + Add libghc6-base-doc and libghc6-haskell98-doc to the
       Build-Depends-Indep so haddock can link to names in other
       packages.
     + Add libghc6-base-doc and libghc6-haskell98-doc to the Recommends
       of haskell-http-doc. 
  - debian/patches/09_link-to-other-docs.dpatch
     + Add the appropriate --use-package options so haddock will link to
       names in other packages.

Modified:
    packages/haxml/branches/stable/debian/changelog
    packages/haxml/branches/stable/debian/control
    packages/haxml/branches/stable/debian/mk-haskell-depends
    packages/haxml/branches/stable/debian/patches/00list

Modified: packages/haxml/branches/stable/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/changelog?rev=714&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/changelog (original)
+++ packages/haxml/branches/stable/debian/changelog Mon May 28 12:43:17 2007
@@ -3,8 +3,21 @@
   * debian/control:
     - Adjust Xs-Vcs-* fields as the package has moved to the pkg-haskell
       repository on svn.debian.org.	
-
- -- Arjan Oosting <arjan at debian.org>  Sun, 13 May 2007 14:26:48 +0200
+    - Add doc-base to the Recommends of haxml-doc.
+  * debian/mk-haskell-depends:
+    - Small cleanups.
+  * Generate links to other API documentation packages:
+    - debian/control:
+      + Add libghc6-base-doc and libghc6-haskell98-doc to the
+        Build-Depends-Indep so haddock can link to names in other
+        packages.
+      + Add libghc6-base-doc and libghc6-haskell98-doc to the Recommends
+        of haskell-http-doc. 
+   - debian/patches/09_link-to-other-docs.dpatch
+      + Add the appropriate --use-package options so haddock will link to
+        names in other packages.
+
+ -- Arjan Oosting <arjan at debian.org>  Mon, 28 May 2007 13:40:29 +0200
 
 haxml (1.13.2-6) unstable; urgency=low
 

Modified: packages/haxml/branches/stable/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/control?rev=714&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/control (original)
+++ packages/haxml/branches/stable/debian/control Mon May 28 12:43:17 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Arjan Oosting <arjan at debian.org>
 Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6, ghc6-prof, html2text
-Build-Depends-Indep: haddock, hugs
+Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haxml
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml
@@ -67,7 +67,7 @@
 Package: haxml-doc
 Section: doc
 Architecture: all
-Recommends: ghc6-doc
+Recommends: doc-base, libghc6-base-doc, libghc6-haskell98-doc
 Description: documentation of HaXml
  HaXml is a collection of utilities for parsing, filtering,
  transforming, and generating XML documents using Haskell. Its basic

Modified: packages/haxml/branches/stable/debian/mk-haskell-depends
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/mk-haskell-depends?rev=714&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/mk-haskell-depends (original)
+++ packages/haxml/branches/stable/debian/mk-haskell-depends Mon May 28 12:43:17 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/haxml/branches/stable/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/patches/00list?rev=714&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/patches/00list (original)
+++ packages/haxml/branches/stable/debian/patches/00list Mon May 28 12:43:17 2007
@@ -6,3 +6,4 @@
 05_no-harch-cmd
 06_hcflags-support
 08_update-licences
+09_link-to-other-docs

More information about the Pkg-haskell-commits mailing list