Ubuntu

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

Proposed by Logan Rosen on 2013-01-16
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~logan/ubuntu/raring/haskell-devscripts/0.8.13
Merge into: lp:ubuntu/raring/haskell-devscripts
Diff against target: 125 lines (+41/-6) 3 files modified
To merge this branch: bzr merge lp:~logan/ubuntu/raring/haskell-devscripts/0.8.13
Reviewer Review Type Date Requested Status
Daniel Holbach Approve on 2013-01-17
Ubuntu branches 2013-01-16 Pending
Review via email: mp+143461@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve
Iain Lane (laney) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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

Max (bubuta) wrote :

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-10 17:08:49 +0000
3+++ debian/changelog 2013-01-16 09:27:20 +0000
4@@ -1,3 +1,30 @@
5+haskell-devscripts (0.8.13ubuntu1) raring; urgency=low
6+
7+ * Merge from Debian experimental. Remaining changes:
8+ - dh_haskell_shlibdeps: If the test object doesn't have any unresolved
9+ symbols from libffi or libgmp, remove the dependencies on libffi and
10+ libgmp.
11+
12+ -- Logan Rosen <logatronico@gmail.com> Wed, 16 Jan 2013 04:23:20 -0500
13+
14+haskell-devscripts (0.8.13) experimental; urgency=low
15+
16+ [ Joachim Breitner ]
17+ * Improve parsing of "Setup register" output, patch by David Fox
18+ * Enable creation of hoogle files, thanks to Kiwamu Okabe for the
19+ suggestion.
20+
21+ [ Kiwamu Okabe ]
22+ * Need --html option to fix bug that --hoogle option don't output html file.
23+ * Support to create /usr/lib/ghc-doc/hoogle/*.txt for hoogle package.
24+
25+ [ Joachim Breitner ]
26+ * Symlink hoogle’s txt files to /usr/lib/ghc-doc/hoogle/
27+ * Bump ghc dependency to 7.6
28+ * Bump standards version
29+
30+ -- Joachim Breitner <nomeata@debian.org> Mon, 08 Oct 2012 21:14:50 +0200
31+
32 haskell-devscripts (0.8.12ubuntu1) precise; urgency=low
33
34 * Merge with Debian; remaining changes:
35
36=== modified file 'debian/control'
37--- debian/control 2012-03-10 17:08:49 +0000
38+++ debian/control 2013-01-16 09:27:20 +0000
39@@ -1,11 +1,12 @@
40 Source: haskell-devscripts
41 Section: haskell
42 Priority: extra
43-Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
44+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
45+XSBC-Original-Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
46 Uploaders: Marco Silva <marcot@debian.org>, Joachim Breitner <nomeata@debian.org>
47 Build-Depends: debhelper (>= 7)
48 Build-Depends-Indep: perl
49-Standards-Version: 3.9.1
50+Standards-Version: 3.9.4
51 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-devscripts
52 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-devscripts
53
54@@ -14,7 +15,7 @@
55 Depends: dctrl-tools
56 , debhelper
57 , dh-buildinfo
58- , ghc (>= 7.4)
59+ , ghc (>= 7.6)
60 , cdbs
61 , ${misc:Depends}
62 , html-xml-utils
63
64=== modified file 'hlibrary.mk'
65--- hlibrary.mk 2012-03-10 17:08:49 +0000
66+++ hlibrary.mk 2013-01-16 09:27:20 +0000
67@@ -36,7 +36,7 @@
68
69 NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0)
70
71-DEB_COMPRESS_EXCLUDE += .haddock .hs
72+DEB_COMPRESS_EXCLUDE += .haddock .hs .txt
73
74 # TODO:
75 # - some of this would probably be useful for generic Haskell programs,
76@@ -52,10 +52,13 @@
77 GHC_VERSION = $(shell ghc --numeric-version)
78 DEB_HADDOCK_DIR ?= /usr/lib/ghc-doc/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/
79
80+DEB_HADDOCK_OPTS += --html --hoogle
81 ifndef DEB_NO_IMPLICIT_HADDOCK_HYPERLINK
82 DEB_HADDOCK_OPTS += --hyperlink-source
83 endif
84
85+DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
86+
87 MAKEFILE := debian/hlibrary.Makefile
88
89 #ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
90@@ -82,6 +85,7 @@
91 rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
92 rm -rf debian/tmp-inst-ghc
93 rm -f debian/extra-depends
94+ rm -f debian/libghc-$(CABAL_PACKAGE)-doc.links
95 rm -f $(MAKEFILE)
96 rm -rf debian/dh_haskell_shlibdeps
97
98@@ -135,7 +139,7 @@
99 $(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc
100
101 debian/extra-depends: debian/tmp-inst-ghc
102- pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'` ; \
103+ pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'` ; \
104 dh_haskell_extra_depends $$pkg_config ; \
105 rm $$pkg_config
106
107@@ -143,7 +147,7 @@
108 cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
109 \( ! -name "*_p.a" ! -name "*.p_hi" \) \
110 -exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
111- pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'`; \
112+ pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`; \
113 $(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
114 install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \
115 rm -f $$pkg_config
116@@ -170,6 +174,9 @@
117 [ 0 = `ls debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
118 cp -r debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/*.haddock \
119 debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
120+ find debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR) -name "*.txt" \
121+ -printf "%p $(DEB_HOOGLE_TXT_DIR)/%f\n" >> debian/libghc-$(CABAL_PACKAGE)-doc.links
122+ sed -i s,^debian/libghc-$(CABAL_PACKAGE)-doc,, debian/libghc-$(CABAL_PACKAGE)-doc.links
123 dh_haskell_depends -p$(notdir $@)
124
125 install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs debian/extra-depends

Subscribers

People subscribed via source and target branches

to all changes: