[libjbcrypt-java] 02/04: New upstream release (Closes: #780102)

[Emmanuel Bourg]

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

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

commit bb89b05488c83d57812abc6104fc24d4eb635b9b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 2 23:02:02 2015 +0200

    New upstream release (Closes: #780102)
---
 debian/changelog                                      |  6 +++++-
 debian/javabuild                                      |  1 -
 debian/libjbcrypt-java.dirs                           |  1 -
 debian/libjbcrypt-java.javadoc                        |  1 -
 debian/libjbcrypt-java.jlibs                          |  1 -
 debian/libjbcrypt-java.poms                           |  2 +-
 .../0001-Add-org.mindrot-package-to-BCrypt.patch      | 19 -------------------
 debian/patches/series                                 |  1 -
 debian/pom.xml                                        |  2 +-
 debian/rules                                          |  3 +++
 10 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75f8217..1755955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
-libjbcrypt-java (0.3-5) UNRELEASED; urgency=medium
+libjbcrypt-java (0.4-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Fixes CVE-2015-0886 (Closes: #780102)
+  * Removed the javadoc from libjbcrypt-java
+  * Renamed the jar installed in /usr/share/java to jbcrypt.jar
   * Standards-Version updated to 3.9.6 (no changes)
   * Use canonical URLs for the Vcs-* fields
   * Switch to debhelper level 9
diff --git a/debian/javabuild b/debian/javabuild
deleted file mode 100644
index 9cc7f16..0000000
--- a/debian/javabuild
+++ /dev/null
@@ -1 +0,0 @@
-libjbcrypt-java.jar BCrypt.java
diff --git a/debian/libjbcrypt-java.dirs b/debian/libjbcrypt-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libjbcrypt-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libjbcrypt-java.javadoc b/debian/libjbcrypt-java.javadoc
deleted file mode 100644
index 7514012..0000000
--- a/debian/libjbcrypt-java.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-debian/_jh_build.javadoc.ext/api/
diff --git a/debian/libjbcrypt-java.jlibs b/debian/libjbcrypt-java.jlibs
deleted file mode 100644
index 9a19052..0000000
--- a/debian/libjbcrypt-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-libjbcrypt-java.jar
diff --git a/debian/libjbcrypt-java.poms b/debian/libjbcrypt-java.poms
index 58bd11a..130fdd3 100644
--- a/debian/libjbcrypt-java.poms
+++ b/debian/libjbcrypt-java.poms
@@ -1 +1 @@
-debian/pom.xml --no-parent --usj-name=libjbcrypt-java --artifact=libjbcrypt-java.jar
+debian/pom.xml --no-parent --java-lib --has-package-version --artifact=jbcrypt.jar
diff --git a/debian/patches/0001-Add-org.mindrot-package-to-BCrypt.patch b/debian/patches/0001-Add-org.mindrot-package-to-BCrypt.patch
deleted file mode 100644
index 911bfca..0000000
--- a/debian/patches/0001-Add-org.mindrot-package-to-BCrypt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Wed, 14 Dec 2011 02:00:26 +0100
-Subject: Add org.mindrot package to BCrypt
-
----
- BCrypt.java |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/BCrypt.java b/BCrypt.java
-index b4d676c..066cddb 100644
---- a/BCrypt.java
-+++ b/BCrypt.java
-@@ -1,3 +1,5 @@
-+package org.mindrot;
-+
- // Copyright (c) 2006 Damien Miller <djm at mindrot.org>
- //
- // Permission to use, copy, modify, and distribute this software for any
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 970c6e0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Add-org.mindrot-package-to-BCrypt.patch
diff --git a/debian/pom.xml b/debian/pom.xml
index 4b211aa..a8630f5 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.mindrot</groupId>
     <artifactId>jbcrypt</artifactId>
     <packaging>jar</packaging>
-    <version>0.3</version>
+    <version>0.4</version>
     <name>jbcrypt</name>
     <url>http://www.mindrot.org/</url>
     <description>
diff --git a/debian/rules b/debian/rules
index af0df33..93842c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,3 +5,6 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 %:
 	dh $@ --with javahelper,maven_repo_helper
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f *.jar

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