[DHG_packages] 01/01: Use the extra-depends feature properly

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository DHG_packages.

commit a7a9bbb7341e6736523d01a85512a9e70816b715
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Jan 23 22:47:02 2016 +0100

    Use the extra-depends feature properly
    
    and make sure libghc-gitit-data has a proper blurb attached
    (dh_haskell_blurbs does not do that).
---
 p/gitit/debian/control | 10 +++++-----
 p/gitit/debian/rules   |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/p/gitit/debian/control b/p/gitit/debian/control
index 365fecc..16b3a7d 100644
--- a/p/gitit/debian/control
+++ b/p/gitit/debian/control
@@ -188,11 +188,10 @@ X-Description: Wiki engine backed by a git or darcs filestore
 Package: gitit
 Architecture: any
 Section: web
-Depends: ${haskell:Extra-Depends},
+Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  libghc-gitit-data (= ${source:Version}),
- libghc-filestore-data,
  git | darcs | mercurial,
 Recommends: mime-support,
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
@@ -203,7 +202,6 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
 Package: libghc-gitit-dev
 Architecture: any
 Depends: ${haskell:Depends},
- ${haskell:Extra-Depends},
  ${misc:Depends},
  ${shlibs:Depends},
  libghc-gitit-data (= ${source:Version}),
@@ -243,11 +241,13 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
 Package: libghc-gitit-data
 Architecture: all
 Depends: ${misc:Depends},
+ ${haskell:Extra-Depends},
 Recommends: ${haskell:Recommends},
 Suggests: ${haskell:Suggests},
 Breaks: gitit (<< 0.10.6.3+dfsg-1),
 Replaces: gitit (<< 0.10.6.3+dfsg-1),
-Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+Description: ${haskell:ShortDescription} - Data files
  ${haskell:LongDescription}
  .
- ${haskell:Blurb}
+ This package contains auxillary data files to be used with gitit or
+ libghc-gitit-dev.
diff --git a/p/gitit/debian/rules b/p/gitit/debian/rules
index efa671f..cdb30f7 100755
--- a/p/gitit/debian/rules
+++ b/p/gitit/debian/rules
@@ -18,5 +18,9 @@ endif
 
 build/gitit:: $(MANPAGES)
 
+install/libghc-gitit-data::
+	dh_haskell_depends -plibghc-gitit-data # for haskell:Extra-Depends substvar
+
+
 binary-post-install/libghc-gitit-data::
 	chmod +x debian/libghc-gitit-data/usr/share/gitit/data/post-update

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git