[Pkg-javascript-commits] [jquery] 01/04: Generating jquery minified from source again (Closes: #495178)

[Marcelo Jorge Vieira]

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

metal pushed a commit to branch master
in repository jquery.

commit b4ad3177ad1ec2192105d4d86930d8acd89230f8
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Thu Aug 1 21:24:16 2013 -0300

    Generating jquery minified from source again (Closes: #495178)
    
    Fixing build: Removed jshint from Makefile target and improving clean
---
 debian/control             |    2 +-
 debian/links               |    1 -
 debian/patches/build.patch |   11 +++++++++--
 debian/patches/no-min.diff |   11 -----------
 debian/patches/series      |    1 -
 debian/rules               |    1 +
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index c5b086d..0a82be3 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~)
+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/links b/debian/links
index cc74dcc..24a7630 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,2 @@
 /usr/share/javascript/jquery/jquery.min.js	/usr/share/javascript/jquery/jquery.pack.js
 /usr/share/javascript/jquery/jquery.min.js	/usr/share/javascript/jquery/jquery.lite.js
-/usr/share/javascript/jquery/jquery.js	/usr/share/javascript/jquery/jquery.min.js
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 8406679..b0bd0c8 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -1,5 +1,7 @@
+Index: jquery/Makefile
+===================================================================
 --- jquery.orig/Makefile	2012-05-22 11:55:47.000000000 -0300
-+++ jquery/Makefile	2012-05-22 22:04:41.000000000 -0300
++++ jquery/Makefile	2013-08-01 21:44:10.674826432 -0300
 @@ -5,8 +5,8 @@
  PREFIX = .
  DIST_DIR = ${PREFIX}/dist
@@ -11,7 +13,7 @@
  POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
  
  BASE_FILES = ${SRC_DIR}/core.js\
-@@ -42,7 +42,7 @@
+@@ -42,11 +42,11 @@
  JQ_VER = $(shell cat version.txt)
  VER = sed "s/@VERSION/${JQ_VER}/"
  
@@ -20,3 +22,8 @@
  
  all: update_submodules core
  
+-core: jquery min hint size
++core: jquery min size
+ 	@@echo "jQuery build complete."
+ 
+ ${DIST_DIR}:
diff --git a/debian/patches/no-min.diff b/debian/patches/no-min.diff
deleted file mode 100644
index 562a9be..0000000
--- a/debian/patches/no-min.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- jquery-1.7.2+debian.orig/Makefile
-+++ jquery-1.7.2+debian/Makefile
-@@ -46,7 +46,7 @@ DATE=$(shell date)
- 
- all: update_submodules core
- 
--core: jquery min hint size
-+core: jquery
- 	@@echo "jQuery build complete."
- 
- ${DIST_DIR}:
diff --git a/debian/patches/series b/debian/patches/series
index d9679ad..5879227 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 build.patch
-no-min.diff
diff --git a/debian/rules b/debian/rules
index 8d498a8..a5bfe92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ override_dh_auto_clean:
 
 override_dh_clean:
 	rm -rf dist/
+	rm build/.sizecache.json
 	dh_clean
 
 .PHONY: build

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