[Pkg-haskell-commits] r1031 - in /packages/haxml/branches/stable/debian: changelog control haxml.dirs haxml.install libghc6-haxml-dev.install.in libghc6-haxml-dev.postinst libghc6-haxml-dev.prerm libhugs-haxml.install mk-haskell-depends patches/06_hcflags-support.dpatch rules
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Sun Jan 27 21:25:45 UTC 2008
Author: arjan
Date: Sun Jan 27 21:25:45 2008
New Revision: 1031
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1031
Log:
r2562 at nebula: arjan | 2008-01-27 21:44:08 +0100
>= 1.2 to build this package.
* Rewrite debian/rules to use haskell-devscripts and thus the Cabal
build system instead of the Makefile build system of HaXml:
- debian/control:
+ Add a build dependency on haskell-devscripts >= 0.6.7.
- debian/libghc6-haxml-dev.{install.in,postinst,prerm): removed
as the new debian/rules no longer needs them.
- debian/libhugs-haxml.install: removed.
- debian/mk-haskell-depends: removed.
- Correct the description of libhugs-haxml to talk about Hugs instead
of GHC6. (Closes: #458300)
- Change the section of libghc6-haxml-dev to fix lintian warning
dev-package-should-be-section-libdevel
- Bump Standards-Version to 3.7.3. No changes needed.
Added:
packages/haxml/branches/stable/debian/haxml.dirs
Removed:
packages/haxml/branches/stable/debian/libghc6-haxml-dev.install.in
packages/haxml/branches/stable/debian/libghc6-haxml-dev.postinst
packages/haxml/branches/stable/debian/libghc6-haxml-dev.prerm
packages/haxml/branches/stable/debian/libhugs-haxml.install
packages/haxml/branches/stable/debian/mk-haskell-depends
Modified:
packages/haxml/branches/stable/debian/changelog
packages/haxml/branches/stable/debian/control
packages/haxml/branches/stable/debian/haxml.install
packages/haxml/branches/stable/debian/patches/06_hcflags-support.dpatch
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=1031&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/changelog (original)
+++ packages/haxml/branches/stable/debian/changelog Sun Jan 27 21:25:45 2008
@@ -5,9 +5,22 @@
* Update for GHC 6.8.2:
- debian/control:
+ Bump build dependency on ghc to 6.8.2 as we need a Cabal version
- >= 1.2 to build this package
+ >= 1.2 to build this package.
+ * Rewrite debian/rules to use haskell-devscripts and thus the Cabal
+ build system instead of the Makefile build system of HaXml:
+ - debian/control:
+ + Add a build dependency on haskell-devscripts >= 0.6.7.
+ - debian/libghc6-haxml-dev.{install.in,postinst,prerm): removed
+ as the new debian/rules no longer needs them.
+ - debian/libhugs-haxml.install: removed.
+ - debian/mk-haskell-depends: removed.
* debian/control:
- Replace Xs-Vcs-* fields with now official Vcs-* fields.
+ - Correct the description of libhugs-haxml to talk about Hugs instead
+ of GHC6. (Closes: #458300)
+ - Change the section of libghc6-haxml-dev to fix lintian warning
+ dev-package-should-be-section-libdevel
+ - Bump Standards-Version to 3.7.3. No changes needed.
-- Arjan Oosting <arjan at debian.org> Sun, 27 Jan 2008 14:30:54 +0100
Modified: packages/haxml/branches/stable/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/control?rev=1031&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/control (original)
+++ packages/haxml/branches/stable/debian/control Sun Jan 27 21:25:45 2008
@@ -2,9 +2,9 @@
Section: devel
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 (>= 6.8.2), ghc6-prof, html2text
+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts (>= 0.6.7), html2text
Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haxml
Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml
Homepage: http://www.cs.york.ac.uk/fp/HaXml/
@@ -27,6 +27,7 @@
Package: libghc6-haxml-dev
Architecture: any
+Section: libdevel
Depends: ${haskell:Depends}
Suggests: haxml-doc (= ${source:Version}), haxml (= ${binary:Version}), drift
Description: GHC6 libraries for using XML documents with Haskell
@@ -48,7 +49,7 @@
Conflicts: libhugs-haxml
Replaces: lihugs-haxml
Suggests: haxml-doc (= ${source:Version}), haxml (>= ${source:Version}), drift
-Description: GHC6 libraries for using XML documents with Haskell
+Description: Hugs libraries for using XML documents with Haskell
HaXml is a collection of utilities for parsing, filtering,
transforming, and generating XML documents using Haskell. Its basic
facilities include:
Added: packages/haxml/branches/stable/debian/haxml.dirs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/haxml.dirs?rev=1031&op=file
==============================================================================
--- packages/haxml/branches/stable/debian/haxml.dirs (added)
+++ packages/haxml/branches/stable/debian/haxml.dirs Sun Jan 27 21:25:45 2008
@@ -1,0 +1,1 @@
+usr
Modified: packages/haxml/branches/stable/debian/haxml.install
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/haxml.install?rev=1031&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/haxml.install (original)
+++ packages/haxml/branches/stable/debian/haxml.install Sun Jan 27 21:25:45 2008
@@ -1,1 +1,1 @@
-debian/tmp/usr/bin
+
Modified: packages/haxml/branches/stable/debian/patches/06_hcflags-support.dpatch
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/patches/06_hcflags-support.dpatch?rev=1031&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/patches/06_hcflags-support.dpatch (original)
+++ packages/haxml/branches/stable/debian/patches/06_hcflags-support.dpatch Sun Jan 27 21:25:45 2008
@@ -6,15 +6,8 @@
@DPATCH@
diff -urNad haxml-stable~/src/Makefile haxml-stable/src/Makefile
---- haxml-stable~/src/Makefile 2006-10-20 18:17:05.000000000 +0200
-+++ haxml-stable/src/Makefile 2006-10-20 18:18:47.000000000 +0200
-@@ -1,5 +1,5 @@
- SOFTWARE = HaXml
--VERSION = 1.13.1
-+VERSION = 1.13.2
-
- LIBSRCS = \
- Text/XML/HaXml.hs Text/XML/HaXml/Combinators.hs Text/XML/HaXml/Lex.hs \
+--- haxml-stable~/src/Makefile 2008-01-27 14:43:23.000000000 +0100
++++ haxml-stable/src/Makefile 2008-01-27 14:43:23.000000000 +0100
@@ -38,12 +38,12 @@
# The caller *must* set the HC variable.
COMPILER := $(findstring ghc, $(HC))
Modified: packages/haxml/branches/stable/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml/branches/stable/debian/rules?rev=1031&op=diff
==============================================================================
--- packages/haxml/branches/stable/debian/rules (original)
+++ packages/haxml/branches/stable/debian/rules Sun Jan 27 21:25:45 2008
@@ -21,39 +21,32 @@
# Handle noopt in DEB_BUILD_OPTIONS
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- MAKE_ENVVARS := HCFLAGS=-O0
+ OPT_FLAG := --disable-optimization
else
- MAKE_ENVVARS := HCFLAGS=-O1
+ OPT_FLAG := --enable-optimization
endif
-
-GHC6_VERSION := $(shell /usr/bin/ghc6 --numeric-version)
-GHC6_LIBDIR := $(shell ghc6 --print-libdir)
-
-# Does ghc-pkg6 use cabal
-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
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
html2text -nobs docs/changelog.html > changelog
- sed -e 's%@GHC6_LIBDIR@%$(GHC6_LIBDIR)%g' \
- debian/libghc6-haxml-dev.install.in > \
- debian/libghc6-haxml-dev.install
- # configure script is not generated by autoconf,
- # --build and --host are not supported/needed.
- ./configure --prefix=/usr/bin
+ dh_haskell_configure
+ cd debian/tmp/build/libghc6-haxml-dev && \
+ ./setup configure --prefix=/usr/lib/haskell-packages/ghc6 --bindir=/usr/bin \
+ --with-compiler=/usr/bin/ghc6 --enable-library-profiling $(OPT_FLAG)
touch $@
build: build-arch
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
- $(MAKE_ENVVARS) $(MAKE)
+# $(MAKE_ENVVARS) $(MAKE)
+ dh_haskell_build -s
touch $@
build-indep: build-indep-stamp
build-indep-stamp: configure-stamp
+ dh_haskell_build -i
$(MAKE) haddock
touch $@
@@ -64,28 +57,27 @@
rm -f build-arch-stamp build-indep-stamp configure-stamp
$(MAKE) realclean
rm -rf obj docs/HaXml
- rm -f changelog debian/libghc6-haxml-dev.install
+ rm -f changelog Setup.hi Setup.o setup
dh_clean
-install: build-arch-stamp
+install: install-arch install-indep
+install-arch: build-arch-stamp
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install-filesonly DESTDIR=$(CURDIR)/debian/tmp
-ifneq (,$(findstring libghc6-haxml-dev,$(shell dh_listpackages -s)))
-ifeq (,$(findstring no,$(PKG_CABAL)))
- $(MAKE) -C obj/ghc HaXml.pkgconf
- install --mode=644 -D obj/ghc/HaXml.pkgconf $(PKG_CONFIG)
- # remove info about executables which makes ghc-pkg barf
- # and remove empty lines.
- sed -i -e "s/^[A-Z].*//g" -e "/^$$/d" $(PKG_CONFIG)
- # expose package
- echo "exposed: True" >> $(PKG_CONFIG)
-else
- install --mode=644 -D obj/ghc/pkg.conf $(PKG_CONFIG)
-endif
-endif
+ dh_clean -k -s -Xdebian/tmp
+ dh_installdirs -s
+ dh_haskell_install -s
+ mv -f debian/libghc6-haxml-dev/usr/bin/ debian/haxml/usr/
+
+install-indep: build-indep-stamp
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i -Xdebian/tmp
+ dh_installdirs -i
+ dh_haskell_install -i
+ rm -rf debian/libhugs-haxml/usr/share/doc/HaXml-*/
+ rm -rf debian/libhugs-haxml/usr/lib/hugs/programs/
+ rm -rf debian/libhugs-haxml/usr/bin/
install --mode=644 -D debian/libhugs-haxml.linda-overrides \
debian/libhugs-haxml/usr/share/linda/overrides/libhugs-haxml
install --mode=644 -D debian/haxml-doc.linda-overrides \
@@ -109,7 +101,7 @@
dh_fixperms
dh_makeshlibs
dh_installdeb
- sh -e debian/mk-haskell-depends $(PKG_CONFIG)
+ dh_haskell_depends
dh_shlibdeps
dh_gencontrol
dh_md5sums
@@ -124,4 +116,4 @@
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
binary: binary-arch binary-indep
-.PHONY: configure build build-arch build-indep clean clean-patched binary-indep binary-arch binary install
+.PHONY: configure build build-arch build-indep clean clean-patched binary-indep binary-arch binary install install-arch install-indep
More information about the Pkg-haskell-commits
mailing list