[Pkg-haskell-commits] darcs: tools: Adjust template-debian/ and diff-upgrade to new hackage layout (and simpler watch file, yay!)

[Joachim Breitner]

Sat Oct  5 15:48:21 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Adjust template-debian/ and diff-upgrade to new hackage layout (and simpler watch file, yay!)

    M ./diff-upgrade.sh -1 +1
    M ./template-debian/watch -4 +1

Sat Oct  5 15:48:21 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Adjust template-debian/ and diff-upgrade to new hackage layout (and simpler watch file, yay!)
diff -rN -u old-tools/diff-upgrade.sh new-tools/diff-upgrade.sh
--- old-tools/diff-upgrade.sh	2013-10-05 15:48:46.985647819 +0000
+++ new-tools/diff-upgrade.sh	2013-10-05 15:48:47.065622128 +0000
@@ -47,7 +47,7 @@
 fi
 
 version="$(uscan --dehs --upstream-version 0 --watchfile watch --package $package --report-status|xpath -e 'dehs/upstream-version/text()' -q)"
-cabal_name="$(uscan --dehs --upstream-version 0 --watchfile watch --package $package --report-status|xpath -e 'dehs/upstream-url/text()' -q|cut -d/ -f6)"
+cabal_name="$(cat watch | grep http | cut -d/ -f5)"
 
 if [ -z "$version" ]
 then
diff -rN -u old-tools/template-debian/watch new-tools/template-debian/watch
--- old-tools/template-debian/watch	2013-10-05 15:48:46.981605392 +0000
+++ new-tools/template-debian/watch	2013-10-05 15:48:47.087043964 +0000
@@ -1,5 +1,2 @@
 version=3
-opts="downloadurlmangle=s|archive/([\w\d_-]+)/([\d\.]+)/|archive/$1/$2/$1-$2.tar.gz|,\
-filenamemangle=s|(.*)/$|foo-$1.tar.gz|" \
-    http://hackage.haskell.org/packages/archive/foo \
-    ([\d\.]*\d)/
+http://hackage.haskell.org/package/foo/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))