This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-logging-java.
commit 13f4630da5af015a30c99e103f2d5f9259ac0398 Author: Kumar Appaiah <[email protected]> Date: Fri Sep 21 20:14:43 2007 +0000 * New upstream release. * debian/control: + Add Varun Hiremath and Kumar Appaiah as uploaders. + Add Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields. + Move cdbs and debhelper to Build-Depends, rest to Build-Depends-Indep. * debian/links: Removed, functionality in debian/rules. * debian/dirs: Removed, functionality in debian/rules. * debian/compat: Bump to 5. * debian/patches/01_target13_BuildXml.patch: updated for new upstream release. * debian/watch: Bump to version 3. --- debian/changelog | 15 +++++++++++++++ debian/compat | 2 +- debian/control | 8 ++++++-- debian/dirs | 1 - debian/docs | 2 +- debian/links | 2 -- debian/patches/01_target13_BuildXml.patch | 27 ++++++++++++++++----------- debian/rules | 14 ++++++++++---- debian/watch | 2 +- 9 files changed, 50 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 65fe33b..bc76a4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libcommons-logging-java (1.1-1) UNRELEASED; urgency=low + + * New upstream release. + * debian/control: + + Add Varun Hiremath and Kumar Appaiah as uploaders. + + Add Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields. + + Move cdbs and debhelper to Build-Depends, rest to Build-Depends-Indep. + * debian/links: Removed, functionality in debian/rules. + * debian/dirs: Removed, functionality in debian/rules. + * debian/compat: Bump to 5. + * debian/patches/01_target13_BuildXml.patch: updated for new upstream release. + * debian/watch: Bump to version 3. + + -- Kumar Appaiah <[email protected]> Sat, 22 Sep 2007 01:45:56 +0530 + libcommons-logging-java (1.0.4-6) unstable; urgency=low * Use java-gcj-compat instead of kaffe. 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 8c2796e..493f178 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,13 @@ Source: libcommons-logging-java Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 4.2.30), cdbs, ant, ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit +Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]> +Build-Depends: debhelper (>= 5), cdbs +Build-Depends-Indep: ant, ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit Standards-Version: 3.7.2 +XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging +XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging +Homepage: http://commons.apache.org/logging Package: libcommons-logging-java Architecture: all 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/docs b/debian/docs index 2471b9b..58ec8ed 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ STATUS.html -dist/docs/api +#dist/docs/api diff --git a/debian/links b/debian/links deleted file mode 100644 index 25dcdb0..0000000 --- a/debian/links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/java/commons-logging-1.0.4.jar usr/share/java/commons-logging.jar -usr/share/java/commons-logging-api-1.0.4.jar usr/share/java/commons-logging-api.jar diff --git a/debian/patches/01_target13_BuildXml.patch b/debian/patches/01_target13_BuildXml.patch index 8a9cae5..139b3ad 100644 --- a/debian/patches/01_target13_BuildXml.patch +++ b/debian/patches/01_target13_BuildXml.patch @@ -1,11 +1,16 @@ ---- build.xml.orig 2005-08-09 11:00:26.000000000 +0200 -+++ build.xml 2005-08-09 11:01:19.000000000 +0200 -@@ -258,7 +258,7 @@ - destdir="${build.home}/classes" - debug="${compile.debug}" - deprecation="${compile.deprecation}" -- optimize="${compile.optimize}"> -+ optimize="${compile.optimize}" target="1.3"> - <classpath refid="compile.classpath"/> - <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" - unless="jdk.1.4.present"/> +diff -Nur libcommons-logging-java-1.1/build.xml libcommons-logging-java-1.1.new/build.xml +--- libcommons-logging-java-1.1/build.xml 2006-05-10 03:15:08.000000000 +0530 ++++ libcommons-logging-java-1.1.new/build.xml 2007-09-22 01:08:23.000000000 +0530 +@@ -125,10 +125,10 @@ + <!-- ========== Compiler Defaults ========================================= --> + + <!-- Version of java class files to generate. --> +- <property name="target.version" value="1.1"/> ++ <property name="target.version" value="1.3"/> + + <!-- Version of java source to accept --> +- <property name="source.version" value="1.2"/> ++ <property name="source.version" value="1.3"/> + + <!-- Should Java compilations set the 'debug' compiler option? --> + <property name="compile.debug" value="true"/> diff --git a/debian/rules b/debian/rules index 0a1a875..315eb52 100755 --- a/debian/rules +++ b/debian/rules @@ -3,14 +3,20 @@ 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 JAVA_HOME := /usr/lib/jvm/java-gcj ANT_HOME := /usr/share/ant -DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit +DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit -DEB_ANT_BUILD_TARGET := compile javadoc test +DEB_ANT_BUILD_TARGET := dist install/libcommons-logging-java:: - install -m 644 target/commons-logging.jar debian/libcommons-logging-java/usr/share/java/commons-logging-1.0.4.jar - install -m 644 target/commons-logging-api.jar debian/libcommons-logging-java/usr/share/java/commons-logging-api-1.0.4.jar + dh_install target/commons-logging-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link usr/share/java/commons-logging-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging.jar + dh_install target/commons-logging-adapters-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link usr/share/java/commons-logging-adapters-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging-adapters.jar + dh_install target/commons-logging-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link usr/share/java/commons-logging-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging-api.jar + diff --git a/debian/watch b/debian/watch index a147e42..5be43a5 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=2 +version=3 http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-logging-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
