[Pkg-haskell-commits] r873 - in /packages/haskell-http/trunk/debian: changelog control haskell-http-doc.docs mk-haskell-depends rules

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Dec 30 19:50:58 2007
New Revision: 873

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=873
Log:
 r2276 at nebula:  arjan | 2007-12-30 20:50:00 +0100
 * debian/control:
   - Rename Xs-Vcs-* fields to Vcs-* field.
   - Update build dependency on haskell-devscripts to (>= 0.5.20) which
     generates the haddock documentation now.
 * debian/haskell-http-doc.docs: Removed as dh_haskell_install installs
   the generated API documentation now.
 * debian/mk-haskell-depends: Removed as haskell-devscripts now ships
   dh_haskell_depends
 * debian/rules:
   - dh_haskell_install does not install empty directories anymore and
     removes empty directories from the GHC package configuration
     file, so stop doing this manually.
   - dh_haskell also generates the haddock documentation so stop calling
     ./setup haddock
   - Replace the call to debian/mk-haskell-depends with a call to
     dh_haskell_depends.

Removed:
    packages/haskell-http/trunk/debian/haskell-http-doc.docs
    packages/haskell-http/trunk/debian/mk-haskell-depends
Modified:
    packages/haskell-http/trunk/debian/changelog
    packages/haskell-http/trunk/debian/control
    packages/haskell-http/trunk/debian/rules

Modified: packages/haskell-http/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/changelog?rev=873&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/changelog (original)
+++ packages/haskell-http/trunk/debian/changelog Sun Dec 30 19:50:58 2007
@@ -1,3 +1,24 @@
+haskell-http (30000000-3~pre1) unstable; urgency=low
+
+  * debian/control:
+    - Rename Xs-Vcs-* fields to Vcs-* field.
+    - Update build dependency on haskell-devscripts to (>= 0.5.20) which
+      generates the haddock documentation now.
+  * debian/haskell-http-doc.docs: Removed as dh_haskell_install installs
+    the generated API documentation now.
+  * debian/mk-haskell-depends: Removed as haskell-devscripts now ships
+    dh_haskell_depends
+  * debian/rules:
+    - dh_haskell_install does not install empty directories anymore and
+      removes empty directories from the GHC package configuration
+      file, so stop doing this manually.
+    - dh_haskell also generates the haddock documentation so stop calling
+      ./setup haddock
+    - Replace the call to debian/mk-haskell-depends with a call to
+      dh_haskell_depends.
+
+ -- Arjan Oosting <arjan at debian.org>  Mon, 24 Dec 2007 00:23:57 +0100
+
 haskell-http (30000000-2) unstable; urgency=low
 
   * Rebuild with haddock 0.8-2 to make sure the links work.

Modified: packages/haskell-http/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/control?rev=873&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/control (original)
+++ packages/haskell-http/trunk/debian/control Sun Dec 30 19:50:58 2007
@@ -11,8 +11,8 @@
  libghc6-base-doc, libghc6-network-doc, libghc6-parsec-doc
 Standards-Version: 3.7.2
 Homepage: http://www.haskell.org/http/
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-http
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-http
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http
 
 Package: libghc6-http-dev
 Section: devel

Modified: packages/haskell-http/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-http/trunk/debian/rules?rev=873&op=diff
==============================================================================
--- packages/haskell-http/trunk/debian/rules (original)
+++ packages/haskell-http/trunk/debian/rules Sun Dec 30 19:50:58 2007
@@ -42,12 +42,6 @@
 	dh_clean -k -s
 	dh_installdirs -s
 	dh_haskell -s
-	# remove empty directories installed by dh_haskell
-	find debian/libghc6-*-dev/usr/lib/haskell-packages/ -empty -type d -delete
-	sed -i -e "s%haddock-interfaces:.*%haddock-interfaces: $(HADDOCK_INTERFACES)%" \
-	    -e "s%haddock-html: .*%haddock-html: $(HADDOCK_HTML)%" \
-	    -e "s%include-dirs: .*%include-dirs: $(INCLUDE_DIRS)%" \
-	    debian/libghc6-*-dev/usr/lib/haskell-packages/ghc6/lib/*/installed-pkg-config
 	dh_install -s
 
 install-indep: build-stamp
@@ -56,7 +50,6 @@
 	dh_clean -k -i
 	dh_installdirs -i
 	dh_haskell -i
-	./setup haddock
 	dh_install -i
 
 # Must not depend on anything. This is to be called by
@@ -71,7 +64,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	sh -e debian/mk-haskell-depends
+	dh_haskell_depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb