[pkg-java] r12674 - trunk/libcommons-net2-java/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-06-27 20:48:19 +0000 (Sun, 27 Jun 2010)
New Revision: 12674

Modified:
   trunk/libcommons-net2-java/debian/changelog
   trunk/libcommons-net2-java/debian/compat
   trunk/libcommons-net2-java/debian/control
   trunk/libcommons-net2-java/debian/rules
Log:
libcommons-net2-java (2.0-3) UNRELEASED; urgency=low

  * Team upload.
  * Corrected the VCS-headers and Suggests. They were refering to
    libcommons-net-java.
  * Replace openjdk-6-doc with default-jdk-doc (Closes: #567278)
  * Reduce doc dependency to a recommends.
  * Bumped debhelper compat to 7.
  * Bumped Standards-Versions to 3.8.4 - no changes required.
  * Fixed the clean target.
  * Replaced an invocation of realpath with $(CURDIR) to avoid
    dependency on realpath.
  * Use default-jdk instead openjdk-6-jdk as B-D.
  * Added "API docs" to synopsis of the doc package to make it unuique.

 -- Niels Thykier <niels at thykier.net>  Sun, 27 Jun 2010 22:17:37 +0200


Modified: trunk/libcommons-net2-java/debian/changelog
===================================================================
--- trunk/libcommons-net2-java/debian/changelog	2010-06-27 19:48:18 UTC (rev 12673)
+++ trunk/libcommons-net2-java/debian/changelog	2010-06-27 20:48:19 UTC (rev 12674)
@@ -1,3 +1,20 @@
+libcommons-net2-java (2.0-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Corrected the VCS-headers and Suggests. They were refering to
+    libcommons-net-java.
+  * Replace openjdk-6-doc with default-jdk-doc (Closes: #567278)
+  * Reduce doc dependency to a recommends.
+  * Bumped debhelper compat to 7.
+  * Bumped Standards-Versions to 3.8.4 - no changes required.
+  * Fixed the clean target.
+  * Replaced an invocation of realpath with $(CURDIR) to avoid
+    dependency on realpath.
+  * Use default-jdk instead openjdk-6-jdk as B-D.
+  * Added "API docs" to synopsis of the doc package to make it unuique.
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 27 Jun 2010 22:17:37 +0200
+
 libcommons-net2-java (2.0-2) unstable; urgency=low
 
   * Include manifest with OSGi information

Modified: trunk/libcommons-net2-java/debian/compat
===================================================================
--- trunk/libcommons-net2-java/debian/compat	2010-06-27 19:48:18 UTC (rev 12673)
+++ trunk/libcommons-net2-java/debian/compat	2010-06-27 20:48:19 UTC (rev 12674)
@@ -1 +1 @@
-6
+7

Modified: trunk/libcommons-net2-java/debian/control
===================================================================
--- trunk/libcommons-net2-java/debian/control	2010-06-27 19:48:18 UTC (rev 12673)
+++ trunk/libcommons-net2-java/debian/control	2010-06-27 20:48:19 UTC (rev 12674)
@@ -3,17 +3,17 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 6), cdbs, openjdk-6-jdk
-Build-Depends-Indep: ant, ant-optional, maven-ant-helper (>> 5), maven-repo-helper, openjdk-6-doc
-Standards-Version: 3.8.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-net-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-net-java/
+Build-Depends: debhelper (>= 7), cdbs, default-jdk
+Build-Depends-Indep: ant, ant-optional, maven-ant-helper (>> 5), maven-repo-helper, default-jdk-doc
+Standards-Version: 3.8.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-net2-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-net2-java/
 Homepage: http://commons.apache.org/net/
 
 Package: libcommons-net2-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libcommons-net-java-doc
+Suggests: libcommons-net2-java-doc
 Description: internet protocol suite Java library
  This is an Internet protocol suite Java library originally developed by
  ORO, Inc. This version supports Finger, Whois, TFTP, Telnet, POP3, FTP,
@@ -38,9 +38,10 @@
 Package: libcommons-net2-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
-Suggests: libcommons-net-java
-Description: internet protocol suite Java library
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc
+Suggests: libcommons-net2-java
+Description: internet protocol suite Java library - API docs
  This is an Internet protocol suite Java library originally developed by
  ORO, Inc. This version supports Finger, Whois, TFTP, Telnet, POP3, FTP,
  NNTP, SMTP, and some miscellaneous protocols like Time and Echo as well

Modified: trunk/libcommons-net2-java/debian/rules
===================================================================
--- trunk/libcommons-net2-java/debian/rules	2010-06-27 19:48:18 UTC (rev 12673)
+++ trunk/libcommons-net2-java/debian/rules	2010-06-27 20:48:19 UTC (rev 12674)
@@ -3,19 +3,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=6
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_ARGS         := -Dbasedir=$(CURDIR) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
 LAST_MODIFIED        := $(shell date +%s%N | cut -c -13)
 
 makebuilddir/$(PACKAGE)::
@@ -27,7 +24,7 @@
 	mh_installjar -p$(PACKAGE) -l --usj-name=commons-net2 pom.xml build/commons-net-$(VERSION).jar
 
 clean::
-	-rm -rf debian/tmp
+	rm -fr debian/.mh/
 
 get-orig-source:
 	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename