This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository commons-io.
commit 81fa1f67effcc9129ce49edf20e71e70281b59ea Author: Varun Hiremath <[email protected]> Date: Fri Sep 21 00:46:17 2007 +0000 * New upstream release * debian/control: + add myself and Kumar Appaiah to Uploaders. + move cdbs and debhelper to Build-Depends. + add dpatch to Build-Depends. + modify Description. + add a separate doc package. * debian/compat: switch to 5 * remove unnecessary links and dirs files from debian dir. * debian/rules: + build javadoc + create a versioned symbolic link to the jar. + implement get-orig-source * Add debian/orig-tar.sh to remove CRLF line terminators from upstream files. * Add debian/libcommons-io-java-doc.doc-base and debian/libcommons-io-java-doc.install to install the docs. * Update debian/watch to call debian/orig-tar.sh * debian/patches: + remove old patches which are no longer required. + add a patch to remove external links from build.xml * Remove debian/README.Debian - not required. --- debian/README.Debian | 8 -------- debian/ant.properties | 2 +- debian/changelog | 30 +++++++++++++++++++++++++++--- debian/compat | 2 +- debian/control | 17 +++++++++++------ debian/dirs | 1 - debian/libcommons-io-java-doc.doc-base | 12 ++++++++++++ debian/libcommons-io-java-doc.docs | 1 - debian/libcommons-io-java-doc.install | 1 + debian/libcommons-io-java.install | 1 - debian/libcommons-io-java.links | 1 - debian/orig-tar.sh | 21 +++++++++++++++++++++ debian/patches/00list | 3 +-- debian/patches/01_build_files.dpatch | 26 -------------------------- debian/patches/01_no_ext_links.dpatch | 19 +++++++++++++++++++ debian/patches/02_removing_test.dpatch | 21 --------------------- debian/rules | 14 +++++++++----- debian/watch | 4 ++-- 18 files changed, 105 insertions(+), 79 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index b3bfb98..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,8 +0,0 @@ -libcommons-io-java ------------------- - -Commons-IO contains utility classes, stream implementations, file filters, and -endian classes. - --- -Trygve Laugstøl diff --git a/debian/ant.properties b/debian/ant.properties index b315acd..55fc52a 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1 +1 @@ -javadocdir=target/javadoc +javadocdir=build/javadoc diff --git a/debian/changelog b/debian/changelog index fb34a66..7cd6b2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,35 @@ -commons-io (1.3.1.dfsg.1-2) UNRELEASED; urgency=low +commons-io (1.3.2-1) unstable; urgency=low + [ Kumar Appaiah ] * Update watch file. * debian/control: + Add XS-Vcs-Svn, XS-Vcs-Browser + Add Homepage field. - - -- Kumar Appaiah <[email protected]> Thu, 20 Sep 2007 19:51:43 +0530 + + [ Varun Hiremath ] + * New upstream release + * debian/control: + + add myself and Kumar Appaiah to Uploaders. + + move cdbs and debhelper to Build-Depends. + + add dpatch to Build-Depends. + + modify Description. + + add a separate doc package. + * debian/compat: switch to 5 + * remove unnecessary links and dirs files from debian dir. + * debian/rules: + + build javadoc + + create a versioned symbolic link to the jar. + + implement get-orig-source + * Add debian/orig-tar.sh to remove CRLF line terminators from upstream files. + * Add debian/libcommons-io-java-doc.doc-base and + debian/libcommons-io-java-doc.install to install the docs. + * Update debian/watch to call debian/orig-tar.sh + * debian/patches: + + remove old patches which are no longer required. + + add a patch to remove external links from build.xml + * Remove debian/README.Debian - not required. + + -- Varun Hiremath <[email protected]> Fri, 21 Sep 2007 00:49:52 +0530 commons-io (1.3.1.dfsg.1-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 3d15bf1..c82761a 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: commons-io Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Trygve Laugstøl <[email protected]>, Arnaud Vandyck <[email protected]> -Build-Depends-Indep: cdbs, ant, ant-optional, debhelper (>> 4.0.0), junit, java-gcj-compat-dev +Uploaders: Trygve Laugstøl <[email protected]>, Arnaud Vandyck <[email protected]>, Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]> +Build-Depends: debhelper (>= 5), cdbs, dpatch +Build-Depends-Indep: ant, ant-optional, junit, java-gcj-compat-dev Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-io XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-io @@ -16,7 +17,11 @@ Description: Common useful IO related classes Commons-IO contains utility classes, stream implementations, file filters and endian classes. -#Package: libcommons-io-java-doc -#Architecture: all -#Description: Common useful IO related classes - documentation -# Includes JavaDoc only. +Package: libcommons-io-java-doc +Section: doc +Architecture: all +Description: Common useful IO related classes - documentation + Commons-IO contains utility classes, stream implementations, file filters and + endian classes. + . + This package provides the API documentation for the Commons-IO library. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 13c9f03..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/java diff --git a/debian/libcommons-io-java-doc.doc-base b/debian/libcommons-io-java-doc.doc-base new file mode 100644 index 0000000..c18c70b --- /dev/null +++ b/debian/libcommons-io-java-doc.doc-base @@ -0,0 +1,12 @@ +Document: libcommons-io-java +Title: Programmer API for Commons-IO +Author: The Apache Commons IO Team +Abstract: This is the javadoc api of libcommons-io-java, a Java library + which contains utility classes, stream implementations, file filters and + endian classes. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-io-java-doc/api/index.html +Files: /usr/share/doc/libcommons-io-java-doc/api/*.html + diff --git a/debian/libcommons-io-java-doc.docs b/debian/libcommons-io-java-doc.docs deleted file mode 100644 index 62b6a7f..0000000 --- a/debian/libcommons-io-java-doc.docs +++ /dev/null @@ -1 +0,0 @@ -target/javadoc diff --git a/debian/libcommons-io-java-doc.install b/debian/libcommons-io-java-doc.install new file mode 100644 index 0000000..e28983c --- /dev/null +++ b/debian/libcommons-io-java-doc.install @@ -0,0 +1 @@ +build/javadoc/* usr/share/doc/libcommons-io-java-doc/api/ diff --git a/debian/libcommons-io-java.install b/debian/libcommons-io-java.install deleted file mode 100644 index be164eb..0000000 --- a/debian/libcommons-io-java.install +++ /dev/null @@ -1 +0,0 @@ -build/commons-io-1.3.1.jar /usr/share/java/ diff --git a/debian/libcommons-io-java.links b/debian/libcommons-io-java.links deleted file mode 100644 index c4b9e10..0000000 --- a/debian/libcommons-io-java.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/commons-io-1.3.1.jar usr/share/java/commons-io.jar diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..9a0b96b --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,21 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +UDIR=commons-io-$2-src +DDIR=libcommons-io-java-$2.orig + +# Remove ^M CRLF line terminators +tar -z -x -f $3 +mv $UDIR $DDIR +(cd $DDIR; find -type f|xargs perl -pi -e 's/\r$//g') +GZIP=--best tar -c -z -f $3 $DDIR +rm -rf $DDIR $UDIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $3 $origDir + echo "moved $3 to $origDir" +fi + +exit 0 diff --git a/debian/patches/00list b/debian/patches/00list index a40b70e..74c9eca 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1 @@ -01_build_files -02_removing_test +01_no_ext_links diff --git a/debian/patches/01_build_files.dpatch b/debian/patches/01_build_files.dpatch deleted file mode 100755 index a9f1ed9..0000000 --- a/debian/patches/01_build_files.dpatch +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_build_files.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad commons-io~/build.xml commons-io/build.xml ---- commons-io~/build.xml 2005-09-21 18:10:29.000000000 +0200 -+++ commons-io/build.xml 2005-09-21 18:10:59.139430704 +0200 -@@ -145,6 +145,7 @@ - </javadoc> - </target> - <target name="get-deps" unless="noget" depends="init"> -+<!-- Commenting out these as debian/rules will include these on the classpath - <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";> - </get> - <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";> -@@ -153,6 +154,7 @@ - </get> - <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar";> - </get> -+--> - </target> - <target name="install-maven"> - <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"> diff --git a/debian/patches/01_no_ext_links.dpatch b/debian/patches/01_no_ext_links.dpatch new file mode 100755 index 0000000..b804753 --- /dev/null +++ b/debian/patches/01_no_ext_links.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_no_ext_links.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad commons-io-1.3.2~/build.xml commons-io-1.3.2/build.xml +--- commons-io-1.3.2~/build.xml 2007-09-21 00:33:32.000000000 +0530 ++++ commons-io-1.3.2/build.xml 2007-09-21 00:35:25.000000000 +0530 +@@ -296,8 +296,6 @@ + <path refid="build.classpath"> + </path> + </classpath> +- <link href="http://java.sun.com/j2se/1.4/docs/api/"; /> +- <link href="http://java.sun.com/webservices/docs/1.5/api/"; /> + </javadoc> + </target> + <target name="get-deps" unless="noget"> diff --git a/debian/patches/02_removing_test.dpatch b/debian/patches/02_removing_test.dpatch deleted file mode 100755 index 864c15e..0000000 --- a/debian/patches/02_removing_test.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_removing_test.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Commenting out an assertion that fails with the current classpath -## DP: implementation. Depends on http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23974. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java /tmp/dpep-work.nI67kr/commons-io/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java ---- ./src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java 2005-09-19 12:58:03.000000000 +0200 -+++ /tmp/dpep-work.nI67kr/commons-io/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java 2005-09-19 23:39:34.900811040 +0200 -@@ -104,7 +104,8 @@ - assertFiltering(filter, new File("foo"), true); - assertFiltering(filter, new File("bar"), true); - assertFiltering(filter, new File("food/"), true); -- assertFiltering(filter, new File("barred\\"), true); -+ // commented out until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23974 is resolved -+ // assertFiltering(filter, new File("barred\\"), true); - assertFiltering(filter, new File("test"), false); - assertFiltering(filter, new File("fo_o.test"), false); - assertFiltering(filter, new File("abar.exe"), false); diff --git a/debian/rules b/debian/rules index 965d939..981923a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,19 @@ #!/usr/bin/make -f -export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/dpatch.mk JAVA_HOME := /usr/lib/jvm/java-gcj/ ANT_HOME := /usr/share/ant # no junit at the moment DEB_JARS := #junit ant-junit -# no javadoc at the moment -DEB_ANT_BUILD_TARGET := jar #javadoc +DEB_ANT_BUILD_TARGET := jar javadoc + +install/libcommons-io-java:: + dh_install build/commons-io-$(DEB_UPSTREAM_VERSION).jar usr/share/java/ + dh_link usr/share/java/commons-io-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-io.jar + +get-orig-source: + -uscan --upstream-version 0 --rename diff --git a/debian/watch b/debian/watch index 9bb4f00..8dcf35b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=2 -http://www.apache.org/dist/jakarta/commons/io/source/commons-io-(.*)-src\.tar\.gz debian uupdate +version=3 +http://www.apache.org/dist/jakarta/commons/io/source/commons-io-(.*)-src\.tar\.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-io.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
