[Pkg-haskell-commits] darcs: gitit: Using new data package trackers.

[Giovanni Mascellani]

Mon Jul 25 22:46:06 UTC 2011  Giovanni Mascellani <gio at debian.org>
  * Using new data package trackers.
  Ignore-this: 3c6b8daccc177e3371ecffa2e18cbcf2

    M ./changelog +6
    M ./control -7 +7
    M ./rules -6 +3

Mon Jul 25 22:46:06 UTC 2011  Giovanni Mascellani <gio at debian.org>
  * Using new data package trackers.
  Ignore-this: 3c6b8daccc177e3371ecffa2e18cbcf2
diff -rN -u old-gitit//changelog new-gitit//changelog
--- old-gitit//changelog	2011-07-25 22:48:49.636669628 +0000
+++ new-gitit//changelog	2011-07-25 22:48:49.636669628 +0000
@@ -1,3 +1,9 @@
+gitit (0.8.0.1-3) UNRELEASED; urgency=low
+
+  * Using new data package trackers.
+
+ -- Giovanni Mascellani <gio at debian.org>  Tue, 26 Jul 2011 00:20:06 +0200
+
 gitit (0.8.0.1-2) unstable; urgency=low
 
   * Added manpage for gitit (closes: #631809).
diff -rN -u old-gitit//control new-gitit//control
--- old-gitit//control	2011-07-25 22:48:49.629359199 +0000
+++ new-gitit//control	2011-07-25 22:48:49.636669628 +0000
@@ -5,13 +5,13 @@
 Uploaders: Giovanni Mascellani <gio at debian.org>
 Build-Depends:
  debhelper (>= 7),
- haskell-devscripts (>= 0.7),
+ haskell-devscripts (>= 0.8.8),
  cdbs,
  ghc,
  pandoc (>= 1.8),
  xsltproc,
  docbook-xsl,
- libghc-pandoc-dev (>= 1.8),
+ libghc-pandoc-dev (>= 1.8.1.1-2),
  libghc-pandoc-types-dev (>= 1.8),
  libghc-safe-dev,
  libghc-parsec3-dev,
@@ -25,8 +25,8 @@
  libghc-http-dev (>= 4000.0),
  libghc-hstringtemplate-dev (>= 0.6),
  libghc-recaptcha-dev (>= 0.1),
- libghc-filestore-dev (>= 0.4.0.2),
- libghc-filestore-data (>= 0.4.0.2),
+ libghc-filestore-dev (>= 0.4.0.3-2),
+ libghc-filestore-data (>= 0.4.0.3-2),
  libghc-zlib-dev (>= 0.5),
  libghc-url-dev (>= 2.1),
  libghc-happstack-server-dev (>= 6.0),
@@ -39,7 +39,7 @@
  libghc-json-dev (>= 0.4)
 Build-Depends-Indep:
  ghc-doc,
- libghc-pandoc-doc (>= 1.8),
+ libghc-pandoc-doc (>= 1.8.1.1-2),
  libghc-pandoc-types-doc (>= 1.8),
  libghc-safe-doc,
  libghc-parsec3-doc,
@@ -53,7 +53,7 @@
  libghc-http-doc (>= 4000.0),
  libghc-hstringtemplate-doc (>= 0.6),
  libghc-recaptcha-doc (>= 0.1),
- libghc-filestore-doc (>= 0.4.0.2),
+ libghc-filestore-doc (>= 0.4.0.3-2),
  libghc-zlib-doc (>= 0.5),
  libghc-url-doc (>= 2.1),
  libghc-happstack-server-doc (>= 6.0),
@@ -72,9 +72,9 @@
 Package: gitit
 Architecture: any
 Depends:
+ ${haskell:Data-Depends},
  ${misc:Depends},
  ${shlibs:Depends},
- ${gitit:Depends},
  libjs-jquery,
  libjs-jquery-ui
 Description: Wiki engine backed by a git or darcs filestore
diff -rN -u old-gitit//rules new-gitit//rules
--- old-gitit//rules	2011-07-25 22:48:49.581430614 +0000
+++ new-gitit//rules	2011-07-25 22:48:49.641557541 +0000
@@ -3,9 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-PANDOC_DEP := $(shell dpkg -p pandoc | grep ^Version: | cut -d' ' -f2)
-FILESTORE_DEP := $(shell dpkg -p libghc-filestore-data | grep ^Version: | cut -d' ' -f2)
-
 MANPAGES := gitit.1 expireGititCache.1
 DEB_INSTALL_MANPAGES_gitit := $(MANPAGES)
 
@@ -27,14 +24,14 @@
 	dh_link -pgitit /usr/share/javascript/jquery/jquery.min.js usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery.min.js
 	dh_link -pgitit /usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/gitit-$(CABAL_VERSION)/data/static/js/jquery-ui.packed.js
 
-	# Generate dependencies against data packages
-	echo "gitit:Depends=pandoc (= ${PANDOC_DEP}), libghc-filestore-data (= ${FILESTORE_DEP})" >> debian/gitit.substvars
-
 	# Removes a few files, that are not necessary and make lintian cry
 	rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/data/post-update
 	rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/BLUETRIP-LICENSE
 	rm -f debian/gitit/usr/share/gitit-$(CABAL_VERSION)/YUI-LICENSE
 
+	# Build data packages depends
+	dh_haskell_depends -pgitit
+
 # Not used at the moment
 #install/libghc-gitit-dev:: debian/tmp-inst-ghc
 #	# Generate dependencies against data packages