[Pkg-javascript-commits] [jquery] 05/07: move pre-upload check out of debian/rules

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository jquery.

commit d231884b0f0b5aa82a707890aa4013e2964a7b4c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 28 22:31:40 2015 -0300

    move pre-upload check out of debian/rules
---
 debian/release-check | 12 +++++++++++-
 debian/rules         |  8 --------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/release-check b/debian/release-check
index de18d6d..236f218 100755
--- a/debian/release-check
+++ b/debian/release-check
@@ -2,8 +2,18 @@
 
 set -e
 
+tmpdir=$(mktemp -d)
+cleanup() {
+  rm -rf "$tmpdir"
+}
+trap cleanup INT TERM EXIT
+
+version=$(dpkg-parsechangelog -SVersion | cut -d + -f 1)
+wget --directory-prefix=$tmpdir http://code.jquery.com/jquery-${version}.js
+
+./debian/rules dist/jquery.js
 rc=0
-./debian/rules diff || rc=$?
+diff -u $tmpdir/jquery-${version}.js dist/jquery.js || rc=$?
 ./debian/rules clean
 
 if [ "$rc" -ne 0 ]; then
diff --git a/debian/rules b/debian/rules
index 0699d0d..ac34a3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,13 +26,5 @@ override_dh_auto_clean:
 	$(RM) build.js
 	dh_auto_clean
 
-# used by the maintainer to check whether our build matches the one from
-# upstream
-diff: dist/jquery.js
-	tmpdir=$$(mktemp -d); \
-		wget --directory-prefix=$$tmpdir \
-			http://code.jquery.com/jquery-$(version).js; \
-		diff -u $$tmpdir/jquery-$(version).js dist/jquery.js
-
 %:
 	dh $@

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