[Pkg-haskell-commits] darcs: ghc: Ship haddock with ghc

[Joachim Breitner]

Tue May 12 10:22:35 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Ship haddock with ghc

    M ./changelog -2 +2
    M ./control -27 +11
    M ./rules -6 +3

Tue May 12 10:22:35 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Ship haddock with ghc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-12 13:25:48.316683004 +0000
+++ new-ghc/changelog	2015-05-12 13:25:48.340683005 +0000
@@ -2,8 +2,8 @@
 
   * New upstream release. Optimistically dropping lots of patches, lets see
     what now works out of the box.
-  * Remove code from debian/rules for building haddock separately. Lets see
-    what goes wrong.
+  * Ship haddock with ghc, and leave (most) paths as they are. It is easier to
+    not fight against the way upstream builds and installs stuff.
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 11 May 2015 22:28:05 +0200
 
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2015-05-12 13:25:48.316683004 +0000
+++ new-ghc/control	2015-05-12 13:25:48.320683004 +0000
@@ -35,10 +35,18 @@
 Architecture: any
 Depends: llvm-3.4 [arm64 armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, libncurses5-dev, ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: dpkg (>= 1.16.1)
-Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}, ghc-dynamic
-Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8)
+Provides:
+  haskell-compiler,
+  ${provided-devs},
+  ${haskell:Provides},
+  ${ghci},
+  ghc-dynamic,
+  haddock,
+  ghc-haddock,
+  ${haddock:Provides}
+Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10)
 Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8), ${conflicting-devs}
-Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<< 7.8)
+Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<< 7.10), ghc-haddock (<< 7.10)
 Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-3.4
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
@@ -88,27 +96,3 @@
  .
  This package includes HTML, DVI and PS versions of the SGML-based
  documentation around GHC.
-
-Package: ghc-haddock
-Architecture: any
-Provides: haddock, ${haddock:Provides}
-Conflicts: haddock
-Breaks: ghc-doc (<< 7.6.3-20~)
-Depends: ghc (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Homepage: http://www.haskell.org/haddock/
-Description: Documentation tool for annotated Haskell source code
- Haddock is a tool for automatically generating documentation from
- annotated Haskell source code.  It is primary intended for documenting
- libraries, but it should be useful for any kind of Haskell code.
- .
- Haddock lets you write documentation annotations next to the
- definitions of functions and types in the source code, in a syntax
- that is easy on the eye when writing the source code (no heavyweight
- mark-up).  The documentation generated by Haddock is fully hyperlinked:
- click on a type name in a type signature to go straight to the
- definition, and documentation, for that type.
- .
- Haddock can generate documentation in multiple formats; currently HTML
- is implemented, and there is partial support for generating DocBook.
- .
- This package contains Haddock version 2.10.0.
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2015-05-12 13:25:48.316683004 +0000
+++ new-ghc/rules	2015-05-12 13:25:48.340683005 +0000
@@ -164,7 +164,7 @@
 
 	# Add haddock substvars
 	echo "haddock:Depends=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
-	echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars
+	echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc.substvars
 
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	mkdir -p debian/tmp/usr/lib/ghc-doc
@@ -193,13 +193,13 @@
 
 	echo debian/*.1 > debian/ghc.manpages
 	cp debian/haddock.man debian/haddock.1
-	echo debian/haddock.1 >debian/ghc-haddock.manpages
+	echo debian/haddock.1 >> debian/ghc.manpages
 
 	# ####################
 	# Now all the files are sorted, create the package filelists
 
 	# ghc
-	find debian/tmp/usr/bin $(FILES) ! -name haddock  > debian/ghc.install
+	find debian/tmp/usr/bin $(FILES)                  > debian/ghc.install
 #	find debian/tmp/usr/share/ghc* $(FILES)          >> debian/ghc.install
 	find debian/tmp/usr/share/man $(FILES)           >> debian/ghc.install
 	find debian/tmp/usr/lib/ghc $(FILES) ! $(PROF_FILE) >> debian/ghc.install
@@ -208,9 +208,6 @@
 	# ghc-prof
 	find debian/tmp/usr/lib $(FILES) $(PROF_FILE) > debian/ghc-prof.install
 	echo debian/tmp/usr/share/lintian/overrides/ghc-prof >> debian/ghc-prof.install
-	# haddock
-	echo usr/bin/haddock				 > debian/ghc-haddock.install
-	find debian/tmp/usr/share/haddock $(FILES)	 >> debian/ghc-haddock.install
 	# ghc-doc
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	mkdir -p debian/tmp/$(DEB_HOOGLE_TXT_DIR)