[Pkg-javascript-commits] [jquery] 07/18: Adapt debian/rules to curren times

[Antonio Terceiro]

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

terceiro pushed a commit to branch debian/1.x
in repository jquery.

commit b65f2aacc810a2bd9d2cacbba0396b78631ef48f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Apr 8 19:08:18 2016 -0300

    Adapt debian/rules to curren times
---
 debian/changelog | 4 ++++
 debian/rules     | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f44494..94e2fb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ jquery (1.12.3-1) UNRELEASED; urgency=medium
     debian/copyright.
     - debian/watch: remove version mangling options.
   * Copy and adapt autopkgtest tests from experimental branch
+  * debian/rules:
+    - change date formatting to cope with changes in output of `date
+      --iso-8601=m` starting with coreutils 8.25
+    - drop workaround for bug in upstream build that has been fixed
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 08 Apr 2016 18:24:58 -0300
 
diff --git a/debian/rules b/debian/rules
index d01667a..82c31d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 source = $(shell find src/ -name '*.js')
-timestamp = $(shell date --iso-8601=minutes --utc --date="$(shell dpkg-parsechangelog -S Date)" | sed -e 's/+0000/Z/')
+timestamp = $(shell date --iso-8601=minutes --utc --date="$(shell dpkg-parsechangelog -S Date)" | sed -e 's/+00:?00/Z/')
 version = $(shell dpkg-parsechangelog -SVersion | cut -d + -f 1)
 
 override_dh_auto_build: dist/jquery.js dist/jquery.min.js dist/jquery.min.map
@@ -13,7 +13,6 @@ build.js: debian/build.js
 dist/jquery.js: build.js $(source)
 	nodejs /usr/lib/nodejs/r.js -o build.js
 	sed -i -e 's/@DATE/$(timestamp)/; s/@VERSION/$(version)/' $@
-	sed -i -e 's/\/\/"use strict";/\/\//' $@
 
 dist/jquery.min.js dist/jquery.min.map: dist/jquery.js
 	uglifyjs \

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