[Pkg-javascript-commits] [jquery] 01/16: Stop pulling compat branch

[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 3bfeed6c008e85cbda38090c48dbab667fabf67c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Apr 9 11:12:59 2016 -0300

    Stop pulling compat branch
---
 debian/README.source.md | 24 ------------------------
 debian/copyright        |  1 +
 debian/prepare-tarball  | 41 -----------------------------------------
 debian/watch            |  5 ++---
 4 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/debian/README.source.md b/debian/README.source.md
deleted file mode 100644
index acd247a..0000000
--- a/debian/README.source.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Starting with version 3.0, jQuery is distributed in two flavors:
-
-* the main one, which is targetted at modern browsers and non-browser
-  environments;
-* the "compat" branch, which still supports browsers that are considered
-  obsolete, such as IE8.
-
-These flavors are very similar to each other, and are released in lockstep, so
-there is no much sense in having two separate source packages. So this is how
-this package is handled:
-
-* take the original tarball for main jQuery release from the github releases
-  page.
-* remove dist/, which contains a pre-built jquery.js, jquery.min.js, and
-  jquery.min.map
-* remove unecessary embedded code copies from external/
-* add the src/ directory from the compat branch original tarball
-
-This process is automated in `debian/watch` and `debian/prepare-tarball`, so
-that when you run `uscan` to get a new upstream release, the resulting tarball
-is ready to be used.
-
-For the build process, see `debian/rules`, `debian/build.js` and
-`debian/minify`.
diff --git a/debian/copyright b/debian/copyright
index 9948841..c2d381e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: jQuery
 Source: http://jquery.com/
 Comment: For more details on developers please see http://docs.jquery.com/Contributors
+Files-Excluded: dist external/npo external/qunit external/qunit-assert-step external/requirejs external/sinon
 
 Files: *
 Copyright: 2005-2011 John Resig, Brandon Aaron & Jörn Zaefferer
diff --git a/debian/prepare-tarball b/debian/prepare-tarball
deleted file mode 100755
index a49ca1e..0000000
--- a/debian/prepare-tarball
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-debian_version="$2"
-upstream_version=$(echo "$debian_version" | sed -e 's/~/-/; s/[+]dfsg//')
-
-# absolute path
-tarball=$(readlink -f "$3")
-
-tmpdir=$(mktemp -d)
-cleanup() {
-  rm -rf "$tmpdir"
-}
-trap cleanup INT TERM EXIT
-
-cd "$tmpdir"
-wget https://github.com/jquery/jquery/archive/${upstream_version}+compat.tar.gz
-
-# extract compat branch tarball
-tar xaf ${upstream_version}+compat.tar.gz
-
-# extract main tarball
-tar xaf "$tarball"
-
-# add source for compat branch
-cp -r jquery-${upstream_version}-compat/src jquery-${upstream_version}/src-compat
-
-# remove embedded copies and pre-built files
-(
-  cd jquery-${upstream_version}/
-  rm -rf dist/
-  rm -rf external/npo/
-  rm -rf external/qunit/
-  rm -rf external/requirejs/
-  rm -rf external/sinon/
-)
-
-# recompress
-rm -f "$tarball"
-tar caf "$tarball" jquery-${upstream_version}
diff --git a/debian/watch b/debian/watch
index 536b07e..e9adc07 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts="dversionmangle=s/[+]dfsg(.?\d+)?$//,uversionmangle=s/-/~/;s/$/+dfsg/" \
-https://github.com/jquery/jquery/releases \
-  .*/([0-9][0-9a-z.-]+)\.tar\.gz debian debian/prepare-tarball
+opts="uversionmangle=s/-/~/;" \
+https://github.com/jquery/jquery/releases .*/([0-9][0-9a-z.-]+)\.tar\.gz

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