[libcommons-net-java] 10/31: libcommons-net2-java (2.0-3) UNRELEASED; urgency=low

[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-net-java.

commit 61b53b7409d840a860d6d33206fb70942e9f2688
Author: Niels Thykier <nthykier at debian.org>
Date:   Sun Jun 27 20:48:19 2010 +0000

    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
---
 debian/changelog | 17 +++++++++++++++++
 debian/compat    |  2 +-
 debian/control   | 19 ++++++++++---------
 debian/rules     |  9 +++------
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ba5ced7..7d09682 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 3a08735..a03267c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@ Section: java
 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 @@ Description: internet protocol suite Java library
 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
diff --git a/debian/rules b/debian/rules
index 7d9c29b..9df0acf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ binary-post-install/$(PACKAGE)::
 	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

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