[Pkg-javascript-commits] [jquery] 03/07: move logic from debian/build.mk to 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 428c1c03162f75005541de01a622b5c9a9a73e39
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 28 22:23:45 2015 -0300

    move logic from debian/build.mk to debian/rules
---
 debian/build.mk  | 29 -----------------------------
 debian/changelog |  3 ++-
 debian/rules     | 31 +++++++++++++++++++++++++------
 3 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/debian/build.mk b/debian/build.mk
deleted file mode 100644
index 3ed907d..0000000
--- a/debian/build.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-source = $(shell find src/ -name '*.js')
-timestamp = $(shell date --iso-8601=minutes --utc --date="$(shell dpkg-parsechangelog -S Date)")
-version = $(shell dpkg-parsechangelog -SVersion | cut -d + -f 1)
-
-build: dist/jquery.js dist/jquery.min.js dist/jquery.min.map
-
-build.js: debian/build.js
-	cp $< $@
-
-dist/jquery.js: build.js $(source)
-	nodejs /usr/lib/nodejs/r.js -o build.js
-	sed -i -e 's/@DATE/$(timestamp)/; s/@VERSION/$(version)/' $@
-
-dist/jquery.min.js dist/jquery.min.map: dist/jquery.js
-	uglifyjs \
-		--source-map dist/jquery.min.map \
-		--source-map-url jquery.min.map \
-		--output dist/jquery.min.js \
-		$^
-
-diff: build
-	tmpdir=$$(mktemp -d); \
-		wget --directory-prefix=$$tmpdir \
-			http://code.jquery.com/jquery-$(version).js; \
-		diff -u $$tmpdir/jquery-$(version).js dist/jquery.js
-
-clean:
-	$(RM) -rf dist/
-	$(RM) build.js
diff --git a/debian/changelog b/debian/changelog
index ce6c565..6719173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jquery (1.11.3+dfsg-3) UNRELEASED; urgency=medium
 
-  * debian/build.mk: use node-requirejs to build, as intended by upstream
+  * move logic from debian/build.mk to debian/rules
+  * debian/rules: use node-requirejs to build, as does upstream
   * debian/build.js: turned into a node-requirejs build file
   * debian/control: Build-Depends: node-requirejs
 
diff --git a/debian/rules b/debian/rules
index d8cf450..0699d0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,38 @@
 #!/usr/bin/make -f
 
-export MAKE = make -f debian/build.mk
+source = $(shell find src/ -name '*.js')
+timestamp = $(shell date --iso-8601=minutes --utc --date="$(shell dpkg-parsechangelog -S Date)")
+version = $(shell dpkg-parsechangelog -SVersion | cut -d + -f 1)
 
-override_dh_auto_build:
-	make -f debian/build.mk
+override_dh_auto_build: dist/jquery.js dist/jquery.min.js dist/jquery.min.map
 	dh_auto_build
 
+build.js: debian/build.js
+	cp $< $@
+
+dist/jquery.js: build.js $(source)
+	nodejs /usr/lib/nodejs/r.js -o build.js
+	sed -i -e 's/@DATE/$(timestamp)/; s/@VERSION/$(version)/' $@
+
+dist/jquery.min.js dist/jquery.min.map: dist/jquery.js
+	uglifyjs \
+		--source-map dist/jquery.min.map \
+		--source-map-url jquery.min.map \
+		--output dist/jquery.min.js \
+		$^
+
 override_dh_auto_clean:
-	make -f debian/build.mk clean
+	$(RM) -rf dist/
+	$(RM) build.js
 	dh_auto_clean
 
 # used by the maintainer to check whether our build matches the one from
 # upstream
-diff:
-	make -f debian/build.mk $@
+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