[Pkg-haskell-commits] r716 - in /packages/haxml/branches/stable/debian: changelog control libhugs-haxml.postrm.in libhugs-haxml.preinst.in rules
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Mon May 28 14:43:10 UTC 2007
Author: arjan
Date: Mon May 28 14:43:09 2007
New Revision: 716
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=716
Log:
r1955 at nebula: arjan | 2007-05-28 15:17:15 +0200
* Build against GHC 6.4.1 (Closes: #426074)
* Stop using diversions to install libhugs-haxml as Hugs is modularly
packaged now:
- debian/libhugs-haxml.{postrm,preinst}.in: removed.
- debian/control:
+ Add a versioned dependency on the first modular hugs version.
- debian/rules:
+ Remove the diversion magic.
Removed:
packages/haxml/branches/stable/debian/libhugs-haxml.postrm.in
packages/haxml/branches/stable/debian/libhugs-haxml.preinst.in
Modified:
packages/haxml/branches/stable/debian/changelog
packages/haxml/branches/stable/debian/control
packages/haxml/branches/stable/debian/rules
Modified: packages/haxml/branches/stable/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/changelog?rev=716&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/changelog (original)
+++ packages/haxml/branches/stable/debian/changelog Mon May 28 14:43:09 2007
@@ -1,5 +1,6 @@
-haxml (1.13.2-7~pre1) unstable; urgency=low
-
+haxml (1.13.2-7~pre2) unstable; urgency=low
+
+ * Build against GHC 6.4.1 (Closes: #426074)
* debian/control:
- Adjust Xs-Vcs-* fields as the package has moved to the pkg-haskell
repository on svn.debian.org.
@@ -16,8 +17,15 @@
- 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
+ * Stop using diversions to install libhugs-haxml as Hugs is modularly
+ packaged now:
+ - debian/libhugs-haxml.{postrm,preinst}.in: removed.
+ - debian/control:
+ + Add a versioned dependency on the first modular hugs version.
+ - debian/rules:
+ + Remove the diversion magic.
+
+ -- Arjan Oosting <arjan at debian.org> Mon, 28 May 2007 14:38:42 +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=716&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/control (original)
+++ packages/haxml/branches/stable/debian/control Mon May 28 14:43:09 2007
@@ -47,7 +47,9 @@
Package: libhugs-haxml
Architecture: all
-Depends: hugs
+Depends: hugs (>= 98.200609.21-1)
+Conflicts: libhugs-haxml
+Replaces: lihugs-haxml
Suggests: haxml-doc (= ${source:Version}), haxml (>= ${source:Version}), drift
Description: GHC6 libraries for using XML documents with Haskell
HaXml is a collection of utilities for parsing, filtering,
Modified: packages/haxml/branches/stable/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/rules?rev=716&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/rules (original)
+++ packages/haxml/branches/stable/debian/rules Mon May 28 14:43:09 2007
@@ -33,31 +33,6 @@
PKG_CABAL := $(shell if ghc-pkg6 list > /dev/null 2>&1; then (echo yes) ; else (echo no) ; fi)
PKG_CONFIG := debian/libghc6-haxml-dev/$(GHC6_LIBDIR)/package.conflets/HaXml.package.conf
-FILES = \
- Text/ParserCombinators/HuttonMeijerWallace.hs \
- Text/XML/HaXml/DtdToHaskell/Convert.hs \
- Text/XML/HaXml/DtdToHaskell/Instance.hs \
- Text/XML/HaXml/DtdToHaskell/TypeDef.hs \
- Text/XML/HaXml/Combinators.hs \
- Text/XML/HaXml/Html/Generate.hs \
- Text/XML/HaXml/Html/Parse.hs \
- Text/XML/HaXml/Html/Pretty.hs \
- Text/XML/HaXml/Escape.hs \
- Text/XML/HaXml/Haskell2Xml.hs \
- Text/XML/HaXml/Xtract/Combinators.hs \
- Text/XML/HaXml/Xtract/Lex.hs \
- Text/XML/HaXml/Xtract/Parse.hs \
- Text/XML/HaXml/Lex.hs \
- Text/XML/HaXml/OneOfN.hs \
- Text/XML/HaXml/Parse.hs \
- Text/XML/HaXml/Pretty.hs \
- Text/XML/HaXml/Types.hs \
- Text/XML/HaXml/Validate.hs \
- Text/XML/HaXml/Verbatim.hs \
- Text/XML/HaXml/Wrappers.hs \
- Text/XML/HaXml/Xml2Haskell.hs \
- Text/XML/HaXml.hs
-
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
@@ -65,12 +40,6 @@
sed -e 's%@GHC6_LIBDIR@%$(GHC6_LIBDIR)%g' \
debian/libghc6-haxml-dev.install.in > \
debian/libghc6-haxml-dev.install
- sed -e 's%@FILES@%$(FILES)%g' \
- debian/libhugs-haxml.preinst.in > \
- debian/libhugs-haxml.preinst
- sed -e 's%@FILES@%$(FILES)%g' \
- debian/libhugs-haxml.postrm.in > \
- debian/libhugs-haxml.postrm
# configure script is not generated by autoconf,
# --build and --host are not supported/needed.
./configure --prefix=/usr/bin
@@ -97,8 +66,6 @@
rm -rf obj docs/HaXml
rm -f changelog \
debian/libghc6-haxml-dev.install \
- debian/libhugs-haxml.preinst \
- debian/libhugs-haxml.postrm
dh_clean
install: build-arch-stamp
More information about the Pkg-haskell-commits
mailing list