[pkg-java] r3926 - in trunk/libcommons-modeler-java/debian: . patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-08-01 04:17:21 +0000 (Wed, 01 Aug 2007)
New Revision: 3926

Added:
   trunk/libcommons-modeler-java/debian/patches/
   trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch
Removed:
   trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.examples
Modified:
   trunk/libcommons-modeler-java/debian/
   trunk/libcommons-modeler-java/debian/changelog
   trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base
   trunk/libcommons-modeler-java/debian/rules
   trunk/libcommons-modeler-java/debian/watch
Log:
* Run JUnit tests during build time.
* Fixed debian/watch file to use new upstream tarball name.



Property changes on: trunk/libcommons-modeler-java/debian
___________________________________________________________________
Name: svn:ignore
   + files
libcommons-modeler-java
libcommons-modeler-java-doc
stamp-*
*.debhelper


Modified: trunk/libcommons-modeler-java/debian/changelog
===================================================================
--- trunk/libcommons-modeler-java/debian/changelog	2007-07-31 21:41:02 UTC (rev 3925)
+++ trunk/libcommons-modeler-java/debian/changelog	2007-08-01 04:17:21 UTC (rev 3926)
@@ -1,11 +1,16 @@
 libcommons-modeler-java (2.0.1-1) unstable; urgency=low
 
+  [ Marcus Better ]
   * New upstream release.
   * The API has changed incompatibly in this release. See the release
     notes for details.
 
- -- Marcus Better <marcus at better.se>  Fri, 01 Jun 2007 16:07:58 +0200
+  [ Michael Koch ]
+  * Run JUnit tests during build time.
+  * Fixed debian/watch file to use new upstream tarball name.
 
+ -- Michael Koch <konqueror at gmx.de>  Wed, 01 Aug 2007 06:14:34 +0200
+
 libcommons-modeler-java (1.1-9) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base
===================================================================
--- trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base	2007-07-31 21:41:02 UTC (rev 3925)
+++ trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base	2007-08-01 04:17:21 UTC (rev 3926)
@@ -5,5 +5,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-modeler-java-doc/apidocs/index.html
-Files: /usr/share/doc/libcommons-modeler-java-doc/apidocs/*
+Index: /usr/share/doc/libcommons-modeler-java-doc/api/index.html
+Files: /usr/share/doc/libcommons-modeler-java-doc/api/*

Deleted: trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.examples
===================================================================
--- trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.examples	2007-07-31 21:41:02 UTC (rev 3925)
+++ trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.examples	2007-08-01 04:17:21 UTC (rev 3926)
@@ -1 +0,0 @@
-dist/demo.tar.gz


Property changes on: trunk/libcommons-modeler-java/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Added: trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch	                        (rev 0)
+++ trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch	2007-08-01 04:17:21 UTC (rev 3926)
@@ -0,0 +1,20 @@
+--- build.xml.orig	2005-09-11 00:29:15.000000000 +0200
++++ build.xml	2005-09-11 00:28:55.000000000 +0200
+@@ -39,8 +39,6 @@
+   <property name="base.path"               value="/usr/local" />
+   <property name="jaxp.home"               value="${base.path}/jaxp-1.1"/>
+   <property name="junit.home"              value="${base.path}/junit3.7"/>
+-  <property name="commons.home"            location="../../jakarta-commons"/>
+-  <property name="sandbox.home"            location="../../jakarta-commons-sandbox"/>
+   <property name="digester.home"           value="${commons.home}/digester"/>
+   <property name="jmx.home"                value="${base.path}/jmx-ri_1.0.1/jmx"/>
+   <property name="logging.home"            value="${commons.home}/logging"/>
+@@ -173,7 +171,7 @@
+            destdir="${build.home}/classes"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+-          optimize="${compile.optimize}">
++          optimize="${compile.optimize}" source="1.3" target="1.3">
+       <classpath refid="compile.classpath"/>
+       <exclude name="org/apache/commons/modeler/ant/*PropertyHelper.java" unless="ant16.available" />
+       <exclude name="org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java" unless="digester.available" />

Modified: trunk/libcommons-modeler-java/debian/rules
===================================================================
--- trunk/libcommons-modeler-java/debian/rules	2007-07-31 21:41:02 UTC (rev 3925)
+++ trunk/libcommons-modeler-java/debian/rules	2007-08-01 04:17:21 UTC (rev 3926)
@@ -13,6 +13,7 @@
 
 # Ant targets to call
 DEB_ANT_BUILD_TARGET := dist
+DEB_ANT_CHECK_TARGET := test
 
 LIBRARY_PACKAGE := commons-modeler
 API_VERSION     := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)

Modified: trunk/libcommons-modeler-java/debian/watch
===================================================================
--- trunk/libcommons-modeler-java/debian/watch	2007-07-31 21:41:02 UTC (rev 3925)
+++ trunk/libcommons-modeler-java/debian/watch	2007-08-01 04:17:21 UTC (rev 3926)
@@ -1,2 +1,2 @@
-version=2
-http://www.apache.org/dist/jakarta/commons/modeler/source/modeler-(.*)-src\.tar\.gz debian uupdate
+version=3
+http://www.apache.org/dist/jakarta/commons/modeler/source/commons-modeler-(.*)-src\.tar\.gz debian uupdate