[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#542624: hs-plugins: .haddock file installed in both -dev and -doc



Package: hs-plugins
Severity: serious
Tags: patch
Justification: Policy 7.6.1


Hello team,

There appears to be something weird going on with hs-plugins. If you check out debian/rules then there is a lot of logic for installing the documentation (I don't understand why this is needed; can't we bring the package into line?) into hs-plugins-doc. Included amongst these files is the plugins.haddock file... you can see where I'm going now - the new haskell-devscripts also installs the same file into libghc6-plugins-dev. File conflict and uninstallable packages abound. All build-depending packages fail to build because of this, obviously.

We have only gotten away with this in Debian because hs-plugins-doc is arch:all and therefore hasn't been binNMUd - the next upload will break. Ubuntu only accepts source uploads so the problem has cropped up there.

What's the correct immediate fix for this problem? I've attached a diff which I think solves it and uploaded this to Karmic, but I'd appreciate peer review before committing to darcs.

Regards,
Iain

-- System Information:
Debian Release: squeeze/sid
  APT prefers karmic-updates
  APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic-proposed'), (500, 'karmic-backports'), (500, 'karmic')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31-6-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u hs-plugins-1.4.1/debian/rules hs-plugins-1.4.1/debian/rules
--- hs-plugins-1.4.1/debian/rules
+++ hs-plugins-1.4.1/debian/rules
@@ -24,9 +24,10 @@
 	cd debian/tmp-inst-ghc6/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
 		! -name "*.haddock" -exec install -Dm 644 '{}' \
 		../$(notdir $@)/'{}' ';'
-	mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
-	cp -r debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/*.haddock \
-		debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
+#	These files are now installed by haskell-devscripts into the -doc package
+#	mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
+#	cp -r debian/tmp-inst-ghc6/$(DEB_HADDOCK_DIR)/*.haddock \
+#		debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
 	
 	mkdir -p debian/$(notdir $@)/usr/share/doc/hs-$(CABAL_PACKAGE)-doc/plugins
 	cp -r docs/hs-plugins/* debian/$(notdir $@)/usr/share/doc/hs-$(CABAL_PACKAGE)-doc/plugins
diff -u hs-plugins-1.4.1/debian/changelog hs-plugins-1.4.1/debian/changelog
--- hs-plugins-1.4.1/debian/changelog
+++ hs-plugins-1.4.1/debian/changelog
@@ -1,3 +1,13 @@
+hs-plugins (1.4.1-2ubuntu2) karmic; urgency=low
+
+  * debian/rules: Do not install .haddock file in -doc package.
+    haskell-devscripts now installs these in -dev packages, but we did not
+    take into account the fact that hs-plugins installs the doc package
+    manually and so the same file was available in both packages, which led to
+    file conflicts and uninstallability.
+
+ -- Iain Lane <laney@ubuntu.com>  Thu, 20 Aug 2009 14:03:16 +0100
+
 hs-plugins (1.4.1-2ubuntu1) karmic; urgency=low
 
   * Add hscolour to build-depends-indep; required for doc build 

Reply to: