[Pkg-javascript-commits] [SCM] Jquery packages branch, master, updated. debian/1.7-1-4-g77c67aa

Wed May 23 02:56:45 UTC 2012

The following commit has been merged in the master branch:
commit 77c67aa92705d6dd454053716cfefa2faab7b3aa
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Tue May 22 21:29:28 2012 -0300

    Releasing debian version 1.7.2+debian-1

diff --git a/debian/changelog b/debian/changelog
index eabe311..c78ddb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jquery (1.7.2+debian-1) unstable; urgency=high
+
+  * Distfile does not contain complete source code (Closes: #665968)
+    + Repacking tarball to add necessary build files
+    + Using uglify to minify files
+    + Updating copyright file
+
+ -- Marcelo Jorge Vieira (metal) <metal at debian.org>  Tue, 22 May 2012 21:26:51 -0300
+
 jquery (1.7.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c042b17..1236cc3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: Marcelo Jorge Vieira (metal) <metal at debian.org>, Steve Kemp <skx at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), yui-compressor
+Build-Depends: debhelper (>= 7.0.50~), node-uglify
 Standards-Version: 3.9.3
 Homepage: http://jquery.com/
 Vcs-Browser: http://git.debian.org/?p=pkg-javascript/jquery.git
diff --git a/debian/copyright b/debian/copyright
index c3a62af..3d2d52d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,25 @@ Files: *
 Copyright: 2005-2011 John Resig, Brandon Aaron & Jörn Zaefferer
 License: GPL-2 or MIT
 
+Files: src/selector.js
+Copyright: 2011, The Dojo Foundation
+License: MIT or BSD or GPL-2
+
+Files: src/sizzle/*
+Copyright: 2011, The Dojo Foundation
+License: MIT or BSD or GPL-2
+
+Files: test/qunit/*
+Copyright: 2011, John Resig <jeresig at gmail.com>
+           2011, Jörn Zaefferer <joern.zaefferer at googlemail.com>
+License: GPL-2 or MIT
+
+Files: test/qunit/qunit.js
+Copyright: 2011, John Resig <jeresig at gmail.com>
+           2011, Jörn Zaefferer <joern.zaefferer at googlemail.com>
+           2008, Ariel Flesler <aflesler at gmail.com>
+License: GPL-2 or MIT, and BSD
+
 Files: debian/*
 Copyright: 2008 Steve Kemp <skx at debian.org>
            2010 Marcelo Jorge Vieira <metal at debian.org>
@@ -37,3 +56,29 @@ License: MIT
   LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: BSD
+  Copyright (c) 2009, John Resig
+  All rights reserved.
+  .
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY John Resig ''AS IS'' AND ANY
+  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..8406679
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,22 @@
+--- jquery.orig/Makefile	2012-05-22 11:55:47.000000000 -0300
++++ jquery/Makefile	2012-05-22 22:04:41.000000000 -0300
+@@ -5,8 +5,8 @@
+ PREFIX = .
+ DIST_DIR = ${PREFIX}/dist
+ 
+-JS_ENGINE ?= `which node nodejs 2>/dev/null`
+-COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
++JS_ENGINE ?= `which node 2>/dev/null || which nodejs 2>/dev/null`
++COMPILER = `which uglifyjs 2>/dev/null` --unsafe
+ POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
+ 
+ BASE_FILES = ${SRC_DIR}/core.js\
+@@ -42,7 +42,7 @@
+ JQ_VER = $(shell cat version.txt)
+ VER = sed "s/@VERSION/${JQ_VER}/"
+ 
+-DATE=$(shell git log -1 --pretty=format:%ad)
++DATE=$(shell date)
+ 
+ all: update_submodules core
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5879227
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build.patch
diff --git a/debian/rules b/debian/rules
index 5b95272..0a3b813 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,10 @@
 %:
 	dh $@
 
-override_dh_auto_build:
-	`yui-compressor dist/jquery.js -o dist/jquery.min.js`
-
 override_dh_auto_clean:
-	rm -f dist/jquery.min.js
+	rm -rf dist/
+	dh_clean
+
+override_dh_clean:
+	rm -rf dist/
+	dh_clean
diff --git a/debian/watch b/debian/watch
index 12ce75c..2eceded 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
+opts="dversionmangle=s/[+]debian(.?\d+)?$//" \
 http://docs.jquery.com/Downloading_jQuery \
   .*jquery-([\d\.]+).js

-- 
Jquery packages

