[Pkg-haskell-commits] r882 - in /packages/haskell-regex-base/trunk/debian: changelog control rules

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Sun Dec 30 21:24:59 UTC 2007


Author: arjan
Date: Sun Dec 30 21:24:59 2007
New Revision: 882

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=882
Log:
 r2294 at nebula:  arjan | 2007-12-30 22:24:48 +0100
 * debian/control:
   - Rename Xs-Vcs-* fields to Vcs-* field.
   - Update build dependency on haskell-devscripts to (>= 0.6.0) which
     generates the haddock documentation now.
   - Bump Standards-Version to 3.7.3. No changes needed.
 * 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.

Modified:
    packages/haskell-regex-base/trunk/debian/changelog
    packages/haskell-regex-base/trunk/debian/control
    packages/haskell-regex-base/trunk/debian/rules

Modified: packages/haskell-regex-base/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base/trunk/debian/changelog?rev=882&op=diff
==============================================================================
--- packages/haskell-regex-base/trunk/debian/changelog (original)
+++ packages/haskell-regex-base/trunk/debian/changelog Sun Dec 30 21:24:59 2007
@@ -1,3 +1,23 @@
+haskell-regex-base (0.91-2~pre1) unstable; urgency=low
+
+  * debian/control:
+    - Rename Xs-Vcs-* fields to Vcs-* field.
+    - Update build dependency on haskell-devscripts to (>= 0.6.0) which
+      generates the haddock documentation now.
+    - Bump Standards-Version to 3.7.3. No changes needed.
+  * 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>  Wed, 25 Jul 2007 22:43:58 +0200
+
 haskell-regex-base (0.91-1) unstable; urgency=low
 
   * Initial release. (Closes: #429706)

Modified: packages/haskell-regex-base/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base/trunk/debian/control?rev=882&op=diff
==============================================================================
--- packages/haskell-regex-base/trunk/debian/control (original)
+++ packages/haskell-regex-base/trunk/debian/control Sun Dec 30 21:24:59 2007
@@ -2,21 +2,58 @@
 Section: devel
 Priority: extra
 Maintainer: Arjan Oosting <arjan at debian.org>
-Build-Depends: cpphs, dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), dpatch, ghc6 (>= 6.6), haskell-devscripts (>= 0.5.14)
-Build-Depends-Indep: hugs, libhugs-mtl
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-regex-base
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base
+Build-Depends: cpphs, dpkg-dev (>= 1.13.19), 
+ debhelper (>= 5.0.0), dpatch, ghc6 (>= 6.6), 
+ haskell-devscripts (>= 0.6.0), 
+ libghc6-mtl-dev, libghc6-mtl-prof
+Build-Depends-Indep: ghc6-doc, haddock, hugs, libghc6-mtl-doc, libhugs-mtl
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-regex-base
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base
+Homepage: http://sourceforge.net/projects/lazy-regex
+
+Package: libghc6-regex-base-dev
+Architecture: any
+Depends: ${haskell:Depends}, ${misc:Depends}
+Suggests: haskell-uulib-doc (= ${source:Version})
+Description: GHC 6 library providing an API for regular expressions
+ A library containing the interface API for the Haskell regular
+ expressions library packages regex-posix, regex-pcre, regex-parsec,
+ regex-tdfs, regex-dfa.
+ .
+ This package contains the libraries for use with GHC 6.
+
+Package: libghc6-regex-base-prof
+Architecture: any
+Depends: libghc6-regex-base-dev (= ${binary:Version}), ${haskell:Depends}, ${misc:Depends}
+Suggests: haskell-regex-base-doc (= ${source:Version})
+Description: GHC 6 profiling library providing an API for regular expressions
+ A library containing the interface API for the Haskell regular
+ expressions library packages regex-posix, regex-pcre, regex-parsec,
+ regex-tdfs, regex-dfa.
+ .
+ This package contains additional profiling libraries which can be
+ used with ghcprof.
 
 Package: libhugs-regex-base
 Architecture: all
 Depends: ${haskell:Depends}, libhugs-mtl
-Suggests: libghc6-regex-base-doc
+Suggests: haskell-regex-base-doc (= ${source:Version})
 Description: Hugs library providing an API for regular expressions
  A library containing the interface API for the Haskell regular
  expressions library packages regex-posix, regex-pcre, regex-parsec,
  regex-tdfs, regex-dfa.
  .
  This package contains the libraries for use with Hugs98.
+
+Package: haskell-regex-base-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: doc-base, ghc6-doc, libghc6-mtl-doc
+Description: API documentation for regex-base Haskell library
+ A library containing the interface API for the Haskell regular
+ expressions library packages regex-posix, regex-pcre, regex-parsec,
+ regex-tdfs, regex-dfa.
  .
-  Homepage: http://sourceforge.net/projects/lazy-regex
+ This package contains the libraries for use with Hugs98.

Modified: packages/haskell-regex-base/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base/trunk/debian/rules?rev=882&op=diff
==============================================================================
--- packages/haskell-regex-base/trunk/debian/rules (original)
+++ packages/haskell-regex-base/trunk/debian/rules Sun Dec 30 21:24:59 2007
@@ -1,12 +1,27 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+#
+# Based on dh-make template containing work of Joey Hess, Craig Small
+# and Bill Allombert. 
+#
 
-# include dpatch
+# Include dpatch
 include /usr/share/dpatch/dpatch.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: patch-stamp
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+
+setup: patch-stamp
+	dh_testdir
+	ghc --make Setup -o setup -package Cabal 
+
+build: build-stamp
+build-stamp: setup
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
@@ -17,29 +32,35 @@
 	dh_clean 
 
 install: install-arch install-indep
-install-arch: patch-stamp
+install-arch: build-stamp
+	dh_testdir 
+	dh_testroot
+	dh_clean -k -s
+	dh_installdirs -s
+	dh_haskell -s
+	dh_install -s
 
-install-indep: patch-stamp
-	dh_testdir
+install-indep: build-stamp
+	dh_testdir 
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
 	dh_haskell -i
-	install --mode=644 -D "$(CURDIR)/debian/libhugs-regex-base.linda-overrides" \
-		"$(CURDIR)/debian/libhugs-filepath/usr/share/linda/overrides/libhugs-regex-base"
 	dh_install -i
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
-binary-common: 
+binary-common:
+	dh_testdir
+	dh_testroot
 	dh_installchangelogs 
-	dh_installdocs 
-	dh_installexamples 
+	dh_installdocs
 	dh_compress -X.haddock 
-	dh_fixperms 
-	dh_installdeb 
-	dh_shlibdeps 
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_haskell_depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -50,6 +71,7 @@
 
 # Build architecture dependant packages using the common target.
 binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
-binary: binary-arch  binary-indep
-.PHONY: build clean clean-patched binary-arch binary-indep binary install-indep install-arch install
+binary: binary-arch binary-indep
+.PHONY: binary binary-arch binary-indep build clean clean-patched install install-arch install-indep 




More information about the Pkg-haskell-commits mailing list