[Pkg-javascript-commits] [jquery] 05/16: Drop `compat` branch
Antonio Terceiro
terceiro at moszumanska.debian.org
Sat Apr 9 17:32:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository jquery.
commit de84874bf41ee52295fb6c3452e8e2ee0ac498ae
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sat Apr 9 11:21:26 2016 -0300
Drop `compat` branch
---
debian/changelog | 3 +++
debian/control | 5 -----
debian/install | 2 --
debian/release-check | 4 ++--
debian/rules | 17 +++++-----------
debian/tests/check-against-upstream-build | 34 +++++++------------------------
debian/tests/check-minification | 2 +-
7 files changed, 18 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1d214e5..e0409c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
jquery (3.0.0~beta1-1) UNRELEASED; urgency=medium
* New upstream release
+ - Drop `compat` branch, which has also been dropped upstream.
+ See http://blog.jquery.com/2016/01/14/jquery-3-0-beta-released/
+ for details
* Drop the version number mangling to add a `+dfsg` suffix. First the
changes from upstream are not due to the DFSG, but are removing pre-built
Javascript files, which is not a problem according to the DFSG, but a
diff --git a/debian/control b/debian/control
index 18e56cf..5ab5255 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Architecture: all
Multi-Arch: foreign
Conflicts: jquery
Replaces: jquery
-Provides: libjs-jquery-compat
Breaks: movabletype-opensource (<< 5.1.4+dfsg-3~)
Depends: ${misc:Depends}
Recommends: javascript-common
@@ -29,7 +28,3 @@ Description: JavaScript library for dynamic web applications
traverse HTML documents, handle events, perform animations, and add Ajax
interactions to your web pages. jQuery is designed to change the way
that you write JavaScript.
- .
- This package provides both the regular branch of jQuery, optimized for modern
- browsers and non-browser environments, and the jquery-compat branch, which
- retains compatibility with older browsers such as Internet Explorer 8.
diff --git a/debian/install b/debian/install
index 79e95ea..803ea94 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,2 @@
dist/*.js /usr/share/javascript/jquery
dist/*.map /usr/share/javascript/jquery
-dist-compat/*.js /usr/share/javascript/jquery-compat
-dist-compat/*.map /usr/share/javascript/jquery-compat
diff --git a/debian/release-check b/debian/release-check
index cc98101..476dce5 100755
--- a/debian/release-check
+++ b/debian/release-check
@@ -4,7 +4,7 @@ set -e
./debian/rules override_dh_auto_build
rc=0
-./debian/tests/check-against-upstream-build dist/jquery.js dist-compat/jquery.js || rc=$?
-./debian/tests/check-minification dist/jquery.min.js dist-compat/jquery.min.js || rc=$?
+./debian/tests/check-against-upstream-build dist/jquery.js || rc=$?
+./debian/tests/check-minification dist/jquery.min.js || rc=$?
./debian/rules clean
exit $rc
diff --git a/debian/rules b/debian/rules
index df97e73..6967902 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,24 @@
#!/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/')
version = $(shell dpkg-parsechangelog -SVersion | cut -d - -f 1 | sed 's/~/-/')
-dist = dist/jquery.js dist/jquery.min.js dist/jquery.min.map
-dist_compat = dist-compat/jquery.js dist-compat/jquery.min.js dist-compat/jquery.min.map
-
-override_dh_auto_build: $(dist) $(dist_compat)
+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 dist-compat/jquery.js: %/jquery.js: build.js $(shell find $* -name '*.js')
- INPUT=$$(echo $* | sed -e 's/dist/src/') \
- OUTPUT=$@ \
- nodejs /usr/lib/nodejs/r.js -o 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)/' $@
dist/jquery.min.js dist/jquery.min.map: dist/jquery.js
./debian/minify $^
-dist-compat/jquery.min.js dist-compat/jquery.min.map: dist-compat/jquery.js
- ./debian/minify $^
-
override_dh_auto_clean:
- $(RM) -rf dist/ dist-compat/
+ $(RM) -rf dist/
$(RM) build.js
dh_auto_clean
diff --git a/debian/tests/check-against-upstream-build b/debian/tests/check-against-upstream-build
index 886042d..c29c60c 100755
--- a/debian/tests/check-against-upstream-build
+++ b/debian/tests/check-against-upstream-build
@@ -6,14 +6,9 @@ set -ex
version=$(dpkg-parsechangelog -SVersion | cut -d - -f 1 | sed 's/~/-/')
-main_build="$1"
-if [ -z "$main_build" ]; then
- main_build='/usr/share/javascript/jquery/jquery.js'
-fi
-
-compat_build="$2"
-if [ -z "$compat_build" ]; then
- compat_build='/usr/share/javascript/jquery-compat/jquery.js'
+build="$1"
+if [ -z "$build" ]; then
+ build='/usr/share/javascript/jquery/jquery.js'
fi
upstream_cache="$ADTTMP"
@@ -21,29 +16,14 @@ if [ -z "$upstream_cache" ]; then
upstream_cache=$HOME/.cache/jquery-debian
mkdir -p "$upstream_cache"
fi
-upstream_main_build=$upstream_cache/jquery-${version}.js
-upstream_compat_build=$upstream_cache/jquery-compat-${version}.js
+upstream_build=$upstream_cache/jquery-${version}.js
-if [ ! -f "$upstream_main_build" ]; then
- wget --output-document="$upstream_main_build" \
+if [ ! -f "$upstream_build" ]; then
+ wget --output-document="$upstream_build" \
http://code.jquery.com/jquery-${version}.js
fi
-if [ ! -f "$upstream_compat_build" ]; then
- wget --output-document="$upstream_compat_build" \
- http://code.jquery.com/jquery-compat-${version}.js
-fi
-
-# main branch
-main_rc=0
-diff --ignore-blank-lines \
- --ignore-matching-lines=Date:.*Z \
- -u "$upstream_main_build" "$main_build" || main_rc=$?
-
-# compat branch
-compat_rc=0
diff --ignore-blank-lines \
--ignore-matching-lines=Date:.*Z \
- -u "$upstream_compat_build" "$compat_build" || compat_rc=$?
+ -u "$upstream_build" "$build"
-test "$main_rc" -eq 0 -a "$compat_rc" -eq 0
diff --git a/debian/tests/check-minification b/debian/tests/check-minification
index f84c227..15f13de 100755
--- a/debian/tests/check-minification
+++ b/debian/tests/check-minification
@@ -5,7 +5,7 @@ set -e
rc=0
if [ $# -eq 0 ]; then
- eval set -- /usr/share/javascript/jquery/jquery.min.js /usr/share/javascript/jquery-compat/jquery.min.js
+ eval set -- /usr/share/javascript/jquery/jquery.min.js
fi
for minjs in "$@"; do
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/jquery.git
More information about the Pkg-javascript-commits
mailing list