haskell-shake: Remove html/jquery*.js and html/viz.js from upstream tarball.

6 files changed, 28 insertions, 37 deletions

diff --git a/p/haskell-shake/debian/changelog b/p/haskell-shake/debian/changelog
index 1c7b35b7b..1c8b6f5fd 100644
--- a/p/haskell-shake/debian/changelog
+++ b/p/haskell-shake/debian/changelog
@@ -1,4 +1,4 @@
-haskell-shake (0.13.1-1) UNRELEASED; urgency=low
+haskell-shake (0.13.1+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #751785)
 
diff --git a/p/haskell-shake/debian/clean b/p/haskell-shake/debian/clean
new file mode 100644
index 000000000..916abd067
--- /dev/null
+++ b/p/haskell-shake/debian/clean
@@ -0,0 +1,2 @@
+html/jquery*.js
+html/viz.js
diff --git a/p/haskell-shake/debian/copyright b/p/haskell-shake/debian/copyright
index a223fd571..aefa8d893 100644
--- a/p/haskell-shake/debian/copyright
+++ b/p/haskell-shake/debian/copyright
@@ -5,20 +5,14 @@ Source: http://hackage.haskell.org/package/shake
 # 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
-Files-Excluded: html/viz.js
+# 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: *
 Copyright: 2011-2014 Neil Mitchell
 License: BSD-3-clause
 
-Files: js-src/jquery-*.js
-Copyright: 2012 jQuery Foundation and other contributors
-License: MIT
-
-Files: js-src/flot-*.zip
-Copyright: 2007-2013 IOLA and Ole Laursen
-License: MIT
-
 Files: debian/*
 Copyright: 2014 Colin Watson
 License: BSD-3-clause
@@ -53,23 +47,3 @@ License: BSD-3-clause
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: MIT
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-  .
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/p/haskell-shake/debian/rules b/p/haskell-shake/debian/rules
index f7365fa16..07dbbf238 100755
--- a/p/haskell-shake/debian/rules
+++ b/p/haskell-shake/debian/rules
@@ -1,18 +1,35 @@
 #!/usr/bin/make -f
 
+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_DELIMITER := +
 DEB_SETUP_GHC_CONFIGURE_ARGS := --datasubdir=/usr/share/shake
 DEB_ENABLE_TESTS := 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
+
 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)
-
-# darcs can't version symlinks, so add this here.
-clean::
-	ln -sf ../../js-src/jquery-1.8.3.js debian/missing-sources/jquery.js
diff --git a/p/haskell-shake/debian/source/lintian-overrides b/p/haskell-shake/debian/source/lintian-overrides
deleted file mode 100644
index df0287847..000000000
--- a/p/haskell-shake/debian/source/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# The source for these files is in js-src/flot-0.8.0.zip.
-haskell-shake source: source-is-missing html/jquery.flot.js
-haskell-shake source: source-is-missing html/jquery.flot.stack.js
diff --git a/p/haskell-shake/debian/watch b/p/haskell-shake/debian/watch
index 49512754a..3d0fe938e 100644
--- a/p/haskell-shake/debian/watch
+++ b/p/haskell-shake/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://hackage.haskell.org/package/shake/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))