[pkg-java] r5330 - in trunk/commons-beanutils/debian: . patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Sun Jan 6 21:05:24 UTC 2008


Author: mkoch
Date: 2008-01-06 21:05:24 +0000 (Sun, 06 Jan 2008)
New Revision: 5330

Removed:
   trunk/commons-beanutils/debian/dirs
   trunk/commons-beanutils/debian/docs
   trunk/commons-beanutils/debian/libcommons-beanutils-java.links
   trunk/commons-beanutils/debian/patches/01_build_xml.patch
Modified:
   trunk/commons-beanutils/debian/ant.properties
   trunk/commons-beanutils/debian/changelog
   trunk/commons-beanutils/debian/rules
   trunk/commons-beanutils/debian/watch
Log:
commons-beanutils (1.8.0~beta-1) unstable; urgency=low

  [ Kumar Appaiah ]
  * Add a watch file.
  * debian/control:
    + Add Vcs-{Svn,Browser}.
    + Add Homepage field.

  [ Michael Koch ]
  * New upstream version.
  * Updated Standards-Version to 3.7.3.

 -- Michael Koch <konqueror at gmx.de>  Sun, 06 Jan 2008 21:25:27 +0100



Modified: trunk/commons-beanutils/debian/ant.properties
===================================================================
--- trunk/commons-beanutils/debian/ant.properties	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/ant.properties	2008-01-06 21:05:24 UTC (rev 5330)
@@ -1,3 +1,6 @@
+maven.compile.source=1.3
+maven.compile.target=1.3
+
 junit.jar=/usr/share/java/junit.jar
 commons-logging.jar=/usr/share/java/commons-logging.jar
 test.failonerror=false

Modified: trunk/commons-beanutils/debian/changelog
===================================================================
--- trunk/commons-beanutils/debian/changelog	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/changelog	2008-01-06 21:05:24 UTC (rev 5330)
@@ -1,4 +1,4 @@
-commons-beanutils (1.7.0-6) UNRELEASED; urgency=low
+commons-beanutils (1.8.0~beta-1) unstable; urgency=low
 
   [ Kumar Appaiah ]
   * Add a watch file.
@@ -7,9 +7,10 @@
     + Add Homepage field.
 
   [ Michael Koch ]
+  * New upstream version.
   * Updated Standards-Version to 3.7.3.
 
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 20 Sep 2007 20:08:47 +0530
+ -- Michael Koch <konqueror at gmx.de>  Sun, 06 Jan 2008 21:25:27 +0100
 
 commons-beanutils (1.7.0-5) unstable; urgency=low
 

Deleted: trunk/commons-beanutils/debian/dirs
===================================================================
--- trunk/commons-beanutils/debian/dirs	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/dirs	2008-01-06 21:05:24 UTC (rev 5330)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/commons-beanutils/debian/docs
===================================================================
--- trunk/commons-beanutils/debian/docs	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/docs	2008-01-06 21:05:24 UTC (rev 5330)
@@ -1 +0,0 @@
-STATUS.html

Deleted: trunk/commons-beanutils/debian/libcommons-beanutils-java.links
===================================================================
--- trunk/commons-beanutils/debian/libcommons-beanutils-java.links	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/libcommons-beanutils-java.links	2008-01-06 21:05:24 UTC (rev 5330)
@@ -1 +0,0 @@
-/usr/share/java/commons-beanutils-1.7.0.jar /usr/share/java/commons-beanutils.jar

Deleted: trunk/commons-beanutils/debian/patches/01_build_xml.patch
===================================================================
--- trunk/commons-beanutils/debian/patches/01_build_xml.patch	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/patches/01_build_xml.patch	2008-01-06 21:05:24 UTC (rev 5330)
@@ -1,11 +0,0 @@
---- build.xml.orig	2005-09-18 19:32:39.000000000 +0200
-+++ build.xml	2005-09-18 19:33:13.000000000 +0200
-@@ -164,7 +164,7 @@
-            destdir="${build.home}/classes"
-              debug="${compile.debug}"
-        deprecation="${compile.deprecation}"
--          optimize="${compile.optimize}">
-+          optimize="${compile.optimize}" target="1.3">
-       <classpath refid="compile.classpath"/>
-     </javac>
-     <copy    todir="${build.home}/classes" filtering="on">

Modified: trunk/commons-beanutils/debian/rules
===================================================================
--- trunk/commons-beanutils/debian/rules	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/rules	2008-01-06 21:05:24 UTC (rev 5330)
@@ -5,16 +5,11 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-
 JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar commons-logging commons-collections3 junit
+DEB_JARS := commons-logging commons-collections3 junit
 DEB_ANT_BUILD_TARGET := dist
 
-clean::
-	-rm -Rf optional/bean-collections/dist 
-	-rm -Rf optional/bean-collections/target
-
 install/libcommons-beanutils-java::
-	install -m 644 dist/commons-beanutils.jar debian/libcommons-beanutils-java/usr/share/java/commons-beanutils-1.7.0.jar
+	install -m 644 -D dist/commons-beanutils-1.8.0-BETA.jar debian/libcommons-beanutils-java/usr/share/java/commons-beanutils-1.8.0-BETA.jar
+	dh_link -plibcommons-beanutils-java usr/share/java/commons-beanutils-1.8.0-BETA.jar usr/share/java/commons-beanutils.jar

Modified: trunk/commons-beanutils/debian/watch
===================================================================
--- trunk/commons-beanutils/debian/watch	2008-01-06 19:44:31 UTC (rev 5329)
+++ trunk/commons-beanutils/debian/watch	2008-01-06 21:05:24 UTC (rev 5330)
@@ -1,2 +1,3 @@
 version=3
-http://www.reverse.net/pub/apache/commons/beanutils/source/commons-beanutils-(.*)-src\.tar\.gz debian uupdate
+opts=uversionmangle=s/-BETA/~beta/ \
+	http://www.reverse.net/pub/apache/commons/beanutils/source/commons-beanutils-(.*)-src\.tar\.gz debian uupdate




More information about the pkg-java-commits mailing list