=== modified file 'debian/README.Debian' --- debian/README.Debian 2013-07-02 17:18:13 +0000 +++ debian/README.Debian 2012-11-19 03:37:48 +0000 @@ -15,4 +15,19 @@ - -- Steve Kemp Tue, 19 Oct 2010 08:44:80 +0000 + -- Steve Kemp Tue, 19 Oct 2010 08:44:80 +0000 + + +Explain why dfsg-packaging +-------------------------- + +jQuery originally comes with jshint.js and this file is licensed under +MIT license with one added sentence: 'The Software shall be used for Good, +not Evil.' However, it violates the Debian Policy. + +If you want to build jQuery with tests, get jshint.js + +wget -q -O build/lib/jshint.js http://www.jshint.com/src/js/jshint.js + + + -- Marcelo Jorge Vieira Thu, 15 Nov 2012 14:29:12 -0200 === modified file 'debian/changelog' --- debian/changelog 2013-07-02 17:18:13 +0000 +++ debian/changelog 2013-07-02 17:27:30 +0000 @@ -1,14 +1,40 @@ -jquery (1.7.2+debian-1ubuntu1) quantal; urgency=low - - * Merge from Debian unstable (LP: #1006866). - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - * Back to yui-compressor instead of uglify - * Removing applied patch - * Added patch to use yui-compressor on makefile - * added yuicompressor to Build-Depends again - - -- Yolanda Robla Mon, 04 Jun 2012 10:51:09 +0200 +jquery (1.7.2+dfsg-2ubuntu1) UNRELEASED; urgency=low + + * Sync with Debian (LP: #1197055). Remaining change: + - debian/control: Suggest rather than recommend javascript-common; + it's in universe and we don't necessarily need to publish these + scripts via http + + -- Jeremy Bicha Tue, 02 Jul 2013 13:24:53 -0400 + +jquery (1.7.2+dfsg-2) unstable; urgency=high + + * Added Breaks to movabletype-opensource (Closes: #700527) + Thanks Dominic Hargreaves and gregor herrmann + + -- Marcelo Jorge Vieira (metal) Sat, 11 May 2013 13:34:03 -0300 + +jquery (1.7.2+dfsg-1) unstable; urgency=high + + * Removed non-free files in upstream tarball (Closes: #692618) + + -- Marcelo Jorge Vieira (metal) Thu, 15 Nov 2012 13:11:00 -0200 + +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 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 + (Closes: #676838); Thanks Nicolas Le Cam + + -- Marcelo Jorge Vieira (metal) Thu, 14 Jun 2012 12:18:51 -0300 jquery (1.7.2+debian-1) unstable; urgency=high @@ -27,14 +53,6 @@ -- Marcelo Jorge Vieira (metal) Sun, 25 Mar 2012 20:19:22 -0300 -jquery (1.7.1-1ubuntu1) precise; urgency=low - - * Merge from Debian testing (LP: #913847). Remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Leo Iannacone Fri, 20 Jan 2012 11:13:30 +0100 - jquery (1.7.1-1) unstable; urgency=low * New upstream release @@ -53,49 +71,18 @@ -- Marcelo Jorge Vieira (metal) Mon, 26 Sep 2011 12:30:46 -0300 -jquery (1.6.2-1ubuntu2) oneiric; urgency=low - - * Rebuild, to pick up fixes to the yui-compressor toolchain, - LP: #811477 - - -- Dustin Kirkland Wed, 03 Aug 2011 12:56:13 -0500 - -jquery (1.6.2-1ubuntu1) oneiric; urgency=low - - * Merge from debian unstable. (LP: #811199) Remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Angel Abad Fri, 15 Jul 2011 20:51:16 +0200 - jquery (1.6.2-1) unstable; urgency=low * New upstream release -- Marcelo Jorge Vieira (metal) Thu, 14 Jul 2011 15:04:32 -0300 -jquery (1.6.1-1ubuntu1) oneiric; urgency=low - - * Merge from debian unstable. (LP: #790086) Remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Angel Abad Mon, 30 May 2011 08:53:51 +0200 - jquery (1.6.1-1) unstable; urgency=low * New upstream release (Closes: #628052) -- Marcelo Jorge Vieira (metal) Sun, 29 May 2011 20:21:27 -0300 -jquery (1.5.1-1ubuntu1) oneiric; urgency=low - - * Merge from debian unstable. (LP: #782589) Remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Angel Abad Mon, 16 May 2011 00:58:34 +0200 - jquery (1.5.1-1) unstable; urgency=low * New upstream release @@ -108,14 +95,6 @@ -- Marcelo Jorge Vieira (metal) Thu, 24 Feb 2011 07:08:06 -0300 -jquery (1.5-2ubuntu1) natty; urgency=low - - * Merge from debian unstable. (LP: #713657) Remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Angel Abad Sat, 05 Feb 2011 15:05:39 +0100 - jquery (1.5-2) unstable; urgency=low [Steve kemp] @@ -132,14 +111,6 @@ -- Marcelo Jorge Vieira (metal) Thu, 03 Feb 2011 22:47:43 -0200 -jquery (1.4.2-2ubuntu1) maverick; urgency=low - - * Merge from Debian unstable, remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Steve Langasek Fri, 04 Jun 2010 08:00:54 +0000 - jquery (1.4.2-2) unstable; urgency=low * Setting debhelper version to >= 7.0.50~ @@ -172,14 +143,6 @@ -- Steve Kemp Thu, 14 Jan 2010 17:39:30 +0200 -jquery (1.3.3-2ubuntu1) lucid; urgency=low - - * Merge from Debian testing, remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Steve Langasek Mon, 09 Nov 2009 20:33:54 +0000 - jquery (1.3.3-2) unstable; urgency=low [ Steve Kemp ] @@ -192,14 +155,6 @@ -- Daniel Baumann Wed, 26 Aug 2009 17:39:30 +0200 -jquery (1.3.3-1ubuntu1) karmic; urgency=low - - * Merge from Debian unstable, remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Steve Langasek Wed, 20 May 2009 12:33:40 +0000 - jquery (1.3.3-1) unstable; urgency=high [ Steve Kemp ] @@ -210,14 +165,6 @@ -- Steve Kemp Tue, 19 May 2009 21:11:01 +0000 -jquery (1.3.2-2ubuntu1) karmic; urgency=low - - * Merge from Debian unstable, remaining changes: - - Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Steve Langasek Wed, 29 Apr 2009 23:01:44 +0000 - jquery (1.3.2-2) unstable; urgency=high [ Steve Kemp ] @@ -235,13 +182,6 @@ -- Steve Kemp Thu, 26 Feb 2009 15:55:51 +0000 -jquery (1.2.6-2ubuntu1) jaunty; urgency=low - - * Drop Recommends: javascript-common to a Suggests:; there's no reason - we need to publish these scripts via http by default. - - -- Steve Langasek Thu, 09 Apr 2009 07:20:04 +0000 - jquery (1.2.6-2) unstable; urgency=medium [ Daniel Baumann ] @@ -303,4 +243,3 @@ * Initial release. (Closes: #473125) -- Steve Kemp Fri, 28 Mar 2008 15:14:13 +0000 - === modified file 'debian/control' --- debian/control 2013-07-02 17:18:13 +0000 +++ debian/control 2013-07-02 17:31:11 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Javascript Maintainers Uploaders: Marcelo Jorge Vieira (metal) , Steve Kemp -Build-Depends: debhelper (>= 7.0.50~), yui-compressor +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 @@ -12,8 +12,10 @@ Package: libjs-jquery Architecture: all +Multi-Arch: foreign Conflicts: jquery Replaces: jquery +Breaks: movabletype-opensource (<< 5.1.4+dfsg-3~) Depends: ${misc:Depends} Suggests: javascript-common Description: JavaScript library for dynamic web applications === modified file 'debian/links' --- debian/links 2013-07-02 17:18:13 +0000 +++ debian/links 2013-05-11 16:33:50 +0000 @@ -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 === removed file 'debian/patches/01-build.patch' --- debian/patches/01-build.patch 2013-07-02 17:18:13 +0000 +++ debian/patches/01-build.patch 1970-01-01 00:00:00 +0000 @@ -1,10 +0,0 @@ -Index: jquery-1.7.2+debian/Makefile -=================================================================== ---- jquery-1.7.2+debian.orig/Makefile 2012-06-04 13:22:34.543171344 +0200 -+++ jquery-1.7.2+debian/Makefile 2012-06-04 14:09:24.933107317 +0200 -@@ -49,1 +49,1 @@ --core: jquery min hint size -+core: jquery - @@echo "jQuery build complete." - - ${DIST_DIR}: === added file 'debian/patches/no-min.diff' --- debian/patches/no-min.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/no-min.diff 2013-05-11 16:33:50 +0000 @@ -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}: === modified file 'debian/patches/series' --- debian/patches/series 2013-07-02 17:18:13 +0000 +++ debian/patches/series 2013-05-11 16:33:50 +0000 @@ -1,2 +1,2 @@ -01-build.patch build.patch +no-min.diff === modified file 'debian/rules' --- debian/rules 2013-07-02 17:18:13 +0000 +++ debian/rules 2013-05-11 16:33:50 +0000 @@ -1,10 +1,13 @@ #!/usr/bin/make -f -%: +build %: dh $@ -override_dh_auto_build: - make - `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 + +.PHONY: build === modified file 'debian/watch' --- debian/watch 2013-07-02 17:18:13 +0000 +++ debian/watch 2012-11-19 03:37:48 +0000 @@ -1,4 +1,4 @@ version=3 -opts="dversionmangle=s/[+]debian(.?\d+)?$//" \ +opts="dversionmangle=s/[+]dfsg(.?\d+)?$//" \ http://docs.jquery.com/Downloading_jQuery \ .*jquery-([\d\.]+).js