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

Proposed by Logan Rosen
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
debian/changelog (+27/-0)
debian/control (+4/-3)
hlibrary.mk (+10/-3)
To merge this branch: bzr merge lp:~logan/ubuntu/raring/haskell-devscripts/0.8.13
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Ubuntu branches 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.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve
Revision history for this message
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?

Revision history for this message
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.

Revision history for this message
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?

Revision history for this message
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?

Revision history for this message
Iain Lane (laney) wrote :

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

Revision history for this message
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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1haskell-devscripts (0.8.13ubuntu1) raring; urgency=low
2
3 * Merge from Debian experimental. Remaining changes:
4 - dh_haskell_shlibdeps: If the test object doesn't have any unresolved
5 symbols from libffi or libgmp, remove the dependencies on libffi and
6 libgmp.
7
8 -- Logan Rosen <logatronico@gmail.com> Wed, 16 Jan 2013 04:23:20 -0500
9
10haskell-devscripts (0.8.13) experimental; urgency=low
11
12 [ Joachim Breitner ]
13 * Improve parsing of "Setup register" output, patch by David Fox
14 * Enable creation of hoogle files, thanks to Kiwamu Okabe for the
15 suggestion.
16
17 [ Kiwamu Okabe ]
18 * Need --html option to fix bug that --hoogle option don't output html file.
19 * Support to create /usr/lib/ghc-doc/hoogle/*.txt for hoogle package.
20
21 [ Joachim Breitner ]
22 * Symlink hoogle’s txt files to /usr/lib/ghc-doc/hoogle/
23 * Bump ghc dependency to 7.6
24 * Bump standards version
25
26 -- Joachim Breitner <nomeata@debian.org> Mon, 08 Oct 2012 21:14:50 +0200
27
1haskell-devscripts (0.8.12ubuntu1) precise; urgency=low28haskell-devscripts (0.8.12ubuntu1) precise; urgency=low
229
3 * Merge with Debian; remaining changes:30 * Merge with Debian; remaining changes:
431
=== 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 @@
1Source: haskell-devscripts1Source: haskell-devscripts
2Section: haskell2Section: haskell
3Priority: extra3Priority: extra
4Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
5Uploaders: Marco Silva <marcot@debian.org>, Joachim Breitner <nomeata@debian.org>6Uploaders: Marco Silva <marcot@debian.org>, Joachim Breitner <nomeata@debian.org>
6Build-Depends: debhelper (>= 7)7Build-Depends: debhelper (>= 7)
7Build-Depends-Indep: perl8Build-Depends-Indep: perl
8Standards-Version: 3.9.19Standards-Version: 3.9.4
9Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-devscripts10Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-devscripts
10Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-devscripts11Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-devscripts
1112
@@ -14,7 +15,7 @@
14Depends: dctrl-tools15Depends: dctrl-tools
15 , debhelper16 , debhelper
16 , dh-buildinfo17 , dh-buildinfo
17 , ghc (>= 7.4)18 , ghc (>= 7.6)
18 , cdbs19 , cdbs
19 , ${misc:Depends}20 , ${misc:Depends}
20 , html-xml-utils21 , html-xml-utils
2122
=== 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 @@
3636
37NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0)37NO_GHCI_FLAG = $(shell test -e /usr/bin/ghci || echo --ghc-option=-DDEBIAN_NO_GHCI; exit 0)
3838
39DEB_COMPRESS_EXCLUDE += .haddock .hs39DEB_COMPRESS_EXCLUDE += .haddock .hs .txt
4040
41# TODO:41# TODO:
42# - some of this would probably be useful for generic Haskell programs,42# - some of this would probably be useful for generic Haskell programs,
@@ -52,10 +52,13 @@
52GHC_VERSION = $(shell ghc --numeric-version)52GHC_VERSION = $(shell ghc --numeric-version)
53DEB_HADDOCK_DIR ?= /usr/lib/ghc-doc/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/53DEB_HADDOCK_DIR ?= /usr/lib/ghc-doc/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/
5454
55DEB_HADDOCK_OPTS += --html --hoogle
55ifndef DEB_NO_IMPLICIT_HADDOCK_HYPERLINK56ifndef DEB_NO_IMPLICIT_HADDOCK_HYPERLINK
56DEB_HADDOCK_OPTS += --hyperlink-source57DEB_HADDOCK_OPTS += --hyperlink-source
57endif58endif
5859
60DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
61
59MAKEFILE := debian/hlibrary.Makefile62MAKEFILE := debian/hlibrary.Makefile
6063
61#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))64#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -82,6 +85,7 @@
82 rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp85 rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
83 rm -rf debian/tmp-inst-ghc86 rm -rf debian/tmp-inst-ghc
84 rm -f debian/extra-depends87 rm -f debian/extra-depends
88 rm -f debian/libghc-$(CABAL_PACKAGE)-doc.links
85 rm -f $(MAKEFILE)89 rm -f $(MAKEFILE)
86 rm -rf debian/dh_haskell_shlibdeps90 rm -rf debian/dh_haskell_shlibdeps
8791
@@ -135,7 +139,7 @@
135 $(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc139 $(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc
136140
137debian/extra-depends: debian/tmp-inst-ghc141debian/extra-depends: debian/tmp-inst-ghc
138 pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'` ; \142 pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'` ; \
139 dh_haskell_extra_depends $$pkg_config ; \143 dh_haskell_extra_depends $$pkg_config ; \
140 rm $$pkg_config144 rm $$pkg_config
141145
@@ -143,7 +147,7 @@
143 cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \147 cd debian/tmp-inst-ghc ; find usr/lib/haskell-packages/ghc/lib/ \
144 \( ! -name "*_p.a" ! -name "*.p_hi" \) \148 \( ! -name "*_p.a" ! -name "*.p_hi" \) \
145 -exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'149 -exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
146 pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | sed -r 's,.*: ,,'`; \150 pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`; \
147 $(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \151 $(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
148 install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \152 install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \
149 rm -f $$pkg_config153 rm -f $$pkg_config
@@ -170,6 +174,9 @@
170 [ 0 = `ls debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \174 [ 0 = `ls debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
171 cp -r debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/*.haddock \175 cp -r debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/*.haddock \
172 debian/$(notdir $@)/$(DEB_HADDOCK_DIR)176 debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
177 find debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR) -name "*.txt" \
178 -printf "%p $(DEB_HOOGLE_TXT_DIR)/%f\n" >> debian/libghc-$(CABAL_PACKAGE)-doc.links
179 sed -i s,^debian/libghc-$(CABAL_PACKAGE)-doc,, debian/libghc-$(CABAL_PACKAGE)-doc.links
173 dh_haskell_depends -p$(notdir $@)180 dh_haskell_depends -p$(notdir $@)
174181
175install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs debian/extra-depends182install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs debian/extra-depends

Subscribers

People subscribed via source and target branches

to all changes: