Author: drazzib
Date: 2012-01-07 23:56:12 +0000 (Sat, 07 Jan 2012)
New Revision: 15658

Added:
   trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff
Modified:
   trunk/libcommons-validator-java/debian/ant.properties
   trunk/libcommons-validator-java/debian/changelog
   trunk/libcommons-validator-java/debian/control
   trunk/libcommons-validator-java/debian/copyright
   trunk/libcommons-validator-java/debian/patches/series
   trunk/libcommons-validator-java/debian/rules
Log:
* Fix -compress.js files: Use yui-compressor to minify all .js files.
  - Build-Depends on yui-compressor.
  - Drop Depends and B-D on rhino.
  - d/ant.properties: Use yui-compressor JAR.
  - d/patches/yui_compressor_params.diff: Drop -c parameter.
* Reformat d/copyright to DEP-5.

Modified: trunk/libcommons-validator-java/debian/ant.properties
===================================================================
--- trunk/libcommons-validator-java/debian/ant.properties       2012-01-07 
23:10:51 UTC (rev 15657)
+++ trunk/libcommons-validator-java/debian/ant.properties       2012-01-07 
23:56:12 UTC (rev 15658)
@@ -1,6 +1,6 @@
 build.sysclasspath=only
 compile.target=1.3
-dojo_custom_rhino.jar=/usr/share/java/js.jar
+dojo_custom_rhino.jar=/usr/share/yui-compressor/yui-compressor.jar
 commons-beanutils.jar=/usr/share/java/commons-beanutils.jar
 commons-digester.jar=/usr/share/java/commons-digester.jar
 commons-logging.jar=/usr/share/java/commons-logging.jar

Modified: trunk/libcommons-validator-java/debian/changelog
===================================================================
--- trunk/libcommons-validator-java/debian/changelog    2012-01-07 23:10:51 UTC 
(rev 15657)
+++ trunk/libcommons-validator-java/debian/changelog    2012-01-07 23:56:12 UTC 
(rev 15658)
@@ -1,11 +1,20 @@
-libcommons-validator-java (1:1.3.1-8) UNRELEASED; urgency=low
+libcommons-validator-java (1:1.3.1-8) unstable; urgency=low
 
+  [ Miguel Landaeta ]
   * Team upload.
   * Switch to default-jdk. (Closes: #643520).
   * Bump Standards-Version to 3.9.2. No changes were required.
 
- -- Miguel Landaeta <mig...@miguel.cc>  Sat, 22 Oct 2011 21:13:35 -0430
+  [ Damien Raude-Morvan ]
+  * Fix -compress.js files: Use yui-compressor to minify all .js files.
+    - Build-Depends on yui-compressor.
+    - Drop Depends and B-D on rhino.
+    - d/ant.properties: Use yui-compressor JAR.
+    - d/patches/yui_compressor_params.diff: Drop -c parameter.
+  * Reformat d/copyright to DEP-5.
 
+ -- Damien Raude-Morvan <draz...@debian.org>  Sun, 08 Jan 2012 00:51:13 +0100
+
 libcommons-validator-java (1:1.3.1-7) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libcommons-validator-java/debian/control
===================================================================
--- trunk/libcommons-validator-java/debian/control      2012-01-07 23:10:51 UTC 
(rev 15657)
+++ trunk/libcommons-validator-java/debian/control      2012-01-07 23:56:12 UTC 
(rev 15658)
@@ -3,10 +3,17 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Kumar Appaiah <aku...@debian.org>, Varun Hiremath <va...@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
-Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1), 
libcommons-beanutils-java (>= 1.7), 
- libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.6), 
libcommons-logging-java (>= 1.0.6), 
- liboro-java (>= 2.0.8), sgml-base, rhino
+Build-Depends: cdbs, debhelper (>= 7), default-jdk
+Build-Depends-Indep: ant,
+                     junit (>= 3.8.1),
+                     libcommons-beanutils-java (>= 1.7),
+                     libcommons-collections-java (>= 2.1),
+                     libcommons-digester-java (>= 1.6),
+                     libcommons-logging-java (>= 1.0.6),
+                     liboro-java (>= 2.0.8),
+                     yui-compressor,
+                     maven-repo-helper,
+                     sgml-base
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-validator-java
 Vcs-Browser: 
http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-validator-java
@@ -14,8 +21,12 @@
 
 Package: libcommons-validator-java
 Architecture: all
-Depends: ${misc:Depends}, libcommons-beanutils-java (>= 1.7), 
libcommons-collections-java (>= 2.1), 
- libcommons-digester-java (>= 1.6), libcommons-logging-java (>= 1.0.4), 
sgml-base, rhino
+Depends: libcommons-beanutils-java (>= 1.7),
+         libcommons-collections-java (>= 2.1),
+         libcommons-digester-java (>= 1.6),
+         libcommons-logging-java (>= 1.0.4),
+         sgml-base,
+         ${misc:Depends}
 Recommends: liboro-java (>= 2.0.8)
 Description: ease and speed development and maintenance of validation rules
  The Commons Validator is a basic validation framework

Modified: trunk/libcommons-validator-java/debian/copyright
===================================================================
--- trunk/libcommons-validator-java/debian/copyright    2012-01-07 23:10:51 UTC 
(rev 15657)
+++ trunk/libcommons-validator-java/debian/copyright    2012-01-07 23:56:12 UTC 
(rev 15658)
@@ -1,24 +1,16 @@
-This package was debianized by Arnaud Vandyck <arnaud.vand...@ulg.ac.be> on
-Mon, 30 Jun 2003 15:32:07 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/.
+Upstream-Name: Apache Commons Validator
+Upstream-Contact: http://commons.apache.org/validator/
+Source: http://www.apache.org/dist/commons/validator/
 
-It was downloaded from http://commons.apache.org/validator/
+Files: *
+Copyright: Copyright (C) 2002-2008 The Apache Software Foundation
+License: Apache-2.0
+ On Debian systems the full text of the Apache License can be found
+ in `/usr/share/common-licenses/Apache-2.0'.
 
-Upstream Authors: Don Brown <mr...@apache.org>,
-                  Martin Cooper <mart...@apache.org>,
-                  David Graham <dgra...@apache.org>,
-                  Ted Husted <hus...@apache.org>,
-                  Rob Leland <rlel...@apache.org>,
-                  Craig McClanahan <craig...@apache.org>,
-                  James Mitchell <jmitch...@apache.org>,
-                  Niall Pemberton,
-                  James Turner <tur...@apache.org>,
-                  David Winterfeldt <dwinterfe...@apache.org>,
-                  Henri Yandell,
-                  Ben Speakmon
-
-Copyright: 2002-2008 The Apache Software Foundation
-
-License: Apache 2.0
-
-On Debian systems the full text of the Apache License can be found
-in `/usr/share/common-licenses/Apache-2.0'.
+Files: debian/*
+Copyright: (C) 2003, Arnaud Vandyck <arnaud.vand...@ulg.ac.be>
+License: Apache-2.0
+ On Debian systems the full text of the Apache License can be found
+ in `/usr/share/common-licenses/Apache-2.0'.

Modified: trunk/libcommons-validator-java/debian/patches/series
===================================================================
--- trunk/libcommons-validator-java/debian/patches/series       2012-01-07 
23:10:51 UTC (rev 15657)
+++ trunk/libcommons-validator-java/debian/patches/series       2012-01-07 
23:56:12 UTC (rev 15658)
@@ -1 +1,2 @@
 build.patch
+yui_compressor_params.diff

Added: trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff
===================================================================
--- trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff   
                        (rev 0)
+++ trunk/libcommons-validator-java/debian/patches/yui_compressor_params.diff   
2012-01-07 23:56:12 UTC (rev 15658)
@@ -0,0 +1,17 @@
+Description: As we use yui-compressor to minify .js files,
+ remove -c param from call to JAR file for yui-c.
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Update: 2012-01-08
+Forwarded: no
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -387,7 +387,6 @@
+ 
+     <java jar="${dojo_custom_rhino.jar}" fork="true"
+               output="${jsfilename}-compress.js">
+-        <arg value="-c"/> 
+         <arg value="${jsfilename}.js"/> 
+     </java>
+   </target>

Modified: trunk/libcommons-validator-java/debian/rules
===================================================================
--- trunk/libcommons-validator-java/debian/rules        2012-01-07 23:10:51 UTC 
(rev 15657)
+++ trunk/libcommons-validator-java/debian/rules        2012-01-07 23:56:12 UTC 
(rev 15658)
@@ -22,7 +22,7 @@
 
 clean::
        $(RM) debian/install debian/sgmlcatalogs
-       -rm -rf debian/tmp
+       -mh_clean
 
 get-orig-source:
        -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download 
--rename


_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to