[libcommons-compress-java] 12/38: * New upstream release. CVE-2012-2098 is fixed. (Closes: #674448). * Replace B-D on junit with junit4. * Add B-D on libxz-java. * Fix clean target to allow twice in a row builds.

[Emmanuel Bourg]

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

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

commit b9d899729adb9164a2b8ec2a0d03b377a5bef8c7
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Jun 17 23:00:30 2012 +0000

    * New upstream release. CVE-2012-2098 is fixed. (Closes: #674448).
    * Replace B-D on junit with junit4.
    * Add B-D on libxz-java.
    * Fix clean target to allow twice in a row builds.
---
 debian/changelog | 10 ++++++++++
 debian/control   |  6 ++++--
 debian/rules     |  6 +++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29052ba..401e6a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libcommons-compress-java (1.4.1-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release. CVE-2012-2098 is fixed. (Closes: #674448).
+  * Replace B-D on junit with junit4.
+  * Add B-D on libxz-java.
+  * Fix clean target to allow twice in a row builds.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 17 Jun 2012 18:08:36 -0430
+
 libcommons-compress-java (1.2-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index ae8ca39..0b68906 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,9 @@ Build-Depends: ant,
                cdbs,
                debhelper (>= 5),
                default-jdk,
-               junit,
-               maven-repo-helper
+               junit4,
+               maven-repo-helper,
+               libxz-java
 Standards-Version: 3.9.3
 Homepage: http://commons.apache.org/compress/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-compress-java/
@@ -18,5 +19,6 @@ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libcommons-compress-java
 Package: libcommons-compress-java
 Architecture: all
 Depends: ${misc:Depends}
+Suggests: libxz-java
 Description: Java API for working with tar, zip and bzip2 files
  Commons Compress defines an API for working with tar, zip and bzip2 files.
diff --git a/debian/rules b/debian/rules
index c984c33..4452a51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,16 @@ include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME         := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS          := ant-junit junit
+DEB_JARS          := ant-junit junit4 xz
 PACKAGE           := commons-compress
 
 install/lib$(PACKAGE)-java:: 
 	mh_installpoms -plib$(PACKAGE)-java
 	mh_installjar -plib$(PACKAGE)-java -l pom.xml $(PACKAGE).jar
 
+clean::
+	mh_clean
+	-rm -rf commons-compress.jar
+
 get-orig-source:
 	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename

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