Merge lp:~logan/ubuntu/raring/haskell-devscripts/0.8.13 into lp:ubuntu/raring/haskell-devscripts

[Logan Rosen]

This merge is required for me to request a sync of the new experimental version of xmonad (see Bug 1099936).

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

[Iain Lane (laney)]

I'm confused as to why this was proposed and subsequently uploaded. It was never going to be installable.

(raring-amd64)root@raring:/# apt-get install haskell-devscripts
Reading package lists... Done
Building dependency tree
Reading state information... Done
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:

The following packages have unmet dependencies:
 haskell-devscripts : Depends: ghc (>= 7.6) but 7.4.2-2ubuntu1 is to be installed
E: Unable to correct problems, you have held broken packages.

You can see that from the changelog and the diff. Did you try and install the package?

[Logan Rosen (logan)]

I'm sorry; I take the blame for all of this. I should have tested the package more thoroughly on my end - I don't know how a simple installation of it slipped by me. I am attempting a merge of ghc from experimental right now, but, if not, we can back out this change.

[Logan Rosen (logan)]

I heard from Micah on IRC that syncing ghc is a huge ordeal, and it would involve doing a rebuild of all ghc-dependent packages - should this just be taken out of raring-proposed, in that case, or was that transition planned already?

[Daniel Holbach (dholbach)]

Sorry, this was an oversight on my part when I sponsored it. Shall we roll back or is there a way for us to do this rebuild/update easily?

[Iain Lane (laney)]

Don't worry. I'll start the transition soon. Holding haskell-devscripts in -proposed for now isn't too bad. :-)

[Max (bubuta)]

could you post some bug # or merge proposal link so it would be possible to track progress on this one?

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-10 17:08:49 +0000
+++ debian/changelog	2013-01-16 09:27:20 +0000
@@ -1,3 +1,30 @@
+haskell-devscripts (0.8.13ubuntu1) raring; urgency=low
+
+  * Merge from Debian experimental. Remaining changes:
+    - dh_haskell_shlibdeps: If the test object doesn't have any unresolved
+      symbols from libffi or libgmp, remove the dependencies on libffi and
+      libgmp.
+
+ -- Logan Rosen <[e-mail]>  Wed, 16 Jan 2013 04:23:20 -0500
+
+haskell-devscripts (0.8.13) experimental; urgency=low
+
+  [ Joachim Breitner ]
+  * Improve parsing of "Setup register" output, patch by David Fox
+  * Enable creation of hoogle files, thanks to Kiwamu Okabe for the
+    suggestion. 
+
+  [ Kiwamu Okabe ]
+  * Need --html option to fix bug that --hoogle option don't output html file.
+  * Support to create /usr/lib/ghc-doc/hoogle/*.txt for hoogle package.
+
+  [ Joachim Breitner ]
+  * Symlink hoogle’s txt files to /usr/lib/ghc-doc/hoogle/
+  * Bump ghc dependency to 7.6 
+  * Bump standards version 
+
+ -- Joachim Breitner <[e-mail]>  Mon, 08 Oct 2012 21:14:50 +0200
+
 haskell-devscripts (0.8.12ubuntu1) precise; urgency=low
 
   * Merge with Debian; remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2012-03-10 17:08:49 +0000
+++ debian/control	2013-01-16 09:27:20 +0000
@@ -1,11 +1,12 @@
 Source: haskell-devscripts
 Section: haskell
 Priority: extra
-Maintainer: Debian Haskell Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Haskell Group <[e-mail]>
 Uploaders: Marco Silva <[e-mail]>, Joachim Breitner <[e-mail]>
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: perl
-Standards-Version: 3.9.1
+Standards-Version: 3.9.4
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-devscripts
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-devscripts
 
@@ -14,7 +15,7 @@
 Depends: dctrl-tools
   , debhelper
   , dh-buildinfo
-  , ghc (>= 7.4)
+  , ghc (>= 7.6)
   , cdbs
   , ${misc:Depends}
   , html-xml-utils
 
=== modified file 'hlibrary.mk'
--- hlibrary.mk	2012-03-10 17:08:49 +0000
+++ hlibrary.mk	2013-01-16 09:27:20 +0000
@@ -36,7 +36,7 @@
 
 NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0)
 
-DEB_COMPRESS_EXCLUDE += .haddock .hs
+DEB_COMPRESS_EXCLUDE += .haddock .hs .txt
 
 # TODO:
 # - some of this would probably be useful for generic Haskell programs,
@@ -52,10 +52,13 @@
 GHC_VERSION = $(shell ghc --numeric-version)
 DEB_HADDOCK_DIR ?= /usr/lib/ghc-doc/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/
 
+DEB_HADDOCK_OPTS += --html --hoogle
 ifndef DEB_NO_IMPLICIT_HADDOCK_HYPERLINK
 DEB_HADDOCK_OPTS += --hyperlink-source
 endif
 
+DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
+
 MAKEFILE := debian/hlibrary.Makefile
 
 #ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -82,6 +85,7 @@
 	rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
 	rm -rf debian/tmp-inst-ghc
 	rm -f debian/extra-depends
+	rm -f debian/libghc-$(CABAL_PACKAGE)-doc.links
 	rm -f $(MAKEFILE)
 	rm -rf debian/dh_haskell_shlibdeps
 
@@ -135,7 +139,7 @@
 	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc
 
 debian/extra-depends: debian/tmp-inst-ghc
-	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'` ; \
+	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'` ; \
 		dh_haskell_extra_depends $$pkg_config ; \
 		rm $$pkg_config
 
@@ -143,7 +147,7 @@
 	cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
 		\( ! -name "*_p.a" ! -name "*.p_hi" \) \
 		-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
-	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'`; \
+	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`; \
 		$(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
 		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \
 		rm -f $$pkg_config
@@ -170,6 +174,9 @@
 	[ 0 = `ls debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
 		cp -r debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/*.haddock \
 		debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
+	find debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR) -name "*.txt" \
+		-printf "%p $(DEB_HOOGLE_TXT_DIR)/%f\n" >> debian/libghc-$(CABAL_PACKAGE)-doc.links
+	sed -i s,^debian/libghc-$(CABAL_PACKAGE)-doc,, debian/libghc-$(CABAL_PACKAGE)-doc.links
 	dh_haskell_depends -p$(notdir $@)
 
 install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs debian/extra-depends