[Pkg-haskell-commits] darcs: ghc: Put dynamic files in ghc package

[mail at joachim-breitner.de]

Tue Feb  4 23:22:55 UTC 2014  mail at joachim-breitner.de
  * Put dynamic files in ghc package

    M ./control -19 +3
    R ./ghc-dynamic.dirs
    R ./lintian-overrides/ghc-dynamic
    M ./rules -5 +1

Tue Feb  4 23:22:55 UTC 2014  mail at joachim-breitner.de
  * Put dynamic files in ghc package
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2014-02-05 10:49:39.629531239 +0000
+++ new-ghc/control	2014-02-05 10:49:39.633531238 +0000
@@ -33,9 +33,9 @@
 Package: ghc
 Architecture: any
 Depends: llvm [armel armhf], libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
-Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}
-Replaces: ghc6 (<< 7)
-Conflicts: ghc6 (<< 7), ${provided-devs}
+Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}, ghc-dynamic
+Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8)
+Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8), ${provided-devs}
 Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<= 6.12.1-8)
 Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm
 Description: The Glasgow Haskell Compilation system
@@ -86,22 +86,6 @@
  This package includes HTML, DVI and PS versions of the SGML-based
  documentation around GHC.
 
-Package: ghc-dynamic
-Architecture: i386 amd64
-Depends: ghc (= ${binary:Version}), ${misc:Depends}
-Description: Dynamic libraries for the Glasgow Haskell Compilation system
- The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
- Haskell.
- .
- Haskell is "the" standard lazy functional programming language.  The language
- definition and additional documentation can be found in the `haskell-doc'
- package.  Alternatively, there is an online version at
- http://haskell.org/onlinereport/.
- .
- This package has dynamically linkable, shared versions of the
- libraries included with GHC.  Currently, they are available only on
- i386 and amd64 architectures.
-
 Package: ghc-haddock
 Architecture: any
 Provides: haddock, ${haddock:Provides}
diff -rN -u old-ghc/ghc-dynamic.dirs new-ghc/ghc-dynamic.dirs
--- old-ghc/ghc-dynamic.dirs	2014-02-05 10:49:39.629531239 +0000
+++ new-ghc/ghc-dynamic.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/share/lintian/overrides
diff -rN -u old-ghc/lintian-overrides/ghc-dynamic new-ghc/lintian-overrides/ghc-dynamic
--- old-ghc/lintian-overrides/ghc-dynamic	2014-02-05 10:49:39.629531239 +0000
+++ new-ghc/lintian-overrides/ghc-dynamic	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# the dep on ghc pulls in the needed libraries
-ghc-dynamic: missing-dependency-on-libc
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2014-02-05 10:49:39.629531239 +0000
+++ new-ghc/rules	2014-02-05 10:49:39.653531239 +0000
@@ -145,7 +145,6 @@
 
 FILES = \( -type f -o -type l \)
 PROF_FILE = \( -name "*.p_*" -o -name "lib*_p.a" \)
-DYNAMIC_FILE = \( -name "*.dyn_hi" -o -name lib*.so \)
 
 install: install-stamp
 install-stamp: build-stamp
@@ -246,15 +245,12 @@
 	find debian/tmp/usr/bin $(FILES) ! -name haddock  > 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) ! $(DYNAMIC_FILE) >> debian/ghc.install
+	find debian/tmp/usr/lib/ghc $(FILES) ! $(PROF_FILE) >> debian/ghc.install
 	find debian/tmp/var				 >> debian/ghc.install
 	echo debian/tmp/usr/share/lintian/overrides/ghc >> debian/ghc.install
 	# 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
-	# ghc-dynamic
-	find debian/tmp/usr/lib $(FILES) $(DYNAMIC_FILE) > debian/ghc-dynamic.install
-	echo debian/lintian-overrides/ghc-dynamic /usr/share/lintian/overrides >> debian/ghc-dynamic.install
 	# haddock
 	echo usr/bin/haddock				 > debian/ghc-haddock.install
 	find debian/tmp/usr/share/haddock-* $(FILES)	 >> debian/ghc-haddock.install