[commons-httpclient] 33/66: * Convert to default-jdk/jre (Closes: #508949) * Bump Standards-Version to 3.8.1

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository commons-httpclient.

commit b5f7efd2f7b666caf92b0b56d77006db6ab2d684
Author: Varun Hiremath <varun at debian.org>
Date:   Thu May 7 23:32:57 2009 +0000

    * Convert to default-jdk/jre (Closes: #508949)
    * Bump Standards-Version to 3.8.1
---
 debian/changelog      |  7 +++++++
 debian/compat         |  2 +-
 debian/control        | 18 +++++++++++-------
 debian/patches/00list |  2 --
 debian/rules          | 26 +-------------------------
 debian/watch          |  3 ++-
 6 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5cb9a4e..595cf93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+commons-httpclient (3.1-3) unstable; urgency=low
+
+  * Convert to default-jdk/jre (Closes: #508949)
+  * Bump Standards-Version to 3.8.1
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 07 May 2009 19:27:19 -0400
+
 commons-httpclient (3.1-2) unstable; urgency=low
 
   * debian/watch:
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 9d614e7..669a39c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,22 @@
 Source: commons-httpclient
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Barry Hawkins <barry at alltc.com>, Arnaud Vandyck <avdyk at debian.org>, Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varunhiremath at gmail.com>
-Build-Depends: debhelper (>= 4.1.0), cdbs
-Build-Depends-Indep: dpatch (>= 1.11), ant (>= 1.6.5), libcommons-logging-java, junit, java-gcj-compat-dev, libcommons-codec-java
-Standards-Version: 3.7.3
+Uploaders: Barry Hawkins <barry at alltc.com>, 
+	   Arnaud Vandyck <avdyk at debian.org>, 
+	   Kumar Appaiah <akumar at debian.org>, 
+	   Varun Hiremath <varun at debian.org>
+Build-Depends: debhelper, cdbs
+Build-Depends-Indep: ant, default-jdk, libcommons-codec-java, libcommons-logging-java, junit
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-httpclient
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-httpclient
-Homepage:http://commons.apache.org/httpclient
+Homepage: http://commons.apache.org/httpclient
 
 Package: libcommons-httpclient-java
 Architecture: all
 Suggests: libcommons-httpclient-java-doc
-Depends: kaffe (>=2:1.1.5) | java-gcj-compat | java2-runtime, libcommons-logging-java, libcommons-codec-java
+Depends: default-jre-headless | java2-runtime-headless, libcommons-logging-java, libcommons-codec-java, ${misc:Depends}
 Description: A Java(TM) library for creating HTTP clients
  The Jakarta Commons HTTPClient library provides an efficient,
  up-to-date, and feature-rich package implementing the client side of
@@ -22,6 +25,7 @@ Description: A Java(TM) library for creating HTTP clients
 Package: libcommons-httpclient-java-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: libcommons-httpclient-java
 Description: Documentation for libcommons-httpclient-java
  The Jakarta Commons HTTPClient library provides an efficient,
diff --git a/debian/patches/00list b/debian/patches/00list
index 3c8ffbc..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +0,0 @@
-01_upstream_disable_examples_classes
-02_upstream_qualify_ConnectionPool_declaration
diff --git a/debian/rules b/debian/rules
index 190e9a4..9a1a3ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,11 @@
 #!/usr/bin/make -f
 # debian/rules for libcommons-httpclient-java (uses CDBS)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-#include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME       := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := junit commons-logging commons-codec
 DEB_ANT_BUILD_TARGET := dist
 
@@ -21,23 +17,3 @@ install/lib${LIBRARY}-java::
 	dh_install dist/${LIBRARY}-${DEB_UPSTREAM_VERSION}.jar usr/share/java
 	dh_link /usr/share/java/${LIBRARY}-$(DEB_UPSTREAM_VERSION).jar \
 	  /usr/share/java/${LIBRARY}.jar
-
-#debian/ssl-stub/ssl-stub.jar:
-#	# OK, we need the JSSE for this to compile.  But we can't
-#	# redistribute JSSE, and can't require it for the build.  So
-#	# this is a workaround, creating stub classes for this compilation.
-#	(cd debian/ssl-stub; $(ANT))
-
-#install/lib${LIBRARY}-java::
-#	# Add here commands to install the package into debian/commons-httpclient.
-#	${JAVA_HOME}/bin/jar cf \
-#	        $(CURDIR)/debian/lib${LIBRARY}-java/usr/share/java/${JARFILE} \
-#		-C target/classes org
-#
-#	# Build the documentation
-#	mkdir -p $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/
-#	cp -aRf dist/docs/api $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/
-#
-#	dh_movefiles --sourcedir=debian/lib${PNAME}-java
-
-
diff --git a/debian/watch b/debian/watch
index 4697485..3d3fe94 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://www.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-([\d\.]+)-src.tar.gz
+#http://www.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-([\d\.]+)-src.tar.gz
+http://apache.oc1.mirrors.redwire.net/httpcomponents/commons-httpclient/source/commons-httpclient-([\d\.]+)-src.tar.gz

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