[Pkg-haskell-commits] r719 - in /packages/haxml/trunk/debian: changelog control mk-haskell-depends patches/00list patches/10_link-to-other-docs.dpatch
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Mon May 28 15:04:20 UTC 2007
Author: arjan
Date: Mon May 28 15:04:19 2007
New Revision: 719
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=719
Log:
r1961 at nebula: arjan | 2007-05-28 17:03:38 +0200
repository on svn.debian.org.
- 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/10_link-to-other-docs.dpatch
+ Add the appropriate --use-package options so haddock will link to
names in other packages.
Added:
packages/haxml/trunk/debian/patches/10_link-to-other-docs.dpatch (with props)
Modified:
packages/haxml/trunk/debian/changelog
packages/haxml/trunk/debian/control
packages/haxml/trunk/debian/mk-haskell-depends
packages/haxml/trunk/debian/patches/00list
Modified: packages/haxml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/trunk/debian/changelog?rev=719&op=diff
==============================================================================
--- packages/haxml/trunk/debian/changelog (original)
+++ packages/haxml/trunk/debian/changelog Mon May 28 15:04:19 2007
@@ -2,9 +2,22 @@
* 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:20:30 +0200
+ repository on svn.debian.org.
+ - 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/10_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 16:55:09 +0200
haxml (1.17-4) experimental; urgency=low
Modified: packages/haxml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/trunk/debian/control?rev=719&op=diff
==============================================================================
--- packages/haxml/trunk/debian/control (original)
+++ packages/haxml/trunk/debian/control Mon May 28 15:04:19 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Arjan Oosting <arjan at debian.org>
Build-Depends: dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6, ghc6-prof, html2text
-Build-Depends-Indep: haddock (>= 0.8-1), hugs
+Build-Depends-Indep: haddock (>= 0.8-1), 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
@@ -68,7 +68,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/trunk/debian/mk-haskell-depends
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/trunk/debian/mk-haskell-depends?rev=719&op=diff
==============================================================================
--- packages/haxml/trunk/debian/mk-haskell-depends (original)
+++ packages/haxml/trunk/debian/mk-haskell-depends Mon May 28 15:04:19 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/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/trunk/debian/patches/00list?rev=719&op=diff
==============================================================================
--- packages/haxml/trunk/debian/patches/00list (original)
+++ packages/haxml/trunk/debian/patches/00list Mon May 28 15:04:19 2007
@@ -7,4 +7,5 @@
07_no-hscolour-cmd
08_update-licences
09_fix-lexical-error
+10_link-to-other-docs
11_haddock-typo
Added: packages/haxml/trunk/debian/patches/10_link-to-other-docs.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/trunk/debian/patches/10_link-to-other-docs.dpatch?rev=719&op=file
==============================================================================
--- packages/haxml/trunk/debian/patches/10_link-to-other-docs.dpatch (added)
+++ packages/haxml/trunk/debian/patches/10_link-to-other-docs.dpatch Mon May 28 15:04:19 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_link-to-other-docs.dpatch by Arjan Oosting <arjan at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add the appropriate --use-package options so haddock will link to
+## DP: names in other packages.
+
+ at DPATCH@
+diff -urNad haxml~/Makefile haxml/Makefile
+--- haxml~/Makefile 2007-05-28 16:51:57.000000000 +0200
++++ haxml/Makefile 2007-05-28 16:52:36.000000000 +0200
+@@ -104,6 +104,7 @@
+ haddock --html --title=HaXml --odir=docs/HaXml --package=HaXml \
+ --source-module="src/%{MODULE/.//}.html" \
+ --source-entity="src/%{MODULE/.//}.html#%{NAME}" \
++ --use-package=base --use-package=haskell98 \
+ $(patsubst %, %.uncpp, $(SRCS))
+ rm -f $(patsubst %, %.uncpp, $(SRCS))
+
Propchange: packages/haxml/trunk/debian/patches/10_link-to-other-docs.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-haskell-commits
mailing list