[pkg-java] r4252 - in trunk/commons-logging/debian: . patches

kumanna-guest at alioth.debian.org kumanna-guest at alioth.debian.org
Fri Sep 21 20:14:43 UTC 2007 

Author: kumanna-guest
Date: 2007-09-21 20:14:43 +0000 (Fri, 21 Sep 2007)
New Revision: 4252

Removed:
   trunk/commons-logging/debian/dirs
   trunk/commons-logging/debian/links
Modified:
   trunk/commons-logging/debian/changelog
   trunk/commons-logging/debian/compat
   trunk/commons-logging/debian/control
   trunk/commons-logging/debian/docs
   trunk/commons-logging/debian/patches/01_target13_BuildXml.patch
   trunk/commons-logging/debian/rules
   trunk/commons-logging/debian/watch
Log:
* 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.


Modified: trunk/commons-logging/debian/changelog
===================================================================
--- trunk/commons-logging/debian/changelog	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/changelog	2007-09-21 20:14:43 UTC (rev 4252)
@@ -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 <akumar at ee.iitm.ac.in>  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.

Modified: trunk/commons-logging/debian/compat
===================================================================
--- trunk/commons-logging/debian/compat	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/compat	2007-09-21 20:14:43 UTC (rev 4252)
@@ -1 +1 @@
-4
+5

Modified: trunk/commons-logging/debian/control
===================================================================
--- trunk/commons-logging/debian/control	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/control	2007-09-21 20:14:43 UTC (rev 4252)
@@ -2,9 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <abdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-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 <abdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
+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

Deleted: trunk/commons-logging/debian/dirs
===================================================================
--- trunk/commons-logging/debian/dirs	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/dirs	2007-09-21 20:14:43 UTC (rev 4252)
@@ -1 +0,0 @@
-usr/share/java

Modified: trunk/commons-logging/debian/docs
===================================================================
--- trunk/commons-logging/debian/docs	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/docs	2007-09-21 20:14:43 UTC (rev 4252)
@@ -1,2 +1,2 @@
 STATUS.html
-dist/docs/api
+#dist/docs/api

Deleted: trunk/commons-logging/debian/links
===================================================================
--- trunk/commons-logging/debian/links	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/links	2007-09-21 20:14:43 UTC (rev 4252)
@@ -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

Modified: trunk/commons-logging/debian/patches/01_target13_BuildXml.patch
===================================================================
--- trunk/commons-logging/debian/patches/01_target13_BuildXml.patch	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/patches/01_target13_BuildXml.patch	2007-09-21 20:14:43 UTC (rev 4252)
@@ -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"/>

Modified: trunk/commons-logging/debian/rules
===================================================================
--- trunk/commons-logging/debian/rules	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/rules	2007-09-21 20:14:43 UTC (rev 4252)
@@ -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
+

Modified: trunk/commons-logging/debian/watch
===================================================================
--- trunk/commons-logging/debian/watch	2007-09-21 19:41:15 UTC (rev 4251)
+++ trunk/commons-logging/debian/watch	2007-09-21 20:14:43 UTC (rev 4252)
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate

More information about the pkg-java-commits mailing list