[pkg-java] r4244 - in trunk/commons-io/debian: . patches
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Fri Sep 21 00:46:17 UTC 2007
Author: varun-guest
Date: 2007-09-21 00:46:17 +0000 (Fri, 21 Sep 2007)
New Revision: 4244
Added:
trunk/commons-io/debian/libcommons-io-java-doc.doc-base
trunk/commons-io/debian/libcommons-io-java-doc.install
trunk/commons-io/debian/orig-tar.sh
trunk/commons-io/debian/patches/01_no_ext_links.dpatch
Removed:
trunk/commons-io/debian/README.Debian
trunk/commons-io/debian/dirs
trunk/commons-io/debian/libcommons-io-java-doc.docs
trunk/commons-io/debian/libcommons-io-java.install
trunk/commons-io/debian/libcommons-io-java.links
trunk/commons-io/debian/patches/01_build_files.dpatch
trunk/commons-io/debian/patches/02_removing_test.dpatch
Modified:
trunk/commons-io/debian/ant.properties
trunk/commons-io/debian/changelog
trunk/commons-io/debian/compat
trunk/commons-io/debian/control
trunk/commons-io/debian/patches/00list
trunk/commons-io/debian/rules
trunk/commons-io/debian/watch
Log:
* 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.
Deleted: trunk/commons-io/debian/README.Debian
===================================================================
--- trunk/commons-io/debian/README.Debian 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/README.Debian 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1,8 +0,0 @@
-libcommons-io-java
-------------------
-
-Commons-IO contains utility classes, stream implementations, file filters, and
-endian classes.
-
---
-Trygve Laugstøl
Modified: trunk/commons-io/debian/ant.properties
===================================================================
--- trunk/commons-io/debian/ant.properties 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/ant.properties 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1 +1 @@
-javadocdir=target/javadoc
+javadocdir=build/javadoc
Modified: trunk/commons-io/debian/changelog
===================================================================
--- trunk/commons-io/debian/changelog 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/changelog 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1,12 +1,36 @@
-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 <akumar at ee.iitm.ac.in> 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 <varunhiremath at gmail.com> Fri, 21 Sep 2007 00:49:52 +0530
+
commons-io (1.3.1.dfsg.1-1) unstable; urgency=low
* New upstream (closes: #418973)
Modified: trunk/commons-io/debian/compat
===================================================================
--- trunk/commons-io/debian/compat 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/compat 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1 +1 @@
-4
+5
Modified: trunk/commons-io/debian/control
===================================================================
--- trunk/commons-io/debian/control 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/control 2007-09-21 00:46:17 UTC (rev 4244)
@@ -2,8 +2,9 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: cdbs, ant, ant-optional, debhelper (>> 4.0.0), junit, java-gcj-compat-dev
+Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Arnaud Vandyck <avdyk at debian.org>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
+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 @@
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.
Deleted: trunk/commons-io/debian/dirs
===================================================================
--- trunk/commons-io/debian/dirs 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/dirs 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1 +0,0 @@
-usr/share/java
Added: trunk/commons-io/debian/libcommons-io-java-doc.doc-base
===================================================================
--- trunk/commons-io/debian/libcommons-io-java-doc.doc-base (rev 0)
+++ trunk/commons-io/debian/libcommons-io-java-doc.doc-base 2007-09-21 00:46:17 UTC (rev 4244)
@@ -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
+
Deleted: trunk/commons-io/debian/libcommons-io-java-doc.docs
===================================================================
--- trunk/commons-io/debian/libcommons-io-java-doc.docs 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/libcommons-io-java-doc.docs 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1 +0,0 @@
-target/javadoc
Added: trunk/commons-io/debian/libcommons-io-java-doc.install
===================================================================
--- trunk/commons-io/debian/libcommons-io-java-doc.install (rev 0)
+++ trunk/commons-io/debian/libcommons-io-java-doc.install 2007-09-21 00:46:17 UTC (rev 4244)
@@ -0,0 +1 @@
+build/javadoc/* usr/share/doc/libcommons-io-java-doc/api/
Deleted: trunk/commons-io/debian/libcommons-io-java.install
===================================================================
--- trunk/commons-io/debian/libcommons-io-java.install 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/libcommons-io-java.install 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1 +0,0 @@
-build/commons-io-1.3.1.jar /usr/share/java/
Deleted: trunk/commons-io/debian/libcommons-io-java.links
===================================================================
--- trunk/commons-io/debian/libcommons-io-java.links 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/libcommons-io-java.links 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1 +0,0 @@
-usr/share/java/commons-io-1.3.1.jar usr/share/java/commons-io.jar
Added: trunk/commons-io/debian/orig-tar.sh
===================================================================
--- trunk/commons-io/debian/orig-tar.sh (rev 0)
+++ trunk/commons-io/debian/orig-tar.sh 2007-09-21 00:46:17 UTC (rev 4244)
@@ -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
Property changes on: trunk/commons-io/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/commons-io/debian/patches/00list
===================================================================
--- trunk/commons-io/debian/patches/00list 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/patches/00list 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1,2 +1 @@
-01_build_files
-02_removing_test
+01_no_ext_links
Deleted: trunk/commons-io/debian/patches/01_build_files.dpatch
===================================================================
--- trunk/commons-io/debian/patches/01_build_files.dpatch 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/patches/01_build_files.dpatch 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_build_files.dpatch by <trygvis at echidna.inamo.no>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at 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">
Added: trunk/commons-io/debian/patches/01_no_ext_links.dpatch
===================================================================
--- trunk/commons-io/debian/patches/01_no_ext_links.dpatch (rev 0)
+++ trunk/commons-io/debian/patches/01_no_ext_links.dpatch 2007-09-21 00:46:17 UTC (rev 4244)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_no_ext_links.dpatch by <varunhiremath at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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">
Property changes on: trunk/commons-io/debian/patches/01_no_ext_links.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/commons-io/debian/patches/02_removing_test.dpatch
===================================================================
--- trunk/commons-io/debian/patches/02_removing_test.dpatch 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/patches/02_removing_test.dpatch 2007-09-21 00:46:17 UTC (rev 4244)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_removing_test.dpatch by <trygvis at echidna.inamo.no>
-##
-## 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.
-
- at 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);
Modified: trunk/commons-io/debian/rules
===================================================================
--- trunk/commons-io/debian/rules 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/rules 2007-09-21 00:46:17 UTC (rev 4244)
@@ -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
Modified: trunk/commons-io/debian/watch
===================================================================
--- trunk/commons-io/debian/watch 2007-09-20 18:46:23 UTC (rev 4243)
+++ trunk/commons-io/debian/watch 2007-09-21 00:46:17 UTC (rev 4244)
@@ -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
More information about the pkg-java-commits
mailing list