[Pkg-javascript-commits] [jquery] 08/16: debian/build.js: adapt to changes in upstream build system

[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 8c0a2e848d7583655706eec697ff9b11a9a4e326
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Apr 9 14:15:22 2016 -0300

    debian/build.js: adapt to changes in upstream build system
---
 debian/build.js  | 5 ++++-
 debian/changelog | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/build.js b/debian/build.js
index 1b20d62..9732def 100644
--- a/debian/build.js
+++ b/debian/build.js
@@ -28,7 +28,7 @@
    * @param {String} contents The contents to be written (including their AMD wrappers)
    */
   onBuildWrite: function( name, path, contents ) {
-    var rdefineEnd = /\}\);[^}\w]*$/;
+    var rdefineEnd = /\}\s*?\);[^}\w]*$/;
     var amdName;
     // Convert var modules
     if ( /.\/var\//.test( path ) ) {
@@ -42,6 +42,9 @@
         .replace( /\/\/\s*EXPOSE[\w\W]*\/\/\s*EXPOSE/, "return Sizzle;" );
 
     } else {
+      contents = contents
+        .replace( /\s*return\s+[^\}]+(\}\s*?\);[^\w\}]*)$/, "$1" )
+
 
       // Ignore jQuery's exports (the only necessary one)
       if ( name !== "jquery" ) {
diff --git a/debian/changelog b/debian/changelog
index e0409c0..eb09030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ jquery (3.0.0~beta1-1) UNRELEASED; urgency=medium
     - debian/watch: remove version mangling options.
     - debian/rules: updated version number parsing
     - debian/tests/check-against-upstream-build: updated version number parsing
+  * debian/build.js: adapt to changes in upstream build system
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 09 Apr 2016 11:06:39 -0300
 

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