Bug#594539: unblock: libhibernate3-java/3.5.4.Final-4

[Torsten Werner <twerner@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Sorry for the next unblock request. The latest upload fixes the RC bug
#594145, the documentation bug #594441, and some minor issues. The
source diff is attached.

Thanks,
Torsten

unblock libhibernate3-java/3.5.4.Final-4

diff --git a/debian/changelog b/debian/changelog
index 96ba808..7d85e0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libhibernate3-java (3.5.4.Final-4) unstable; urgency=medium
+
+  [ Miguel Landaeta ]
+  * debian/rules: Fix clean target. (Closes: #594145).
+  * Bump Standards-Version to 3.9.1. No changes were required.
+
+  [ Torsten Werner ]
+  * Add javadocs. (Closes: #594441)
+  * Set urgency to medium because we are fixing RC and documentation bugs.
+  * Update Vcs headers in debian/control to match reality.
+
+ -- Torsten Werner <twerner@debian.org>  Thu, 26 Aug 2010 23:18:51 +0200
+
 libhibernate3-java (3.5.4.Final-3) unstable; urgency=high
 
   * Add Conflicts/Provides/Replaces libhibernate-entitymanager-java.
diff --git a/debian/control b/debian/control
index e280774..e20d718 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,10 @@ Build-Depends-Indep: glassfish-javaee, libc3p0-java, libehcache-java,
  libgeronimo-jpa-2.0-spec-java, libgeronimo-jacc-1.1-spec-java,
  libgeronimo-validation-1.0-spec-java, libhibernate-commons-annotations-java,
  libhibernate-validator-java, libmaven-antrun-plugin-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.hibernate.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhibernate3-java/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhibernate3-java/
+Vcs-Git: git://git.debian.org/pkg-java/libhibernate3-java.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/libhibernate3-java.git
 
 Package: libhibernate3-java
 Architecture: all
diff --git a/debian/libhibernate3-java-doc.install b/debian/libhibernate3-java-doc.install
index c648a17..d251759 100644
--- a/debian/libhibernate3-java-doc.install
+++ b/debian/libhibernate3-java-doc.install
@@ -1 +1 @@
-#javadoc/* /usr/share/doc/libhibernate3-java/api/
+target/site/apidocs/* /usr/share/doc/libhibernate3-java/api/
diff --git a/debian/rules b/debian/rules
index dfe339f..547d217 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET :=
+DEB_MAVEN_DOC_TARGET := javadoc:aggregate
+
+clean::
+	-rm -rf debian/null mvn-build
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download