[Pkg-javascript-commits] [jquery] 03/04: Update packaging for 3.1.1

[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 3ab2aae8507b3398152539a600e8b22e995c0cc8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Oct 16 14:35:15 2016 -0200

    Update packaging for 3.1.1
---
 debian/build.js                           |  8 ++++----
 debian/changelog                          |  9 +++++++++
 debian/rules                              | 11 +++++++++--
 debian/tests/check-against-upstream-build |  1 +
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/debian/build.js b/debian/build.js
index 9732def..b646697 100644
--- a/debian/build.js
+++ b/debian/build.js
@@ -11,8 +11,8 @@
   // Avoid breaking semicolons inserted by r.js
   skipSemiColonInsertion: true,
   wrap: {
-    startFile: "src/intro.js",
-    endFile: [ "src/exports/global.js", "src/outro.js" ]
+    startFile: "start.js",
+    endFile: "end.js"
   },
   paths: {
     sizzle: "../external/sizzle/dist/sizzle"
@@ -36,7 +36,7 @@
         .replace( /define\([\w\W]*?return/, "var " + (/var\/([\w-]+)/.exec(name)[1]) + " =" )
         .replace( rdefineEnd, "" );
     // Sizzle treatment
-    } else if ( /^sizzle$/.test( name ) ) {
+    } else if ( /\/sizzle$/.test( name ) ) {
       contents = "var Sizzle =\n" + contents
         // Remove EXPOSE lines from Sizzle
         .replace( /\/\/\s*EXPOSE[\w\W]*\/\/\s*EXPOSE/, "return Sizzle;" );
@@ -58,7 +58,7 @@
 
       // Remove define wrappers, closure ends, and empty declarations
       contents = contents
-        .replace( /define\([^{]*?{/, "" )
+        .replace( /define\([^{]*?{\s*(?:("|')use strict\1(?:;|))?/, "" )
           .replace( rdefineEnd, "" );
 
           // Remove anything wrapped with
diff --git a/debian/changelog b/debian/changelog
index 8ef42b0..7f01156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jquery (3.1.1-1) unstable; urgency=medium
+
+  * Uploading jQuery 3.x to unstable
+  * New upstream version 3.1.1
+  * debian/rules, debian/build.js: adapt Debian build to changes in upstream
+    build
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sun, 16 Oct 2016 14:34:46 -0200
+
 jquery (3.0.0~beta1-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 8d968b8..81f48b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,17 @@ override_dh_auto_build: dist/jquery.js dist/jquery.min.js dist/jquery.min.map
 build.js: debian/build.js
 	cp $< $@
 
-dist/jquery.js: build.js $(source)
+dist/jquery.js: start.js end.js build.js $(source)
 	nodejs /usr/lib/nodejs/r.js -o build.js
 	sed -i -e 's/@DATE/$(timestamp)/; s/@VERSION/$(version)/' $@
 	@echo "Checking syntax of $@ ..."
-	@nodejs --check $@ || (mv $@ $@.failed; false)
+	nodejs --check $@ || (mv $@ $@.failed; false)
+
+start.js: src/wrapper.js
+	sed -e '/^\/\*\s*eslint-/d; /^\/\/ @CODE/,$$ d' $< > $@ || ($(RM) $@; false)
+
+end.js: src/wrapper.js
+	sed -e '1,/^\/\/ @CODE/ d; /\/\/ build.js inserts compiled jQuery here/d' $< > $@ || ($(RM) $@; false)
 
 dist/jquery.min.js dist/jquery.min.map: dist/jquery.js
 	./debian/minify $^
@@ -27,6 +33,7 @@ override_dh_auto_test:
 override_dh_auto_clean:
 	$(RM) -rf dist/
 	$(RM) build.js
+	$(RM) start.js end.js
 	dh_auto_clean
 
 %:
diff --git a/debian/tests/check-against-upstream-build b/debian/tests/check-against-upstream-build
index ee46481..02ec0f1 100755
--- a/debian/tests/check-against-upstream-build
+++ b/debian/tests/check-against-upstream-build
@@ -25,5 +25,6 @@ fi
 
 diff --ignore-blank-lines \
   --ignore-matching-lines=Date:.*Z \
+  --ignore-matching-lines='^\s*"use strict";\s*$' \
   -u "$upstream_build" "$build"
 

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