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 20babb7488eed8f20d7a90e9aece9f782fd94936 Author: Kumar Appaiah <[email protected]> Date: Thu Sep 20 18:45:14 2007 +0000 * New upstream release. * Acknowledge NMU. Thanks to Michael Meskes for the upload. * debian/ant.properties: + Correct Java directory spelling. * debian/control: + Add Varun Hiremath and Kumar Appaiah to Uploaders. + Add XS-Vcs-Browser and XS-Vcs-Browser. + Move section of libcommons-httpclient-doc to doc. + Add Homepage Field. * debian/patches: + Remove 00b_build_xml_dont_copy_lib_dir.patch + Update patches/01_build_xml_version_jar.patch and patches/02_upstream_disable_examples_classes.patch for the new upstream version * debian/rules: + Remove dependence on package version; use DEB_UPSTREAM_VERSION for version * debian/libcommons-httpclient-java.install: + Not needed, since functionality written in debian.rules. * debian/watch + Update watch file to new upstream tarball directory. * debian/libcommons-httpclient-java.link: + Not needed, since functionality written in debian.rules. * Upstream has fixed some RFC violations. (Closes: #329245) * Remove .cvsignore files. * Put the coppyright holders in debian/copyright done by James Westby <[email protected]> Mon, 14 Aug 2006 02:29:47 +0100 --- .cvsignore | 17 ---------- debian/.cvsignore | 8 ----- debian/ant.properties | 2 +- debian/changelog | 37 +++++++++++++++++++--- debian/control | 6 +++- debian/libcommons-httpclient-java.install | 1 - debian/libcommons-httpclient-java.links | 1 - .../patches/00b_build_xml_dont_copy_lib_dir.patch | 15 --------- debian/patches/01_build_xml_version_jar.patch | 8 ++--- .../02_upstream_disable_examples_classes.patch | 9 +++--- debian/rules | 12 ++++--- debian/watch | 4 +-- 12 files changed, 57 insertions(+), 63 deletions(-) diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 7171bb6..0000000 --- a/.cvsignore +++ /dev/null @@ -1,17 +0,0 @@ -build.properties.sample -build-stamp -build.xml -dist -docs -LICENSE -LICENSE.txt -maven.xml -patch-stamp -project.properties -project.xml -README -README.txt -RELEASE_NOTES -RELEASE_NOTES.txt -src -target diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index fefda83..0000000 --- a/debian/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -files -libcommons-httpclient-java -libcommons-httpclient-java-doc -libcommons-httpclient-java-doc.postinst.debhelper -libcommons-httpclient-java-doc.prerm.debhelper -patched -semantic.cache -stamp-ant-build diff --git a/debian/ant.properties b/debian/ant.properties index a306fc0..b968486 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,3 +1,3 @@ # JSSE stub classes required for build -lib.dir=/usr/shhare/java +lib.dir=/usr/share/java #jsse.jar=/usr/share/java/jsse.jar diff --git a/debian/changelog b/debian/changelog index dc1a661..126365e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,43 @@ -commons-httpclient (3.0.1-0.1) unstable; urgency=medium +commons-httpclient (3.1-1) unstable; urgency=low + + * New upstream release. + * Acknowledge NMU. Thanks to Michael Meskes for the upload. + * debian/ant.properties: + + Correct Java directory spelling. + * debian/control: + + Add Varun Hiremath and Kumar Appaiah to Uploaders. + + Add XS-Vcs-Browser and XS-Vcs-Browser. + + Move section of libcommons-httpclient-doc to doc. + + Add Homepage Field. + * debian/patches: + + Remove 00b_build_xml_dont_copy_lib_dir.patch + + Update patches/01_build_xml_version_jar.patch and + patches/02_upstream_disable_examples_classes.patch for the new + upstream version + * debian/rules: + + Remove dependence on package version; use DEB_UPSTREAM_VERSION for version + * debian/libcommons-httpclient-java.install: + + Not needed, since functionality written in debian.rules. + * debian/watch + + Update watch file to new upstream tarball directory. + * debian/libcommons-httpclient-java.link: + + Not needed, since functionality written in debian.rules. + * Upstream has fixed some RFC violations. (Closes: #329245) + * Remove .cvsignore files. + + -- Kumar Appaiah <[email protected]> Thu, 20 Sep 2007 20:14:02 +0530 + +commons-httpclient (3.0.1-0.1) unstable; urgency=low * Non-maintainer upload. * Bump debhelper Build-Depends to (>= 4.1.0) as required by cdbs' debhelper.mk - * Put the coppyright holders in debian/changelog + * Put the coppyright holders in debian/copyright * Include the jar file in the package. (Closes: #381354) * Only include one copy of the docs. - * Fixes RC bug, hence urgency medium. + done by James Westby <[email protected]> Mon, 14 Aug 2006 02:29:47 +0100 - -- James Westby <[email protected]> Mon, 14 Aug 2006 02:29:47 +0100 + -- Michael Meskes <[email protected]> Fri, 15 Sep 2006 20:07:43 +0200 commons-httpclient (3.0.1-0) unstable; urgency=low diff --git a/debian/control b/debian/control index 0bc8661..da98575 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,13 @@ Source: commons-httpclient Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Barry Hawkins <[email protected]>, Arnaud Vandyck <[email protected]> +Uploaders: Barry Hawkins <[email protected]>, Arnaud Vandyck <[email protected]>, Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]> 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 +XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-httpclient +XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-httpclient +Homepage:http://commons.apache.org/httpclient Package: libcommons-httpclient-java Architecture: all @@ -17,6 +20,7 @@ Description: A Java(TM) library for creating HTTP clients the most recent HTTP standards and recommendations. Package: libcommons-httpclient-java-doc +Section: doc Architecture: all Suggests: libcommons-httpclient-java Description: Documentation for libcommons-httpclient-java diff --git a/debian/libcommons-httpclient-java.install b/debian/libcommons-httpclient-java.install deleted file mode 100644 index ee2915c..0000000 --- a/debian/libcommons-httpclient-java.install +++ /dev/null @@ -1 +0,0 @@ -dist/commons-httpclient-3.0.1.jar usr/share/java/ diff --git a/debian/libcommons-httpclient-java.links b/debian/libcommons-httpclient-java.links deleted file mode 100644 index 706590b..0000000 --- a/debian/libcommons-httpclient-java.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/commons-httpclient-3.0.1.jar usr/share/java/commons-httpclient.jar diff --git a/debian/patches/00b_build_xml_dont_copy_lib_dir.patch b/debian/patches/00b_build_xml_dont_copy_lib_dir.patch deleted file mode 100644 index 45371fb..0000000 --- a/debian/patches/00b_build_xml_dont_copy_lib_dir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- build.xml~ 2006-08-01 08:16:13.000000000 +0000 -+++ build.xml 2006-08-01 08:31:01.000000000 +0000 -@@ -158,10 +158,10 @@ - <copy todir="${dist.home}/src" filtering="on"> - <fileset dir="${source.home}"/> - </copy> -- <mkdir dir="${dist.home}/lib"/> -+ <!-- mkdir dir="${dist.home}/lib"/> - <copy todir="${dist.home}/lib"> - <fileset dir="lib"/> -- </copy> -+ </copy --> - </target> - - <!-- ========== Targets: "External" Targets: Clean-up ===================== --> diff --git a/debian/patches/01_build_xml_version_jar.patch b/debian/patches/01_build_xml_version_jar.patch index 4c79add..241103d 100644 --- a/debian/patches/01_build_xml_version_jar.patch +++ b/debian/patches/01_build_xml_version_jar.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Nur commons-httpclient-3.1/build.xml commons-httpclient-3.1.new/build.xml +--- commons-httpclient-3.1/build.xml 2007-08-18 14:32:14.000000000 +0530 ++++ commons-httpclient-3.1.new/build.xml 2007-09-19 11:12:49.000000000 +0530 +@@ -149,7 +149,7 @@ <copy file="build.xml" todir="${dist.home}"/> <copy file="build.properties.sample" todir="${dist.home}"/> <copy file="README.txt" todir="${dist.home}"/> diff --git a/debian/patches/02_upstream_disable_examples_classes.patch b/debian/patches/02_upstream_disable_examples_classes.patch index 5137046..dc8812a 100644 --- a/debian/patches/02_upstream_disable_examples_classes.patch +++ b/debian/patches/02_upstream_disable_examples_classes.patch @@ -1,12 +1,13 @@ ---- commons-httpclient-3.0.1.orig/build.xml -+++ commons-httpclient-3.0.1/build.xml -@@ -236,7 +236,8 @@ +diff -Nur commons-httpclient-3.1/build.xml commons-httpclient-3.1.new/build.xml +--- commons-httpclient-3.1/build.xml 2007-09-19 11:14:00.000000000 +0530 ++++ commons-httpclient-3.1.new/build.xml 2007-09-19 11:15:15.000000000 +0530 +@@ -188,7 +188,8 @@ destdir ="${build.home}/examples" debug ="${compile.debug}" deprecation ="${compile.deprecation}" - optimize ="${compile.optimize}"> + optimize ="${compile.optimize}" -+ excludes ="MultipartFileUploadApp.java,ClientApp.java"> ++ excludes ="MultipartFileUploadApp.java,ClientApp.java"> <classpath refid="compile.classpath"/> </javac> </target> diff --git a/debian/rules b/debian/rules index 73ad9f5..190e9a4 100755 --- a/debian/rules +++ b/debian/rules @@ -11,14 +11,16 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME := /usr/lib/jvm/java-gcj DEB_JARS := junit commons-logging commons-codec -DEB_ANT_BUILD_TARGET := dist #compile doc +DEB_ANT_BUILD_TARGET := dist -#DEB_INSTALL_DIRS_ALL := usr/share/java usr/share/sgml/apache/jakarta/validator -#DEB_INSTALL_DOCS_ALL := RELEASE_NOTES dist/docs/* +DEB_INSTALL_CHANGELOGS_ALL = RELEASE_NOTES.txt LIBRARY=commons-httpclient -VERSION=3.0.1 -JARFILE=$(LIBRARY)-${VERSION}.jar + +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 diff --git a/debian/watch b/debian/watch index 95dc659..60ffe99 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=2 -http://www.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-([0-9\.]*)-src\.tar\.gz debian uupdate +version=3 +http://apache.oc1.mirrors.redwire.net/jakarta/httpcomponents/commons-httpclient-3.x/source/commons-httpclient-([0-9\.]*)-src\.tar\.gz debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-httpclient.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
