magic-haskell: Reincorporate 1.0.8-4.

* Reincorporate 1.0.8-4.
* debian/control: libghc6-magic-doc: Add ${haskell:Recommends} and
  Suggests variables.
* debian/control: libghc6-magic-doc: Replaces, Provides and Conflicts
  with magic-haskell-doc.
* debian/control: Include Haskell preface in Description:.
* debian/control: Remove mention to libhugs-magic.
* debian/control: Include -prof package.
* Rename -doc package.
* debian/control: Include Build-Depends-Indep: in ghc6-doc.

3 files changed, 51 insertions, 11 deletions

diff --git a/p/magic-haskell/debian/changelog b/p/magic-haskell/debian/changelog
index 1e76feb35..36b3a0656 100644
--- a/p/magic-haskell/debian/changelog
+++ b/p/magic-haskell/debian/changelog
@@ -1,3 +1,9 @@
+magic-haskell (1.0.8-6) UNRELEASED; urgency=low
+
+  * Reincorporate 1.0.8-4.
+
+ -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Sat, 07 Aug 2010 17:28:33 -0300
+
 magic-haskell (1.0.8-5) unstable; urgency=low
 
   * debian/control: Make libghc6-magic-doc conflict with magic-haskell-
@@ -8,12 +14,16 @@ magic-haskell (1.0.8-5) unstable; urgency=low
 
 magic-haskell (1.0.8-4) unstable; urgency=low
 
-  * Rename -doc package.
+  * debian/control: libghc6-magic-doc: Add ${haskell:Recommends} and
+    Suggests variables.
+  * debian/control: libghc6-magic-doc: Replaces, Provides and Conflicts
+    with magic-haskell-doc.
 
- -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Thu, 06 May 2010 20:40:12 -0300
+ -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Sun, 14 Mar 2010 17:30:59 -0300
 
 magic-haskell (1.0.8-3) unstable; urgency=low
 
+  [ Iain Lane ]
   * debian/control:
     + Disable hugs library as the DHG no longer supports Hugs, and it does not
       work with the new Cabal. (Closes: #571360)
@@ -22,7 +32,14 @@ magic-haskell (1.0.8-3) unstable; urgency=low
     + Clean up build-deps
     + Standards-Version bump to 3.8.4, no changes required
 
- -- Iain Lane <laney@ubuntu.com>  Thu, 11 Mar 2010 18:59:38 +0000
+  [ Marco Túlio Gontijo e Silva ]
+  * debian/control: Include Haskell preface in Description:.
+  * debian/control: Remove mention to libhugs-magic.
+  * debian/control: Include -prof package.
+  * Rename -doc package.
+  * debian/control: Include Build-Depends-Indep: in ghc6-doc.
+
+ -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Thu, 11 Mar 2010 17:57:34 -0300
 
 magic-haskell (1.0.8-2) unstable; urgency=low
 
diff --git a/p/magic-haskell/debian/control b/p/magic-haskell/debian/control
index 9e21221de..8a660fbf4 100644
--- a/p/magic-haskell/debian/control
+++ b/p/magic-haskell/debian/control
@@ -6,8 +6,10 @@ Build-Depends: debhelper (>= 6.0.0),
  cdbs,
  haskell-devscripts (>= 0.7),
  ghc6,
+ ghc6-prof,
  libmagic-dev
-Standards-Version: 3.9.0
+Build-Depends-Indep: ghc6-doc
+Standards-Version: 3.8.4
 Section: haskell
 Vcs-Git: git://git.debian.org/git/pkg-haskell/magic-haskell.git
 Vcs-Browser: http://git.debian.org/?p=pkg-haskell/magic-haskell.git;a=summary
@@ -20,13 +22,30 @@ Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
 Description: File type determination library for Haskell
+ This package provides a library for the Haskell programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
  This package provides a Haskell interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
  rather than its name.  The Haskell interface provides a full-featured
  binding.
+
+Package: libghc6-magic-prof
+Section: haskell
+Architecture: any
+Depends: ${misc:Depends}, ${haskell:Depends}, ${shlibs:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: File type determination library for Haskell; profiling libraries
+ This package provides a library for the Haskell programming language,
+ compiled for profiling.
+ See http://www.haskell.org/ for more information on Haskell.
  .
- This package is built for GHC.  A Hugs package is also available
- in libhugs-magic.
+ This package provides a Haskell interface to the C libmagic library.
+ With it, you can determine the type of a file by examining its contents
+ rather than its name.  The Haskell interface provides a full-featured
+ binding.
 
 #Package: libhugs-magic
 #Section: haskell
@@ -46,13 +65,17 @@ Package: libghc6-magic-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, ${haskell:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
 Provides: magic-haskell-doc
-Replaces: magic-haskell-doc (<< 1.0.8-4)
-Conflicts: magic-haskell-doc (<< 1.0.8-4)
-Description: File type determination library for Haskell
+Replaces: magic-haskell-doc
+Conflicts: magic-haskell-doc
+Description: File type determination library for Haskell; documentation
+ This package provides the documentation for a library for the Haskell
+ programming language.
+ See http://www.haskell.org/ for more information on Haskell.
+ .
  This package provides a Haskell interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
  rather than its name.  The Haskell interface provides a full-featured
  binding.
- .
- This package provides documentation for the Haskell magic binding.
diff --git a/p/magic-haskell/debian/magic-haskell-doc.docs b/p/magic-haskell/debian/libghc6-magic-doc.docs
index 4ed57822c..4ed57822c 100644
--- a/p/magic-haskell/debian/magic-haskell-doc.docs
+++ b/p/magic-haskell/debian/libghc6-magic-doc.docs