Hi,

I prepared a NMU which should fix this issue, I can't do an actual
upload myself as I am still in the NM queue. The patch is attached. 

Greetings Arjan

 hs-plugins (0.9.10-3.2) unstable; urgency=medium
 .
   * Non-maintainer upload.
   * Register package with ghc-pkg update instead of ghc-pkg --add-package
     to make sure conflicting packages are hidden on install. Also gerate a
     dependency on libghc6-cabal-dev if the package is build against
     it. (Closes: #372840)
   * debian/rules: generate Depend on other ghc6 libraries during build.
   * Remove directory accidentally introduced in the previous NMU.
   * Convert debian/changelog and debian/README.Debian to UTF-8.


diff -u hs-plugins-0.9.10/debian/README.Debian hs-plugins-0.9.10/debian/README.Debian
--- hs-plugins-0.9.10/debian/README.Debian
+++ hs-plugins-0.9.10/debian/README.Debian
@@ -11 +11 @@
- -- Jérémy Bobbio <[EMAIL PROTECTED]>  Sat, 30 Sep 2006 13:27:10 +0200
+ -- Jérémy Bobbio <[EMAIL PROTECTED]>  Sat, 30 Sep 2006 13:27:10 +0200
diff -u hs-plugins-0.9.10/debian/rules hs-plugins-0.9.10/debian/rules
--- hs-plugins-0.9.10/debian/rules
+++ hs-plugins-0.9.10/debian/rules
@@ -13,6 +13,14 @@
 	CFLAGS += -O2
 endif
 
+CABAL_VERSION    := $(strip $(shell dpkg-query --showformat='$${Version}' -W libghc6-cabal-dev))
+SRC_EXTS_VERSION := $(strip $(shell dpkg-query --showformat='$${Version}' -W libghc6-src-exts-dev))
+
+HASKELL_DEPENDS := libghc6-src-exts-dev (>= $(SRC_EXTS_VERSION)), libghc6-src-exts-dev (<< $(shell echo '$(SRC_EXTS_VERSION)' | sed -e 's/-[^-]*$$/+/'))
+ifneq (,$(CABAL_VERSION))
+HASKELL_DEPENDS += , libghc6-cabal-dev (>= $(CABAL_VERSION)), libghc6-cabal-dev (<< $(shell echo '$(CABAL_VERSION)' | sed -e 's/-[^-]*$$/+/'))
+endif
+
 VERSION = 0.9.10
 
 config.status: configure.ac patch-stamp
@@ -71,7 +79,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -Vhaskell:Depends="$(HASKELL_DEPENDS)"
 	dh_md5sums
 	dh_builddeb
 
diff -u hs-plugins-0.9.10/debian/libghc6-plugins-dev.postinst hs-plugins-0.9.10/debian/libghc6-plugins-dev.postinst
--- hs-plugins-0.9.10/debian/libghc6-plugins-dev.postinst
+++ hs-plugins-0.9.10/debian/libghc6-plugins-dev.postinst
@@ -10,7 +10,7 @@
 			/usr/lib/haskell-packages/ghc6/lib/hs-plugins-${VERSION}/altdata.installed-pkg-config \
 			/usr/lib/haskell-packages/ghc6/lib/hs-plugins-${VERSION}/hi.installed-pkg-config \
 			/usr/lib/haskell-packages/ghc6/lib/hs-plugins-${VERSION}/plugins.installed-pkg-config; do \
-				/usr/lib/${GHC}/bin/ghc-pkg -g --add-package < $config; \
+				/usr/lib/${GHC}/bin/ghc-pkg -g update $config; \
 		done
 	;;
 
diff -u hs-plugins-0.9.10/debian/control hs-plugins-0.9.10/debian/control
--- hs-plugins-0.9.10/debian/control
+++ hs-plugins-0.9.10/debian/control
@@ -8,7 +8,7 @@
 Package: libghc6-plugins-dev
 Section: libdevel
 Architecture: i386 amd64
-Depends: ghc6 (>= 6.4.2), ghc6 (<< 6.4.2-999), libghc6-src-exts-dev (>= 0.2-4)
+Depends: ghc6 (>= 6.4.2), ghc6 (<< 6.4.2-999), ${haskell:Depends}
 Description: Dynamically Loaded Haskell Modules
  hs-plugins is a library for loading plugins written in Haskell into an
  application at runtime. It also provides a mechanism for (re)compiling
diff -u hs-plugins-0.9.10/debian/changelog hs-plugins-0.9.10/debian/changelog
--- hs-plugins-0.9.10/debian/changelog
+++ hs-plugins-0.9.10/debian/changelog
@@ -1,3 +1,16 @@
+hs-plugins (0.9.10-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Register package with ghc-pkg update instead of ghc-pkg --add-package
+    to make sure conflicting packages are hidden on install. Also gerate a
+    dependency on libghc6-cabal-dev if the package is build against
+    it. (Closes: #372840) 
+  * debian/rules: generate Depend on other ghc6 libraries during build.
+  * Remove directory accidentally introduced in the previous NMU.
+  * Convert debian/changelog and debian/README.Debian to UTF-8.
+
+ -- Arjan Oosting <[EMAIL PROTECTED]>  Wed,  4 Oct 2006 15:55:10 +0200
+
 hs-plugins (0.9.10-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -7,7 +20,7 @@
      - Add a README.Debian pointing the user to hs-plugins website for HTML
        documentation.
 
- -- Jérémy Bobbio <[EMAIL PROTECTED]>  Sat, 30 Sep 2006 13:53:20 +0200
+ -- Jérémy Bobbio <[EMAIL PROTECTED]>  Sat, 30 Sep 2006 13:53:20 +0200
 
 hs-plugins (0.9.10-3) unstable; urgency=low
 
reverted:
--- hs-plugins-0.9.10/atDSnaZDeq/hs-plugins-0.9.10/debian/README.Debian
+++ hs-plugins-0.9.10.orig/atDSnaZDeq/hs-plugins-0.9.10/debian/README.Debian
@@ -1,11 +0,0 @@
-hs-plugins for Debian
-=====================
-
-hs-plugins documentation in HTML form can be found at:
-  http://www.cse.unsw.edu.au/~dons/hs-plugins/
-
-The HTML documentation is not included in the Debian package as building it
-requires tex2page which is not available on all architectures supported by
-Debian.
-
- -- Jérémy Bobbio <[EMAIL PROTECTED]>  Sat, 30 Sep 2006 13:27:10 +0200

Attachment: signature.asc
Description: Dit berichtdeel is digitaal ondertekend

Reply via email to