[Pkg-haskell-commits] r730 - in /packages/haskell-filepath/trunk/debian: changelog control haskell-filepath-doc.dirs haskell-filepath-doc.doc-base haskell-filepath-doc.docs mk-haskell-depends rules

arjan at users.alioth.debian.org arjan at users.alioth.debian.org
Mon Jun 4 22:15:57 UTC 2007 

Author: arjan
Date: Mon Jun  4 22:15:56 2007
New Revision: 730

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=730
Log:
 r1979 at nebula:  arjan | 2007-06-04 23:44:32 +0200
 * Stop building packages for GHC 6 as it ships filepath now:
   - debian/control: 
     + Drop libghc6-filepath-dev, libghc6-filepath-prof as ghc6 and
       ghc6-prof provide these packages now.
     + Make haskell-filepath-doc an dummy package which depends on
       libghc6-filepath-doc.
     + Drop dctrl-tools, ghc6-prof and haddock from the build
       dependencies.
   - debian/haskell-filepath-doc.{dirs,doc-base,docs}: removed.
   - debian/mk-haskell-depends: removed.
   - debian/rules:
     + Remove install-arch stuff.

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

Modified: packages/haskell-filepath/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-filepath/trunk/debian/changelog?rev=730&op=diff
==============================================================================
--- packages/haskell-filepath/trunk/debian/changelog (original)
+++ packages/haskell-filepath/trunk/debian/changelog Mon Jun  4 22:15:56 2007
@@ -3,8 +3,20 @@
   * debian/control:
     - Update XS-Vcs-* fields as the packages has moved to the pkg-haskell
       subversion archive.
+  * Stop building packages for GHC 6 as it ships filepath now:
+    - debian/control: 
+      + Drop libghc6-filepath-dev, libghc6-filepath-prof as ghc6 and
+        ghc6-prof provide these packages now.
+      + Make haskell-filepath-doc an dummy package which depends on
+        libghc6-filepath-doc.
+      + Drop dctrl-tools, ghc6-prof and haddock from the build
+        dependencies.
+    - debian/haskell-filepath-doc.{dirs,doc-base,docs}: removed.
+    - debian/mk-haskell-depends: removed.
+    - debian/rules:
+      + Remove install-arch stuff.
 
- -- Arjan Oosting <arjan at debian.org>  Fri, 11 May 2007 08:12:12 +0200
+ -- Arjan Oosting <arjan at debian.org>  Mon, 04 Jun 2007 23:40:59 +0200
 
 haskell-filepath (1.0-2) unstable; urgency=low
 

Modified: packages/haskell-filepath/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-filepath/trunk/debian/control?rev=730&op=diff
==============================================================================
--- packages/haskell-filepath/trunk/debian/control (original)
+++ packages/haskell-filepath/trunk/debian/control Mon Jun  4 22:15:56 2007
@@ -2,37 +2,11 @@
 Section: devel
 Priority: extra
 Maintainer: Arjan Oosting <arjan at debian.org>
-Build-Depends: cpphs, dctrl-tools, dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), dpatch, ghc6 (>= 6.6), ghc6-prof (>= 6.6), haskell-devscripts (>= 0.5.14)
-Build-Depends-Indep: haddock, hugs
+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
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haskell-filepath
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-filepath
-
-Package: libghc6-filepath-dev
-Architecture: any
-Depends: ${haskell:Depends}
-Suggests: haskell-filepath-doc (= ${source:Version})
-Description: GHC 6 library for manipulating FilePath's
- A library for FilePath manipulations, designed to be cross
- platform. This library will select the correct type of FilePath's for
- the platform the code is running on at runtime
- .
- This package contains the libraries compiled for GHC 6.
- .
-  Homepage: http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php#filepath
-
-Package: libghc6-filepath-prof
-Architecture: any
-Depends: ${haskell:Depends}
-Suggests: haskell-filepath-doc (= ${source:Version})
-Description: GHC 6 profiling library for manipulating FilePath's
- A library for FilePath manipulations, designed to be cross
- platform. This library will select the correct type of FilePath's for
- the platform the code is running on at runtime
- .
- This package contains the profiling libraries compiled for GHC 6.
- .
-  Homepage: http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php#filepath
 
 Package: libhugs-filepath
 Architecture: all
@@ -50,13 +24,11 @@
 Package: haskell-filepath-doc
 Architecture: all
 Section: doc
+Depends: libghc6-filepath-doc
 Recommends: doc-base
-Description: API documentation of the Haskell FilePath library
- A library for FilePath manipulations, designed to be cross
- platform. This library will select the correct type of FilePath's for
- the platform the code is running on at runtime
+Description: Transitional package
+ Package to ease upgrade from haskell-filepath-doc to libghc6-filepath-doc.
  .
- This package contains the library documentation.
- .
-  Homepage: http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php#filepath
+ This package can savely be removed.
 
+

Modified: packages/haskell-filepath/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-filepath/trunk/debian/rules?rev=730&op=diff
==============================================================================
--- packages/haskell-filepath/trunk/debian/rules (original)
+++ packages/haskell-filepath/trunk/debian/rules Mon Jun  4 22:15:56 2007
@@ -18,17 +18,6 @@
 
 install: install-arch install-indep
 install-arch: patch-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-	dh_haskell -s
-	find debian/libghc6-filepath-dev/usr/lib/haskell-packages/ -empty -type d -delete
-	sed -i -e "s%haddock-interfaces:.*%haddock-interfaces: /usr/share/doc/haskell-filepath-doc/html/FilePath.haddock%" \
-	    -e "s%haddock-html: .*%haddock-html: /usr/share/doc/haskell-filepath-doc/html%" \
-	    -e "s%include-dirs: .*%include-dirs:%" \
-	    debian/libghc6-filepath-dev/usr/lib/haskell-packages/ghc6/lib/*/installed-pkg-config
-	dh_install -s
 
 install-indep: patch-stamp
 	dh_testdir
@@ -38,7 +27,6 @@
 	dh_haskell -i
 	install --mode=644 -D "$(CURDIR)/debian/libhugs-filepath.linda-overrides" \
 		"$(CURDIR)/debian/libhugs-filepath/usr/share/linda/overrides/libhugs-filepath"
-	./setup haddock
 	dh_install -i
 
 # Must not depend on anything. This is to be called by
@@ -52,7 +40,6 @@
 	dh_fixperms 
 	dh_installdeb 
 	dh_shlibdeps 
-	sh -e debian/mk-haskell-depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -63,7 +50,6 @@
 
 # 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

More information about the Pkg-haskell-commits mailing list