Hi, Attached is a better patch that fixes the build system to produce the right jar.
James -- James Westby -- GPG Key ID: B577FE13 -- http://jameswestby.net/ seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256
diff -u commons-httpclient-3.0.1/debian/control
commons-httpclient-3.0.1/debian/control
--- commons-httpclient-3.0.1/debian/control
+++ commons-httpclient-3.0.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Barry Hawkins <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), cdbs
+Build-Depends: debhelper (>= 4.1.0), cdbs
Build-Depends-Indep: dpatch (>= 1.11), ant (>= 1.6.5-1),
libcommons-logging-java, junit, java-gcj-compat-dev, libcommons-codec-java
Standards-Version: 3.7.2
diff -u commons-httpclient-3.0.1/debian/changelog
commons-httpclient-3.0.1/debian/changelog
--- commons-httpclient-3.0.1/debian/changelog
+++ commons-httpclient-3.0.1/debian/changelog
@@ -1,3 +1,15 @@
+commons-httpclient (3.0.1-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump debhelper Build-Depends to (>= 4.1.0) as required by cdbs'
+ debhelper.mk
+ * Put the coppyright holders in debian/changelog
+ * Include the jar file in the package. (Closes: #381354)
+ * Only include one copy of the docs.
+ * Fixes RC bug, hence urgency medium.
+
+ -- James Westby <[EMAIL PROTECTED]> Mon, 14 Aug 2006 02:29:47 +0100
+
commons-httpclient (3.0.1-0) unstable; urgency=low
* New upstream (closes: #340307)
diff -u commons-httpclient-3.0.1/debian/rules
commons-httpclient-3.0.1/debian/rules
--- commons-httpclient-3.0.1/debian/rules
+++ commons-httpclient-3.0.1/debian/rules
@@ -13,8 +13,8 @@
DEB_JARS := junit commons-logging commons-codec
DEB_ANT_BUILD_TARGET := dist #compile doc
-DEB_INSTALL_DIRS_ALL := usr/share/java usr/share/sgml/apache/jakarta/validator
-DEB_INSTALL_DOCS_ALL := RELEASE_NOTES dist/docs/*
+#DEB_INSTALL_DIRS_ALL := usr/share/java usr/share/sgml/apache/jakarta/validator
+#DEB_INSTALL_DOCS_ALL := RELEASE_NOTES dist/docs/*
LIBRARY=commons-httpclient
VERSION=3.0.1
@@ -40,0 +41 @@
+
diff -u commons-httpclient-3.0.1/debian/copyright
commons-httpclient-3.0.1/debian/copyright
--- commons-httpclient-3.0.1/debian/copyright
+++ commons-httpclient-3.0.1/debian/copyright
@@ -15,9 +15,9 @@
Rodney Waldhoff
-Copyright:
+Copyright: 2001-2006 Apache Software Foundation
-The following copyright applies to this package:
+The following license applies to this package:
/*
*
only in patch2:
unchanged:
--- commons-httpclient-3.0.1.orig/debian/patches/01_build_xml_version_jar.patch
+++ commons-httpclient-3.0.1/debian/patches/01_build_xml_version_jar.patch
@@ -0,0 +1,12 @@
+diff -Nur commons-httpclient-3.0.1/build.xml
commons-httpclient-3.0.1.new/build.xml
+--- commons-httpclient-3.0.1/build.xml 2006-08-14 10:46:00.000000000 +0100
++++ commons-httpclient-3.0.1.new/build.xml 2006-08-14 10:46:52.000000000
+0100
+@@ -147,7 +147,7 @@
+ <copy file="build.xml" todir="${dist.home}"/>
+ <copy file="build.properties.sample" todir="${dist.home}"/>
+ <copy file="README.txt" todir="${dist.home}"/>
+- <jar jarfile ="${dist.home}/commons-${component.name}.jar"
++ <jar jarfile
="${dist.home}/commons-${component.name}-${component.version}.jar"
+ basedir ="${build.home}/classes"
+ manifest ="${build.home}/conf/MANIFEST.MF">
+ <metainf dir="${dist.home}">
only in patch2:
unchanged:
--- commons-httpclient-3.0.1.orig/debian/libcommons-httpclient-java.install
+++ commons-httpclient-3.0.1/debian/libcommons-httpclient-java.install
@@ -0,0 +1 @@
+dist/commons-httpclient-3.0.1.jar usr/share/java/
signature.asc
Description: Digital signature
