[libcommons-validator-java] 04/09: Removed the dependency on yui-compressor and the related patch

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Dec 6 22:38:49 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libcommons-validator-java.

commit 91010bf41c7ea7416d732e59e958c46ee07ecd7a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Dec 6 23:23:16 2015 +0100

    Removed the dependency on yui-compressor and the related patch
---
 debian/changelog                          |  2 ++
 debian/control                            |  1 -
 debian/patches/series                     |  1 -
 debian/patches/yui_compressor_params.diff | 32 -------------------------------
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0656f5d..4b25d87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 libcommons-validator-java (1:1.4.1-2) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Removed the dependency on yui-compressor and the related patch
   * Build with the DH sequencer instead of CDBS
   * Use XZ compression for the upstream tarball
 
diff --git a/debian/control b/debian/control
index ff78e76..5020d1f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends-Indep: ant,
                      libcommons-logging-java (>= 1.0.6),
                      libmaven-antrun-plugin-java,
                      libmaven-javadoc-plugin-java,
-                     yui-compressor,
                      maven-debian-helper,
                      sgml-base
 Standards-Version: 3.9.6
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 06e31c4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-yui_compressor_params.diff
diff --git a/debian/patches/yui_compressor_params.diff b/debian/patches/yui_compressor_params.diff
deleted file mode 100644
index 493b12e..0000000
--- a/debian/patches/yui_compressor_params.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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 <drazzib at debian.org>
-Forwarded: not-needed
---- a/build-javascript.xml
-+++ b/build-javascript.xml
-@@ -84,7 +84,6 @@
-         </concat>
-         <echo message="Compressing ${final.name}.js"/>
-         <java jar="${compressor.jar}" fork="true" output="${dist.dir}/${final.name}-compress.js">
--            <arg value="-c"/> 
-             <arg value="${dist.dir}/${final.name}.js"/>
-         </java>
- 
-@@ -135,7 +134,6 @@
-     <target name="compress-file">
-         <echo message="Compressing ${jsfilename}.js"/>
-         <java jar="${compressor.jar}" fork="true" output="${javascript.output}/${jsfilename}-compress.js">
--            <arg value="-c"/> 
-             <arg value="${javascript.input}/${jsfilename}.js"/>
-         </java>
-     </target>
---- a/pom.xml
-+++ b/pom.xml
-@@ -174,6 +174,7 @@
-                   <property name="build.dir" value="${project.build.directory}" />
-                   <property name="output.dir" value="${project.build.outputDirectory}" />
-                   <property name="final.name" value="${project.build.finalName}" />
-+                  <property name="compressor.jar" value="/usr/share/yui-compressor/yui-compressor.jar" />
-                 </ant>
-                </tasks>
-             </configuration>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-validator-java.git



More information about the pkg-java-commits mailing list