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

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-07-04 21:34:20 +0000 (Mon, 04 Jul 2011)
New Revision: 13837

Modified:
   trunk/yui-compressor/debian/changelog
   trunk/yui-compressor/debian/control
   trunk/yui-compressor/debian/fetch-upstream
   trunk/yui-compressor/debian/patches/use-system-libraries.patch
Log:
d/control: Drop Depends and Build-Depends on rhino.

Modified: trunk/yui-compressor/debian/changelog
===================================================================
--- trunk/yui-compressor/debian/changelog	2011-07-04 21:24:02 UTC (rev 13836)
+++ trunk/yui-compressor/debian/changelog	2011-07-04 21:34:20 UTC (rev 13837)
@@ -3,9 +3,10 @@
   * Re-add some part of embedded Rhino source code:
     (Closes: #630542).
     - d/copyright: Readd copyright notice.
+    - d/control: Drop Depends and Build-Depends on rhino.
     - d/fetch-upstream: Update script to download rhino source code.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 04 Jul 2011 23:23:21 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 04 Jul 2011 23:26:08 +0200
 
 yui-compressor (2.4.6+debian1-1) unstable; urgency=low
 

Modified: trunk/yui-compressor/debian/control
===================================================================
--- trunk/yui-compressor/debian/control	2011-07-04 21:24:02 UTC (rev 13836)
+++ trunk/yui-compressor/debian/control	2011-07-04 21:34:20 UTC (rev 13837)
@@ -5,7 +5,7 @@
 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, librhino-java (>= 1.7R3)
+Build-Depends-Indep: libjargs-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/
@@ -14,7 +14,7 @@
 Package: yui-compressor
 Architecture: all
 Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless,
- libjargs-java, java-wrappers, librhino-java (>= 1.7R3)
+ libjargs-java, java-wrappers
 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/fetch-upstream
===================================================================
--- trunk/yui-compressor/debian/fetch-upstream	2011-07-04 21:24:02 UTC (rev 13836)
+++ trunk/yui-compressor/debian/fetch-upstream	2011-07-04 21:34:20 UTC (rev 13837)
@@ -27,11 +27,12 @@
 rhino_tar_version="$(echo $rhino_version | cut -d - -f 1)"
 rhino_dir_version="$(echo $rhino_tar_version | sed "s/\./_/")"
 (cd source-rhino/; tar xvzf rhino_$rhino_tar_version.orig.tar.gz)
-cp -r source-rhino/rhino$rhino_dir_version/src/org/mozilla/javascript/* yuicompressor-$version/src/org/mozilla/javascript
+cp -r source-rhino/rhino$rhino_dir_version/src/org/mozilla/* yuicompressor-$version/src/org/mozilla/
 
 # repack
 mv yuicompressor-$version yui-compressor-$version
 tar czf yui-compressor_$orig_tarball_version.orig.tar.gz yui-compressor-$version
 rm -rf yui-compressor-$version
+rm -rf source-rhino
 mv yui-compressor_$orig_tarball_version.orig.tar.gz $curdir
 echo "Done: successfully created yui-compressor_$version.orig.tar.gz."

Modified: trunk/yui-compressor/debian/patches/use-system-libraries.patch
===================================================================
--- trunk/yui-compressor/debian/patches/use-system-libraries.patch	2011-07-04 21:24:02 UTC (rev 13836)
+++ trunk/yui-compressor/debian/patches/use-system-libraries.patch	2011-07-04 21:34:20 UTC (rev 13837)
@@ -6,7 +6,7 @@
 Last-Update: 2010-01-17
 --- a/build.xml
 +++ b/build.xml
-@@ -20,10 +20,10 @@
+@@ -20,10 +20,9 @@
                 includes="**/*.java"
                 deprecation="off"
                 debug="on"
@@ -16,17 +16,15 @@
 -                <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/js.jar"/>
              </classpath>
          </javac>
      </target>
-@@ -32,13 +32,13 @@
+@@ -32,13 +31,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) -->
 -        <unjar src="${lib.dir}/jargs-1.0.jar" dest="${build.dir}/jar"/>
 -        <unjar src="${lib.dir}/rhino-1.6R7.jar" dest="${build.dir}/jar"/>
-+	<unjar src="/usr/share/java/js.jar" dest="${build.dir}/jar"/>
          <copy todir="${build.dir}/jar">
              <fileset dir="${build.dir}/classes" includes="**/*.class"/>
          </copy>