[Pkg-haskell-commits] r912 - in /packages/haskell-src-exts/trunk/debian: changelog control haskell-harp-doc.docs haskell-src-exts-doc.docs rules
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Tue Jan 8 20:54:31 UTC 2008
Author: arjan
Date: Tue Jan 8 20:54:30 2008
New Revision: 912
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=912
Log:
r2350 at nebula: arjan | 2008-01-08 21:54:01 +0100
* debian/control:
- Use the official Vcs-* fields.
- Add Homepage field.
- Remove dctrl-tools from the Build-Depends as the
debian/mk-haskell-depends script is removed.
- Add a versioned dependency on haskell-devscripts for
dh_haskell_depends.
- Bump Standard-Version to 3.7.3. No changes needed.
- Add some commented out binary stanzas for API documentation packages
we might want to build in the future.
* debian/{haskell-harp-doc,haskell-src-exts-doc}.docs: Added.
* debian/rules:
- Add some commented out code to generate API documentation. This does
not work yet, due some parse error haddock is having.
- Replace the call to debian/mk-haskell-depends with a call to
dh_haskell_depends from haskell-devscripts.
Added:
packages/haskell-src-exts/trunk/debian/haskell-harp-doc.docs
packages/haskell-src-exts/trunk/debian/haskell-src-exts-doc.docs
Modified:
packages/haskell-src-exts/trunk/debian/changelog
packages/haskell-src-exts/trunk/debian/control
packages/haskell-src-exts/trunk/debian/rules
Modified: packages/haskell-src-exts/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/changelog?rev=912&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/debian/changelog (original)
+++ packages/haskell-src-exts/trunk/debian/changelog Tue Jan 8 20:54:30 2008
@@ -1,3 +1,24 @@
+haskell-src-exts (0.2.1~darcs20070622-2~pre1) unstable; urgency=low
+
+ * debian/control:
+ - Use the official Vcs-* fields.
+ - Add Homepage field.
+ - Remove dctrl-tools from the Build-Depends as the
+ debian/mk-haskell-depends script is removed.
+ - Add a versioned dependency on haskell-devscripts for
+ dh_haskell_depends.
+ - Bump Standard-Version to 3.7.3. No changes needed.
+ - Add some commented out binary stanzas for API documentation packages
+ we might want to build in the future.
+ * debian/{haskell-harp-doc,haskell-src-exts-doc}.docs: Added.
+ * debian/rules:
+ - Add some commented out code to generate API documentation. This does
+ not work yet, due some parse error haddock is having.
+ - Replace the call to debian/mk-haskell-depends with a call to
+ dh_haskell_depends from haskell-devscripts.
+
+ -- Arjan Oosting <arjan at debian.org> Tue, 08 Jan 2008 21:49:23 +0100
+
haskell-src-exts (0.2.1~darcs20070622-1) unstable; urgency=low
* Built against GHC 6.6.1 (Closes: #429022)
Modified: packages/haskell-src-exts/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/control?rev=912&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/debian/control (original)
+++ packages/haskell-src-exts/trunk/debian/control Tue Jan 8 20:54:30 2008
@@ -3,15 +3,19 @@
Priority: optional
Maintainer: Florian Ragwitz <rafl at debian.org>
Uploaders: Arjan Oosting <arjan at debian.org>
-Build-Depends: dctrl-tools, debhelper (>= 4.0.0), ghc6 (>= 6.4.2), happy
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-src-exts
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts
+Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.4.2), happy,
+ haskell-devscripts (>= 0.6.0)
+# Build-Depends-Indep: haddock, ghc6-doc
+Standards-Version: 3.7.3
+Homepage: http://www.cs.chalmers.se/~d00nibro/haskell-src-exts/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-src-exts
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts
Package: libghc6-src-exts-dev
Architecture: any
Depends: ${haskell:Depends}, ${shlibs:Depends}
-Description: Haskell-Source with eXtensions
+Recommends: libghc6-harp-dev (= ${binary:Version})
+Description: Haskell-Source with eXtensions library for GHC6
haskell-src-exts (HSX, haskell-source with extensions) is an extension of the
standard haskell-src package, and handles most common syntactic extensions to
Haskell, including:
@@ -34,3 +38,31 @@
.
This package also contains trhsx, the desugaring pre-processor executable for
HaRP and HSP
+
+#Package: haskell-src-exts-doc
+#Architecture: all
+#Depends: ghc6-doc
+#Description: API documentation of the haskell-src-exts library
+#haskell-src-exts (HSX, haskell-source with extensions) is an extension of the
+#standard haskell-src package, and handles most common syntactic extensions to
+#Haskell, including:
+# * Multi-parameter type classes with functional dependencies
+# * Empty data declarations
+# * GADTs
+# * Implicit parameters (ghc and hugs style)
+# * Template Haskell (broken for 6.4, needs redoing)
+# .
+# This package contains the API documentation of the HSX library
+
+#Package: haskell-harp-doc
+#Architecture: all
+#Depends: ghc6-doc
+#Description: API documentation of the Haskell harp library
+# HaRP, or Haskell Regular Patterns, is a Haskell extension that extends the
+# normal pattern matching facility with the power of regular expressions. This
+# expressive power is highly useful in a wide range of areas, including text
+# parsing and XML processing. Regular expression patterns in HaRP work over
+# ordinary Haskell lists ([]) of arbitrary type. We have implemented HaRP as a
+# pre-processor to ordinary Haskell.
+# .
+# This package contains the API documentation of the HaRP library
Added: packages/haskell-src-exts/trunk/debian/haskell-harp-doc.docs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/haskell-harp-doc.docs?rev=912&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/haskell-harp-doc.docs (added)
+++ packages/haskell-src-exts/trunk/debian/haskell-harp-doc.docs Tue Jan 8 20:54:30 2008
@@ -1,0 +1,1 @@
+src/harp/dist/doc/html
Added: packages/haskell-src-exts/trunk/debian/haskell-src-exts-doc.docs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/haskell-src-exts-doc.docs?rev=912&op=file
==============================================================================
--- packages/haskell-src-exts/trunk/debian/haskell-src-exts-doc.docs (added)
+++ packages/haskell-src-exts/trunk/debian/haskell-src-exts-doc.docs Tue Jan 8 20:54:30 2008
@@ -1,0 +1,1 @@
+src/haskell-src-exts/dist/doc/html
Modified: packages/haskell-src-exts/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-src-exts/trunk/debian/rules?rev=912&op=diff
==============================================================================
--- packages/haskell-src-exts/trunk/debian/rules (original)
+++ packages/haskell-src-exts/trunk/debian/rules Tue Jan 8 20:54:30 2008
@@ -94,11 +94,13 @@
--with-hc-pkg="$(CURDIR)/debian/ghc-pkg6" && \
GHC6_OPTIONS=$(GHC6_OPTIONS) ./setup build && \
./setup register --gen-script && \
- sed -i -e "s|import-dirs:.*|import-dirs: `pwd`/dist/build|" \
- -e "s|library-dirs:.*|library-dirs: `pwd`/dist/build|" \
- -e "s|include-dirs:.*|include-dirs: `pwd`/dist/build|" \
+ sed -i -e "s%import-dirs:.*%import-dirs: `pwd`/dist/build%" \
+ -e "s%library-dirs:.*%library-dirs: `pwd`/dist/build%" \
+ -e "s%include-dirs:.*%include-dirs: `pwd`/dist/build%" \
+ -e "s%haddock-interfaces:.*%haddock-interfaces: `pwd`/dist/html/$$d.haddock%" \
+ -e "s%haddock-html:.*\(|.*\)%haddock-html: `pwd`/dist/html ' \1%" \
register.sh &&\
- ./register.sh ;\
+ ./register.sh || (echo "BUILD of $$d FAILED" ; break ) ;\
done
cd src/trhsx && ./setup configure $(GHC6_CONFIGURE_FLAGS) \
--with-compiler="$(CURDIR)/debian/ghc6" \
@@ -108,8 +110,11 @@
touch build-arch-stamp
build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-# $(MAKE) docs
+build-indep-stamp: build-arch-stamp
+# for d in $(MODULES) ; do \
+# cd "$(CURDIR)/src/$$d" && ./setup haddock \
+# || echo ( "GENERATING DOCS for $$d FAILED" ; break ) ;\
+# done
touch build-indep-stamp
install: install-arch install-indep
@@ -122,8 +127,8 @@
cd "$(CURDIR)/src/$$d" && \
./setup copy --destdir="$(CURDIR)/debian/libghc6-$$d-dev" && \
for libdir in `find "$(CURDIR)/debian/libghc6-$$d-dev/usr/lib/haskell-packages/ghc6/lib/" -mindepth 1 -maxdepth 1 -type d` ; do \
- sed -e "s%haddock-interfaces:.*%haddock-interfaces: /usr/share/doc/haskell-edison-doc/html/Edison.haddock%" \
- -e "s%haddock-html: .*%haddock-html: /usr/share/doc/haskell-edison-doc/html%" \
+ sed -e "s%haddock-interfaces:.*%haddock-interfaces: /usr/share/doc/$$-doc/html/$$d.haddock%" \
+ -e "s%haddock-html: .*%haddock-html: /usr/share/doc/$$d-doc/html%" \
-e "s%include-dirs: .*%include-dirs:%" \
"$(CURDIR)/src/$$d/.installed-pkg-config" > "$$libdir/installed-pkg-config" ; \
done && \
@@ -134,23 +139,11 @@
dh_install -s
install-indep: build-indep-stamp
-# dh_testdir
-# dh_testroot
-# dh_clean -k -i
-# dh_installdirs -i
-# The hugs libraries are build in the same directories as where the ghc libraries are build,
-# so if we build the hugs libraries and we need the ghc libraries afterwards those have to be rebuild.
-# Thus we remove the build-arch-stamp to make sure the will be rebuild if needed.
-# rm -f build-arch-stamp
-# for d in $(MODULES_DIRS) ; do \
-# cd "$(CURDIR)/src/$$d" && \
-# ./setup configure --hugs --prefix=/usr && \
-# ./setup build && \
-# ./setup copy --destdir="$(CURDIR)/debian/libhugs-$$d" && \
-# install --mode=644 -D "$(CURDIR)/debian/libhugs.linda-overrides" \
-# "$(CURDIR)/debian/libhugs-$$d/usr/share/linda/overrides/libhugs-$$d" ; \
-# done
-# dh_install -i
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+ dh_install -i
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
@@ -167,7 +160,7 @@
dh_compress -X.haddock
dh_fixperms
dh_installdeb
- sh -e debian/mk-haskell-depends
+ dh_haskell_depends
dh_shlibdeps
dh_gencontrol
dh_md5sums
More information about the Pkg-haskell-commits
mailing list