[pkg-java] r4978 - in trunk/commons-configuration/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Dec 9 09:53:20 UTC 2007
Author: twerner
Date: 2007-12-09 09:53:20 +0000 (Sun, 09 Dec 2007)
New Revision: 4978
Added:
trunk/commons-configuration/debian/ant.properties
trunk/commons-configuration/debian/orig-tar.sh
trunk/commons-configuration/debian/patches/case.diff
trunk/commons-configuration/debian/patches/disable-tests.diff
Removed:
trunk/commons-configuration/debian/patches/build.diff
Modified:
trunk/commons-configuration/debian/
trunk/commons-configuration/debian/changelog
trunk/commons-configuration/debian/control
trunk/commons-configuration/debian/copyright
trunk/commons-configuration/debian/patches/series
trunk/commons-configuration/debian/rules
trunk/commons-configuration/debian/watch
Log:
* new upstream release
* Move package to Alioth and add Vcs headers in debian/control.
* Update all references to the homepage and download address to the new
apache structure. (Closes: #450063)
* Add target 'get-orig-source' to debian/rules.
* Bumped up Standards-Version to 3.7.3; no changes needed.
* Switch from kaffe to java-gcj-compat-dev.
Property changes on: trunk/commons-configuration/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: trunk/commons-configuration/debian/ant.properties
===================================================================
--- trunk/commons-configuration/debian/ant.properties (rev 0)
+++ trunk/commons-configuration/debian/ant.properties 2007-12-09 09:53:20 UTC (rev 4978)
@@ -0,0 +1 @@
+build.sysclasspath=only
Modified: trunk/commons-configuration/debian/changelog
===================================================================
--- trunk/commons-configuration/debian/changelog 2007-12-09 09:15:20 UTC (rev 4977)
+++ trunk/commons-configuration/debian/changelog 2007-12-09 09:53:20 UTC (rev 4978)
@@ -1,3 +1,15 @@
+commons-configuration (1.5-1) unstable; urgency=low
+
+ * new upstream release
+ * Move package to Alioth and add Vcs headers in debian/control.
+ * Update all references to the homepage and download address to the new
+ apache structure. (Closes: #450063)
+ * Add target 'get-orig-source' to debian/rules.
+ * Bumped up Standards-Version to 3.7.3; no changes needed.
+ * Switch from kaffe to java-gcj-compat-dev.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Dec 2007 10:50:51 +0100
+
commons-configuration (1.4-2) unstable; urgency=low
* Remove some of the Depends because one of them was wrong and the others
Modified: trunk/commons-configuration/debian/control
===================================================================
--- trunk/commons-configuration/debian/control 2007-12-09 09:15:20 UTC (rev 4977)
+++ trunk/commons-configuration/debian/control 2007-12-09 09:53:20 UTC (rev 4978)
@@ -2,11 +2,14 @@
Section: libs
Priority: optional
Maintainer: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), kaffe, libcommons-beanutils-java,
- libcommons-codec-java, libcommons-collections3-java, libcommons-digester-java,
- libcommons-jxpath-java, libcommons-lang-java (>= 2.3), libcommons-logging-java,
- libservlet2.4-java, quilt
-Standards-Version: 3.7.2
+Build-Depends: ant, ant-optional, cdbs, debhelper (>= 5),
+ java-gcj-compat-dev, libcommons-beanutils-java, libcommons-codec-java,
+ libcommons-collections3-java, libcommons-digester-java, libcommons-jxpath-java,
+ libcommons-lang-java (>= 2.3), libcommons-logging-java, libservlet2.4-java, quilt
+Standards-Version: 3.7.3
+Homepage: http://commons.apache.org/configuration/
+Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/commons-configuration
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-configuration/
Package: libcommons-configuration-java
Architecture: all
@@ -25,5 +28,3 @@
- Servlet parameters
Additional sources of configuration parameters can be created by using custom
configuration objects.
- .
- Homepage: http://jakarta.apache.org/commons/configuration/
Modified: trunk/commons-configuration/debian/copyright
===================================================================
--- trunk/commons-configuration/debian/copyright 2007-12-09 09:15:20 UTC (rev 4977)
+++ trunk/commons-configuration/debian/copyright 2007-12-09 09:53:20 UTC (rev 4978)
@@ -1,7 +1,8 @@
This package was debianized by Torsten Werner <twerner at debian.org> on
Fri Apr 20 14:51:53 CEST 2007.
-It was downloaded from http://jakarta.apache.org/commons/configuration/
+It was downloaded from
+<http://commons.apache.org/downloads/download_configuration.cgi>.
Upstream Author: The Apache Software Foundation
Added: trunk/commons-configuration/debian/orig-tar.sh
===================================================================
--- trunk/commons-configuration/debian/orig-tar.sh (rev 0)
+++ trunk/commons-configuration/debian/orig-tar.sh 2007-12-09 09:53:20 UTC (rev 4978)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
+
Property changes on: trunk/commons-configuration/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/commons-configuration/debian/patches/build.diff
===================================================================
--- trunk/commons-configuration/debian/patches/build.diff 2007-12-09 09:15:20 UTC (rev 4977)
+++ trunk/commons-configuration/debian/patches/build.diff 2007-12-09 09:53:20 UTC (rev 4978)
@@ -1,98 +0,0 @@
-Index: commons-configuration-1.4/build.xml
-===================================================================
---- commons-configuration-1.4.orig/build.xml 2007-04-05 18:27:51.000000000 +0200
-+++ commons-configuration-1.4/build.xml 2007-04-20 15:13:10.000000000 +0200
-@@ -47,10 +47,14 @@
- <property name="targetconfdir" value="${testclassesdir}"/>
-
- <path id="build.classpath">
-- <fileset dir="${libdir}">
-- <include name="**/*.jar">
-- </include>
-- </fileset>
-+ <pathelement location="/usr/share/java/commons-beanutils.jar"/>
-+ <pathelement location="/usr/share/java/commons-codec.jar"/>
-+ <pathelement location="/usr/share/java/commons-collections3.jar"/>
-+ <pathelement location="/usr/share/java/commons-digester.jar"/>
-+ <pathelement location="/usr/share/java/commons-jxpath.jar"/>
-+ <pathelement location="/usr/share/java/commons-lang.jar"/>
-+ <pathelement location="/usr/share/java/commons-logging.jar"/>
-+ <pathelement location="/usr/share/java/servlet-api.jar"/>
- </path>
-
- <target name="init" description="o Initializes some properties">
-@@ -97,13 +101,13 @@
- </copy>
- </target>
-
-- <target name="jar" description="o Create the jar" depends="compile,test">
-+ <target name="jar" description="o Create the jar" depends="compile">
- <mkdir dir="${classesdir}/META-INF"/>
- <copy file="LICENSE.txt" todir="${metadir}"/>
- <copy file="NOTICE.txt" todir="${metadir}"/>
-- <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>
-+ <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>
- <jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"
-- manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">
-+ manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">
- </jar>
- </target>
- <target name="clean" description="o Clean up the generated directories">
-@@ -229,50 +233,6 @@
- <target name="get-deps" unless="noget" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
-
-- <setproxy>
-- </setproxy>
-- <get dest="${libdir}/commons-collections-3.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.2.jar">
-- </get>
-- <get dest="${libdir}/commons-lang-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-2.3.jar">
-- </get>
-- <get dest="${libdir}/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar">
-- </get>
-- <get dest="${libdir}/commons-digester-1.8.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.8.jar">
-- </get>
-- <get dest="${libdir}/commons-beanutils-core-1.7.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-core-1.7.0.jar">
-- </get>
-- <get dest="${libdir}/commons-codec-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-codec/jars/commons-codec-1.3.jar">
-- </get>
-- <get dest="${libdir}/commons-jxpath-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jxpath/jars/commons-jxpath-1.2.jar">
-- </get>
-- <get dest="${libdir}/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
-- </get>
-- <get dest="${libdir}/xalan-2.7.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xalan/jars/xalan-2.7.0.jar">
-- </get>
-- <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
-- </get>
-- <get dest="${libdir}/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.4.jar">
-- </get>
-- <get dest="${libdir}/commons-dbcp-1.2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-dbcp/jars/commons-dbcp-1.2.2.jar">
-- </get>
-- <get dest="${libdir}/commons-pool-1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-pool/jars/commons-pool-1.1.jar">
-- </get>
-- <get dest="${libdir}/hsqldb-1.7.2.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.2.2.jar">
-- </get>
-- <get dest="${libdir}/dbunit-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dbunit/jars/dbunit-2.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">
-- </get>
-- <get dest="${libdir}/junit-addons-1.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit-addons/jars/junit-addons-1.4.jar">
-- </get>
-- <get dest="${libdir}/mockobjects-core-0.09.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/mockobjects/jars/mockobjects-core-0.09.jar">
-- </get>
-- <get dest="${libdir}/mockobjects-jdk1.4-j2ee1.3-0.09.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/mockobjects/jars/mockobjects-jdk1.4-j2ee1.3-0.09.jar">
-- </get>
-- <get dest="${libdir}/maven-tasks-plugin-1.1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven-plugins/plugins/maven-tasks-plugin-1.1.0.jar">
-- </get>
-- <get dest="${libdir}/maven-findbugs-plugin-0.8.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven-plugins/plugins/maven-findbugs-plugin-0.8.4.jar">
-- </get>
- </target>
- <target name="install-maven">
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
-@@ -280,4 +240,4 @@
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
--</project>
-\ No newline at end of file
-+</project>
Added: trunk/commons-configuration/debian/patches/case.diff
===================================================================
--- trunk/commons-configuration/debian/patches/case.diff (rev 0)
+++ trunk/commons-configuration/debian/patches/case.diff 2007-12-09 09:53:20 UTC (rev 4978)
@@ -0,0 +1,16 @@
+Index: commons-configuration-1.5/build.xml
+===================================================================
+--- commons-configuration-1.5.orig/build.xml 2007-12-09 10:45:45.000000000 +0100
++++ commons-configuration-1.5/build.xml 2007-12-09 10:45:53.000000000 +0100
+@@ -101,9 +101,9 @@
+ <mkdir dir="${classesdir}/META-INF"/>
+ <copy file="LICENSE.txt" todir="${metadir}"/>
+ <copy file="NOTICE.txt" todir="${metadir}"/>
+- <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>
++ <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"
+- manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">
++ manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
Added: trunk/commons-configuration/debian/patches/disable-tests.diff
===================================================================
--- trunk/commons-configuration/debian/patches/disable-tests.diff (rev 0)
+++ trunk/commons-configuration/debian/patches/disable-tests.diff 2007-12-09 09:53:20 UTC (rev 4978)
@@ -0,0 +1,13 @@
+Index: commons-configuration-1.5/build.xml
+===================================================================
+--- commons-configuration-1.5.orig/build.xml 2007-12-09 10:41:57.000000000 +0100
++++ commons-configuration-1.5/build.xml 2007-12-09 10:42:10.000000000 +0100
+@@ -97,7 +97,7 @@
+ </copy>
+ </target>
+
+- <target name="jar" description="o Create the jar" depends="compile,test">
++ <target name="jar" description="o Create the jar" depends="compile">
+ <mkdir dir="${classesdir}/META-INF"/>
+ <copy file="LICENSE.txt" todir="${metadir}"/>
+ <copy file="NOTICE.txt" todir="${metadir}"/>
Modified: trunk/commons-configuration/debian/patches/series
===================================================================
--- trunk/commons-configuration/debian/patches/series 2007-12-09 09:15:20 UTC (rev 4977)
+++ trunk/commons-configuration/debian/patches/series 2007-12-09 09:53:20 UTC (rev 4978)
@@ -1 +1,2 @@
-build.diff
+disable-tests.diff
+case.diff
Modified: trunk/commons-configuration/debian/rules
===================================================================
--- trunk/commons-configuration/debian/rules 2007-12-09 09:15:20 UTC (rev 4977)
+++ trunk/commons-configuration/debian/rules 2007-12-09 09:53:20 UTC (rev 4978)
@@ -4,11 +4,15 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/kaffe
-DEB_ANT_CLEAN_TARGET := clean
-PACKAGE := commons-configuration-$(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS := ant-nodeps commons-beanutils commons-codec commons-collections3 \
+ commons-digester commons-jxpath commons-lang commons-logging \
+ servlet-api
+PACKAGE := commons-configuration-$(DEB_UPSTREAM_VERSION)
install/libcommons-configuration-java::
dh_link /usr/share/java/$(PACKAGE).jar \
/usr/share/java/commons-configuration.jar
+get-orig-source:
+ -uscan --upstream-version 0 --rename
Modified: trunk/commons-configuration/debian/watch
===================================================================
--- trunk/commons-configuration/debian/watch 2007-12-09 09:15:20 UTC (rev 4977)
+++ trunk/commons-configuration/debian/watch 2007-12-09 09:53:20 UTC (rev 4978)
@@ -1,3 +1,3 @@
version=3
-http://jakarta.apache.org/site/downloads/downloads_commons-configuration.cgi .*/commons-configuration-(.*)-src.tar.gz
-
+http://ftp.uni-erlangen.de/pub/mirrors/apache/commons/configuration/source/commons-configuration-(.*)-src.tar.gz \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list