[pkg-java] r16050 - in trunk/yui-compressor/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-05-12 21:13:44 +0000 (Sat, 12 May 2012)
New Revision: 16050

Modified:
   trunk/yui-compressor/debian/changelog
   trunk/yui-compressor/debian/control
   trunk/yui-compressor/debian/copyright
   trunk/yui-compressor/debian/patches/use-system-libraries.patch
   trunk/yui-compressor/debian/rules
Log:
* New upstream release.
* Bump Standards-Version to 3.9.3.1 (no changes needed).
* d/control: Add missing librhino-java in Build-Depends.
* d/rules: js.jar is not needed in DEB_JARS (only used for
  cssmin testsuite).
* d/control: Wrap-and-sort fields.

Modified: trunk/yui-compressor/debian/changelog
===================================================================
--- trunk/yui-compressor/debian/changelog	2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/changelog	2012-05-12 21:13:44 UTC (rev 16050)
@@ -1,3 +1,14 @@
+yui-compressor (2.4.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.3.1 (no changes needed).
+  * d/control: Add missing librhino-java in Build-Depends.
+  * d/rules: js.jar is not needed in DEB_JARS (only used for
+    cssmin testsuite).
+  * d/control: Wrap-and-sort fields.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 May 2012 22:56:01 +0200
+
 yui-compressor (2.4.6+rhino17R2-1) unstable; urgency=low
 
   * Re-add some part of embedded Rhino source code:

Modified: trunk/yui-compressor/debian/control
===================================================================
--- trunk/yui-compressor/debian/control	2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/control	2012-05-12 21:13:44 UTC (rev 16050)
@@ -2,19 +2,22 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Dominik Smatana <dominik.smatana at gmail.com>, Damien Raude-Morvan <drazzib at debian.org>,
- Michael Gilbert <michael.s.gilbert at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
-Build-Depends-Indep: libjargs-java
+Uploaders: Dominik Smatana <dominik.smatana at gmail.com>,
+           Damien Raude-Morvan <drazzib at debian.org>,
+           Michael Gilbert <michael.s.gilbert at gmail.com>
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk
+Build-Depends-Indep: libjargs-java, librhino-java
 Homepage: http://yuilibrary.com/projects/yuicompressor/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/yui-compressor/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/yui-compressor/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3.1
 
 Package: yui-compressor
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless,
- libjargs-java, java-wrappers
+Depends: default-jre-headless | java5-runtime-headless,
+         java-wrappers,
+         libjargs-java,
+         ${misc:Depends}
 Description: JavaScript/CSS minifier
  The YUI Compressor is a JavaScript compressor which, in addition to removing
  comments and white-spaces, obfuscates local variables using the smallest

Modified: trunk/yui-compressor/debian/copyright
===================================================================
--- trunk/yui-compressor/debian/copyright	2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/copyright	2012-05-12 21:13:44 UTC (rev 16050)
@@ -112,4 +112,3 @@
 License: GPL-3
  On Debian systems the full text of the GNU General Public License version 3
  can be found in the '/usr/share/common-licenses/GPL-3' file.
-

Modified: trunk/yui-compressor/debian/patches/use-system-libraries.patch
===================================================================
--- trunk/yui-compressor/debian/patches/use-system-libraries.patch	2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/patches/use-system-libraries.patch	2012-05-12 21:13:44 UTC (rev 16050)
@@ -6,20 +6,17 @@
 Last-Update: 2010-01-17
 --- a/build.xml
 +++ b/build.xml
-@@ -20,10 +20,9 @@
-                includes="**/*.java"
-                deprecation="off"
-                debug="on"
--               source="1.4">
-+               source="1.5">
+@@ -23,8 +23,7 @@
+ 	       target="1.5"
+                source="1.5">
              <classpath>
 -                <pathelement location="${lib.dir}/jargs-1.0.jar"/>
 -                <pathelement location="${lib.dir}/rhino-1.6R7.jar"/>
-+		<pathelement location="/usr/share/java/jargs.jar"/>
++                <pathelement location="/usr/share/java/jargs.jar"/>
              </classpath>
          </javac>
      </target>
-@@ -32,13 +31,12 @@
+@@ -33,13 +32,12 @@
          <mkdir dir="${build.dir}/jar"/>
          <!-- The order is important here. Rhino MUST be unjarred first!
               (some of our own classes will override the Rhino classes) -->

Modified: trunk/yui-compressor/debian/rules
===================================================================
--- trunk/yui-compressor/debian/rules	2012-05-12 04:27:50 UTC (rev 16049)
+++ trunk/yui-compressor/debian/rules	2012-05-12 21:13:44 UTC (rev 16050)
@@ -6,13 +6,13 @@
 DEB_COMPRESS_EXCLUDE := .class
 JAVA_HOME       := /usr/lib/jvm/default-java
 
-DEB_JARS := js jargs
+DEB_JARS := jargs
 DEB_ANT_BUILD_TARGET := build.jar
 DEB_CLEAN_BUILD_TARGET := clean
 DEB_DH_INSTALLCHANGELOGS_ARGS := doc/CHANGELOG
 
 LIBRARY=yui-compressor
-VERSION=2.4.6
+VERSION=2.4.7
 RHINO_VERSION=1.7R2-4
 
 install/yui-compressor::