[Pkg-javascript-commits] [SCM] Jquery packages branch, master, updated. debian/1.7.2+debian-2-1-g2e5fab0

[Marcelo Jorge Vieira]

The following commit has been merged in the master branch:
commit 2e5fab0bc0609fbef2fdd493ec0a6b2e9c9e7bdb
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Wed Nov 7 22:04:50 2012 -0200

    Added NMU changes
    
    NMU made by Julien Cristau

diff --git a/debian/changelog b/debian/changelog
index 3b51c5b..ec958e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jquery (1.7.2+debian-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Don't ship minified js, uglify is not in wheezy (closes: #679665).
+  * Make build a phony target explicitly, since there's a build directory in
+    the source package.
+
+ -- Julien Cristau <jcristau at debian.org>  Sat, 04 Aug 2012 08:26:20 +0200
+
 jquery (1.7.2+debian-2) unstable; urgency=low
 
   * libjs-jquery package should be marked Multi-Arch: foreign
diff --git a/debian/control b/debian/control
index de833a2..74a16ec 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~), node-uglify
+Build-Depends: debhelper (>= 7.0.50~)
 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 24a7630..cc74dcc 100644
--- a/debian/links
+++ b/debian/links
@@ -1,2 +1,3 @@
 /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/no-min.diff b/debian/patches/no-min.diff
new file mode 100644
index 0000000..562a9be
--- /dev/null
+++ b/debian/patches/no-min.diff
@@ -0,0 +1,11 @@
+--- 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 5879227..d9679ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build.patch
+no-min.diff
diff --git a/debian/rules b/debian/rules
index 0a3b813..8d498a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-%:
+build %:
 	dh $@
 
 override_dh_auto_clean:
@@ -9,3 +9,5 @@ override_dh_auto_clean:
 override_dh_clean:
 	rm -rf dist/
 	dh_clean
+
+.PHONY: build

-- 
Jquery packages