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 b4907186e7d2eb6e33406d56017b1f6ef0b38d9a Author: Barry Hawkins <[email protected]> Date: Wed Sep 14 05:28:32 2005 +0000 Removing 01_upstream_disable_examples_classes.dpatch; package is building fine without it. Final cleanup before submitting for upload. --- .cvsignore | 1 + debian/.cvsignore | 1 + debian/changelog | 3 ++- debian/control | 4 ++-- debian/patches/00list | 1 - .../01_upstream_disable_examples_classes.dpatch | 19 ------------------- debian/rules | 3 +-- 7 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.cvsignore b/.cvsignore index df116a6..7171bb6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,6 +6,7 @@ docs LICENSE LICENSE.txt maven.xml +patch-stamp project.properties project.xml README diff --git a/debian/.cvsignore b/debian/.cvsignore index 95d0452..fefda83 100644 --- a/debian/.cvsignore +++ b/debian/.cvsignore @@ -3,5 +3,6 @@ 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/changelog b/debian/changelog index 717da8a..fadd48d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ commons-httpclient (2.0.2-1) unstable; urgency=low - * New upstream release + * New upstream release and moved to main (Closes: #301789) + * Removed dependency upon non-free compilers (Closes: 306744) * Updated version of Apache License to 2.0 * Package updated to reflect maintainership under Debian Java Maintainers diff --git a/debian/control b/debian/control index 9267fba..bd5e039 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Barry Hawkins <[email protected]> -Build-Depends-Indep: debhelper (>> 3.0.0), libcommons-logging-java, ant, jikes (>= 1.15), kaffe (>= 1.0.6), junit -Standards-Version: 3.6.2 +Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), ant (>= 1.6.5-1), libcommons-logging-java, jikes (>= 1.15), kaffe (>= 2:1.1.5-3), junit +Standards-Version: 3.6.2.1 Package: libcommons-httpclient-java Architecture: all diff --git a/debian/patches/00list b/debian/patches/00list index d3542d7..e69de29 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +0,0 @@ -01_upstream_disable_examples_classes diff --git a/debian/patches/01_upstream_disable_examples_classes.dpatch b/debian/patches/01_upstream_disable_examples_classes.dpatch deleted file mode 100755 index bec500b..0000000 --- a/debian/patches/01_upstream_disable_examples_classes.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_upstream_disable_examples_classes.dpatch by Barry Hawkins <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Add directives to exclude the compilation of problematic classes -## DP: shipped as part of the examples for this library. - ---- commons-httpclient-2.0.2.orig/build.xml -+++ commons-httpclient-2.0.2/build.xml -@@ -236,7 +236,8 @@ - destdir ="${build.home}/examples" - debug ="${compile.debug}" - deprecation ="${compile.deprecation}" -- optimize ="${compile.optimize}"> -+ optimize ="${compile.optimize}" -+ excludes ="MultipartFileUploadApp.java,ClientApp.java"> - <classpath refid="compile.classpath"/> - </javac> - </target> diff --git a/debian/rules b/debian/rules index 8738e96..45ca0a4 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +#export DH_VERBOSE=1 # Include dpatch stuff per the documentation include /usr/share/dpatch/dpatch.make @@ -85,7 +85,6 @@ binary-indep: build install dh_installmenu -i dh_installchangelogs -i dh_link -i - dh_strip -i dh_compress -i dh_fixperms -i dh_installdeb -i -- 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
