[Pkg-haskell-commits] darcs: haskell-shake: New upstream release

[Joachim Breitner]

Sat Jun 13 14:33:52 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog +6
    M ./control -3 +12
    M ./copyright -3 +1
    R ./libghc-shake-data.linktrees
    M ./rules -15 +4

Sat Jun 13 14:33:52 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-haskell-shake/changelog new-haskell-shake/changelog
--- old-haskell-shake/changelog	2015-06-13 14:45:23.382963499 +0000
+++ new-haskell-shake/changelog	2015-06-13 14:45:23.390963501 +0000
@@ -1,3 +1,9 @@
+haskell-shake (0.15.2+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 13 Jun 2015 15:35:21 +0200
+
 haskell-shake (0.13.2+dfsg-5) unstable; urgency=medium
 
   * Upload to unstable
diff -rN -u old-haskell-shake/control new-haskell-shake/control
--- old-haskell-shake/control	2015-06-13 14:45:23.382963499 +0000
+++ new-haskell-shake/control	2015-06-13 14:45:23.386963500 +0000
@@ -17,14 +17,22 @@
   , libghc-utf8-string-dev (>= 0.3)
   , libghc-utf8-string-prof
   , libghc-quickcheck2-dev (>= 2.0)
-  , dh-linktree
-  , libjs-jquery
-  , libjs-jquery-flot
+  , libghc-js-jquery-dev
+  , libghc-js-jquery-data
+  , libghc-js-jquery-prof
+  , libghc-js-flot-dev
+  , libghc-js-flot-data
+  , libghc-js-flot-prof
+  , libghc-extra-dev
+  , libghc-extra-prof
 Build-Depends-Indep: ghc-doc
   , libghc-hashable-doc
   , libghc-random-doc
   , libghc-unordered-containers-doc
   , libghc-utf8-string-doc
+  , libghc-js-jquery-doc
+  , libghc-js-flot-doc
+  , libghc-extra-doc
 Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/shake
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-shake
@@ -86,6 +94,7 @@
 Architecture: all
 Depends: ${haskell:Depends}
   , ${misc:Depends}
+  , ${haskell:Extra-Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
diff -rN -u old-haskell-shake/copyright new-haskell-shake/copyright
--- old-haskell-shake/copyright	2015-06-13 14:45:23.382963499 +0000
+++ new-haskell-shake/copyright	2015-06-13 14:45:23.386963500 +0000
@@ -5,9 +5,7 @@
 # Disable viz.js; it's hard to provide source for this
 # see https://github.com/ndmitchell/shake/issues/100
 # and https://github.com/ndmitchell/shake/commit/3613e6
-# Also disable jquery and jquery.flot as we're going to replace them using
-# dh_linktree anyway.
-Files-Excluded: html/jquery*.js html/viz.js js-src/*
+Files-Excluded: html/viz.js
 
 Files: *
 Copyright: 2011-2014 Neil Mitchell
diff -rN -u old-haskell-shake/libghc-shake-data.linktrees new-haskell-shake/libghc-shake-data.linktrees
--- old-haskell-shake/libghc-shake-data.linktrees	2015-06-13 14:45:23.382963499 +0000
+++ new-haskell-shake/libghc-shake-data.linktrees	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-embed usr/share/javascript/jquery/jquery.js usr/share/shake/html/jquery.js
-embed usr/share/javascript/jquery-flot/jquery.flot.js usr/share/shake/html/jquery.flot.js
-embed usr/share/javascript/jquery-flot/jquery.flot.stack.js usr/share/shake/html/jquery.flot.stack.js
diff -rN -u old-haskell-shake/rules new-haskell-shake/rules
--- old-haskell-shake/rules	2015-06-13 14:45:23.382963499 +0000
+++ new-haskell-shake/rules	2015-06-13 14:45:23.386963500 +0000
@@ -2,34 +2,23 @@
 
 DEB_UPSTREAM_URL = http://hackage.haskell.org/package/shake-$(DEB_UPSTREAM_TARBALL_VERSION)
 DEB_UPSTREAM_PACKAGE := shake
-DEB_UPSTREAM_REPACKAGE_EXCLUDES := ./html/jquery*.js ./html/viz.js ./js-src/
+DEB_UPSTREAM_REPACKAGE_EXCLUDES := ./html/viz.js
 DEB_UPSTREAM_REPACKAGE_DELIMITER := +
 DEB_SETUP_GHC_CONFIGURE_ARGS := --datasubdir=/usr/share/shake
-DEB_ENABLE_TESTS := $(shell test -e /usr/lib/ghc/bin/ghci && echo yes)
+DEB_ENABLE_TESTS := $(shell test -e /usr/bin/ghci && echo yes)
 DEB_GHC_EXTRA_PACKAGES := libghc-shake-data (>= $(CABAL_VERSION))
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-html/jquery.js: /usr/share/javascript/jquery/jquery.js
-	ln -sf $< $@
-
-html/jquery.flot.js: /usr/share/javascript/jquery-flot/jquery.flot.js
-	ln -sf $< $@
-
-html/jquery.flot.stack.js: /usr/share/javascript/jquery-flot/jquery.flot.stack.js
-	ln -sf $< $@
-
 html/viz.js:
 	touch $@
 
 # Create versions of the files we stripped from the upstream tarball that
 # are good enough to pass tests.
-check-ghc-stamp: html/jquery.js html/jquery.flot.js html/jquery.flot.stack.js html/viz.js
+check-ghc-stamp: html/viz.js
 
 install/libghc-shake-data:: debian/tmp-inst-ghc
 	mv debian/tmp-inst-ghc/usr/share/shake debian/libghc-shake-data/usr/share
-
-binary-post-install/libghc-shake-data::
-	dh_linktree -p$(cdbs_curpkg)
+	dh_haskell_depends -plibghc-shake-data # for haskell:Extra-Depends substvar