[pkg-java] r9368 - in trunk/commons-vfs/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Thu Jul 16 19:09:57 UTC 2009
Author: drazzib-guest
Date: 2009-07-16 19:09:56 +0000 (Thu, 16 Jul 2009)
New Revision: 9368
Added:
trunk/commons-vfs/debian/patches/01_build-xml-nodownload.diff
trunk/commons-vfs/debian/patches/02_no_home_dir.diff
trunk/commons-vfs/debian/patches/series
Removed:
trunk/commons-vfs/debian/patches/01_build-xml-nodownload.patch
Modified:
trunk/commons-vfs/debian/changelog
trunk/commons-vfs/debian/control
trunk/commons-vfs/debian/rules
Log:
[commons-vfs]
* Switch to Quilt patch system:
- Refresh all patchs
- Add B-D on quilt
- Include patchsys-quilt.mk in debian/rules
* Set Maintainer field to Debian Java Team
* Add myself as Uploaders
* New patch 02_no_home_dir.diff: don't try to create/copy files
in $HOME as many autobuilder won't have one
Modified: trunk/commons-vfs/debian/changelog
===================================================================
--- trunk/commons-vfs/debian/changelog 2009-07-16 19:09:26 UTC (rev 9367)
+++ trunk/commons-vfs/debian/changelog 2009-07-16 19:09:56 UTC (rev 9368)
@@ -4,8 +4,16 @@
* Bump Standards-Version 3.8.2:
- Move libcommons-vfs-java to "java" section
- Add a README.source describing patch system
+ * Switch to Quilt patch system:
+ - Refresh all patchs
+ - Add B-D on quilt
+ - Include patchsys-quilt.mk in debian/rules
+ * Set Maintainer field to Debian Java Team
+ * Add myself as Uploaders
+ * New patch 02_no_home_dir.diff: don't try to create/copy files
+ in $HOME as many autobuilder won't have one
- -- Damien Raude-Morvan <drazzib at drazzib.com> Sun, 28 Jun 2009 20:36:30 +0200
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Thu, 16 Jul 2009 21:08:01 +0200
commons-vfs (1.0-3) unstable; urgency=low
Modified: trunk/commons-vfs/debian/control
===================================================================
--- trunk/commons-vfs/debian/control 2009-07-16 19:09:26 UTC (rev 9367)
+++ trunk/commons-vfs/debian/control 2009-07-16 19:09:56 UTC (rev 9368)
@@ -1,9 +1,10 @@
Source: commons-vfs
Section: java
Priority: optional
-Maintainer: Damien Raude-Morvan <drazzib at drazzib.com>
+Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
Build-Depends-Indep: ant-optional, junit, libcommons-net-java, libcommons-logging-java, libcommons-httpclient-java, libcommons-collections3-java, libjsch-java
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk-builddep
+Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk-builddep, quilt
Standards-Version: 3.8.2
Homepage: http://commons.apache.org/vfs/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-vfs
Added: trunk/commons-vfs/debian/patches/01_build-xml-nodownload.diff
===================================================================
--- trunk/commons-vfs/debian/patches/01_build-xml-nodownload.diff (rev 0)
+++ trunk/commons-vfs/debian/patches/01_build-xml-nodownload.diff 2009-07-16 19:09:56 UTC (rev 9368)
@@ -0,0 +1,96 @@
+Description: Adapt build.xml file to Debian packaging
+ - Remove build.classpath variable
+ - Remove get.deps target
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2009-07-16
+--- a/build.xml
++++ b/build.xml
+@@ -36,32 +36,6 @@
+ </property>
+ <property name="proxy.password" value="">
+ </property>
+- <path id="build.classpath">
+- <pathelement location="${libdir}/ant/jars/ant-1.6.2.jar">
+- </pathelement>
+- <pathelement location="${libdir}/commons-net/jars/commons-net-1.4.1.jar">
+- </pathelement>
+- <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.4.jar">
+- </pathelement>
+- <pathelement location="${libdir}/commons-collections/jars/commons-collections-3.1.jar">
+- </pathelement>
+- <pathelement location="${libdir}/jcifs/jars/jcifs-0.8.3.jar">
+- </pathelement>
+- <pathelement location="${libdir}/slide/jars/jakarta-slide-webdavlib-20050629.161100.jar">
+- </pathelement>
+- <pathelement location="${libdir}/jdom/jars/jdom-1.0.jar">
+- </pathelement>
+- <pathelement location="${libdir}/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
+- </pathelement>
+- <pathelement location="${libdir}/com.jcraft/jars/jsch-0.1.23.jar">
+- </pathelement>
+- <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar">
+- </pathelement>
+- <pathelement location="${libdir}/oro/jars/oro-2.0.8.jar">
+- </pathelement>
+- <pathelement location="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+- </pathelement>
+- </path>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+@@ -86,7 +60,7 @@
+ </and>
+ </condition>
+ </target>
+- <target name="compile" description="o Compile the code" depends="get-deps">
++ <target name="compile" description="o Compile the code">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+@@ -94,8 +68,6 @@
+ <pathelement location="${basedir}/core/src/main/java">
+ </pathelement>
+ </src>
+- <classpath refid="build.classpath">
+- </classpath>
+ </javac>
+ <copy todir="${classesdir}">
+ <fileset dir="${basedir}/core/src/main/java">
+@@ -151,8 +123,6 @@
+ <formatter usefile="false" type="plain">
+ </formatter>
+ <classpath>
+- <path refid="build.classpath">
+- </path>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+@@ -184,14 +154,12 @@
+ </pathelement>
+ </src>
+ <classpath>
+- <path refid="build.classpath">
+- </path>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
+ </target>
+- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
++ <target name="javadoc" description="o Generate javadoc">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+@@ -203,10 +171,6 @@
+ <property name="title" value="Commons VFS 1.0 API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/core/src/main/java" packagenames="org.apache.commons.vfs.*">
+- <classpath>
+- <path refid="build.classpath">
+- </path>
+- </classpath>
+ </javadoc>
+ </target>
+ <target name="get-dep-ant.jar" description="o Download the dependency : ant.jar" unless="ant.jar" depends="init,setProxy,noProxy,get-custom-dep-ant.jar">
Deleted: trunk/commons-vfs/debian/patches/01_build-xml-nodownload.patch
===================================================================
--- trunk/commons-vfs/debian/patches/01_build-xml-nodownload.patch 2009-07-16 19:09:26 UTC (rev 9367)
+++ trunk/commons-vfs/debian/patches/01_build-xml-nodownload.patch 2009-07-16 19:09:56 UTC (rev 9368)
@@ -1,89 +0,0 @@
---- build.xml.orig 2008-07-20 21:23:03.000000000 +0200
-+++ build.xml 2008-07-20 21:34:09.000000000 +0200
-@@ -36,32 +36,6 @@
- </property>
- <property name="proxy.password" value="">
- </property>
-- <path id="build.classpath">
-- <pathelement location="${libdir}/ant/jars/ant-1.6.2.jar">
-- </pathelement>
-- <pathelement location="${libdir}/commons-net/jars/commons-net-1.4.1.jar">
-- </pathelement>
-- <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.4.jar">
-- </pathelement>
-- <pathelement location="${libdir}/commons-collections/jars/commons-collections-3.1.jar">
-- </pathelement>
-- <pathelement location="${libdir}/jcifs/jars/jcifs-0.8.3.jar">
-- </pathelement>
-- <pathelement location="${libdir}/slide/jars/jakarta-slide-webdavlib-20050629.161100.jar">
-- </pathelement>
-- <pathelement location="${libdir}/jdom/jars/jdom-1.0.jar">
-- </pathelement>
-- <pathelement location="${libdir}/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
-- </pathelement>
-- <pathelement location="${libdir}/com.jcraft/jars/jsch-0.1.23.jar">
-- </pathelement>
-- <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar">
-- </pathelement>
-- <pathelement location="${libdir}/oro/jars/oro-2.0.8.jar">
-- </pathelement>
-- <pathelement location="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
-- </pathelement>
-- </path>
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
- </mkdir>
-@@ -86,7 +60,7 @@
- </and>
- </condition>
- </target>
-- <target name="compile" description="o Compile the code" depends="get-deps">
-+ <target name="compile" description="o Compile the code">
- <mkdir dir="${classesdir}">
- </mkdir>
- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-@@ -94,8 +68,6 @@
- <pathelement location="${basedir}/core/src/main/java">
- </pathelement>
- </src>
-- <classpath refid="build.classpath">
-- </classpath>
- </javac>
- <copy todir="${classesdir}">
- <fileset dir="${basedir}/core/src/main/java">
-@@ -151,8 +123,6 @@
- <formatter usefile="false" type="plain">
- </formatter>
- <classpath>
-- <path refid="build.classpath">
-- </path>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
-@@ -184,14 +154,12 @@
- </pathelement>
- </src>
- <classpath>
-- <path refid="build.classpath">
-- </path>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- </javac>
- </target>
-- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-+ <target name="javadoc" description="o Generate javadoc">
- <mkdir dir="${javadocdir}">
- </mkdir>
- <tstamp>
-@@ -203,10 +171,6 @@
- <property name="title" value="Commons VFS 1.0 API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/core/src/main/java" packagenames="org.apache.commons.vfs.*">
-- <classpath>
-- <path refid="build.classpath">
-- </path>
-- </classpath>
- </javadoc>
- </target>
- <target name="get-dep-ant.jar" description="o Download the dependency : ant.jar" unless="ant.jar" depends="init,setProxy,noProxy,get-custom-dep-ant.jar">
Added: trunk/commons-vfs/debian/patches/02_no_home_dir.diff
===================================================================
--- trunk/commons-vfs/debian/patches/02_no_home_dir.diff (rev 0)
+++ trunk/commons-vfs/debian/patches/02_no_home_dir.diff 2009-07-16 19:09:56 UTC (rev 9368)
@@ -0,0 +1,32 @@
+Description: (build.xml) Don't use user.home as many buildd
+ don't have a $HOME directory
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2009-07-16
+--- a/build.xml
++++ b/build.xml
+@@ -8,14 +8,10 @@
+
+ <property file="build.properties">
+ </property>
+- <property file="${user.home}/build.properties">
+- </property>
+ <!--Build properties-->
+
+ <property name="defaulttargetdir" value="${basedir}/target">
+ </property>
+- <property name="libdir" value="${user.home}/.maven/repository">
+- </property>
+ <property name="classesdir" value="${basedir}/target/classes">
+ </property>
+ <property name="testclassesdir" value="${basedir}/target/test-classes">
+@@ -37,8 +33,6 @@
+ <property name="proxy.password" value="">
+ </property>
+ <target name="init" description="o Initializes some properties">
+- <mkdir dir="${libdir}">
+- </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
Added: trunk/commons-vfs/debian/patches/series
===================================================================
--- trunk/commons-vfs/debian/patches/series (rev 0)
+++ trunk/commons-vfs/debian/patches/series 2009-07-16 19:09:56 UTC (rev 9368)
@@ -0,0 +1,2 @@
+01_build-xml-nodownload.diff
+02_no_home_dir.diff
Modified: trunk/commons-vfs/debian/rules
===================================================================
--- trunk/commons-vfs/debian/rules 2009-07-16 19:09:26 UTC (rev 9367)
+++ trunk/commons-vfs/debian/rules 2009-07-16 19:09:56 UTC (rev 9368)
@@ -1,11 +1,8 @@
#!/usr/bin/make -f
# debian/rules for commons-vfs
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
More information about the pkg-java-commits
mailing list