[pkg-java] r11799 - in trunk/easyconf/debian: . patches

Mon Mar 1 23:26:43 UTC 2010

Author: drazzib
Date: 2010-03-01 23:26:43 +0000 (Mon, 01 Mar 2010)
New Revision: 11799

Added:
   trunk/easyconf/debian/patches/fix_test.diff
Removed:
   trunk/easyconf/debian/patches/disable_test.diff
Modified:
   trunk/easyconf/debian/changelog
   trunk/easyconf/debian/control
   trunk/easyconf/debian/copyright
   trunk/easyconf/debian/patches/series
   trunk/easyconf/debian/rules
Log:
fix debian/copyright and active unit testing

Modified: trunk/easyconf/debian/changelog
===================================================================

--- trunk/easyconf/debian/changelog	2010-03-01 23:05:35 UTC (rev 11798)
+++ trunk/easyconf/debian/changelog	2010-03-01 23:26:43 UTC (rev 11799)
@@ -1,5 +1,5 @@
-easyconf (0.9.5-1) UNRELEASED; urgency=low
+easyconf (0.9.5-1) unstable; urgency=low
 
   * Initial release. (Closes: #571261)
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 22 Feb 2010 21:51:10 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 01 Mar 2010 23:32:58 +0100

Modified: trunk/easyconf/debian/control
===================================================================
--- trunk/easyconf/debian/control	2010-03-01 23:05:35 UTC (rev 11798)
+++ trunk/easyconf/debian/control	2010-03-01 23:26:43 UTC (rev 11799)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, maven-repo-helper,
  libcommons-collections3-java, libcommons-logging-java, libcommons-lang-java,
  libcommons-digester-java, libcommons-configuration-java, libcommons-beanutils-java,
- libstruts1.2-java, libservlet2.5-java, libxstream-java
+ libstruts1.2-java, libservlet2.5-java, libxstream-java, junit, ant-optional
 Standards-Version: 3.8.4
 Homepage: http://easyconf.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/easyconf/
@@ -37,7 +37,7 @@
 Section: doc
 Depends: ${misc:Depends}
 Suggests: libeasyconf-java
-Description: library to access configuration of software components - javadoc
+Description: library to access configuration of software components - Javadoc
  EasyConf is a library to access configuration of software components
  and applications.
  .

Modified: trunk/easyconf/debian/copyright
===================================================================
--- trunk/easyconf/debian/copyright	2010-03-01 23:05:35 UTC (rev 11798)
+++ trunk/easyconf/debian/copyright	2010-03-01 23:26:43 UTC (rev 11799)
@@ -5,23 +5,28 @@
 
 
 Files: *
-Copyright: Copyright 2004-2005 Germinus XXI
+Copyright: 2004-2005 Germinus XXI
+Copyright: 2004-2005 Germinus XXI, Liferay LLC
 License: Apache-2.0
 
+Files: src/test/digester-rules.dtd
+Copyright: 2005 Apache Software Foundation
+License: Apache-2.0
+
 Files: src/java/com/germinus/easyconf/servlet/RefreshConfigurationServlet.java
 Copyright: Copyright (c) 2000-2004 Liferay, LLC. 
-License: BSD
+License: MIT
 
 Files: debian/*
-Copyright: Copyright 2010, Damien Raude-Morvan <drazzib at debian.org>
-License: Apache-2.0 | BSD
+Copyright: 2010, Damien Raude-Morvan <drazzib at debian.org>
+License: Apache-2.0 | MIT
 
 
 License: Apache-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
 
-License: BSD
+License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights

Deleted: trunk/easyconf/debian/patches/disable_test.diff
===================================================================
--- trunk/easyconf/debian/patches/disable_test.diff	2010-03-01 23:05:35 UTC (rev 11798)
+++ trunk/easyconf/debian/patches/disable_test.diff	2010-03-01 23:26:43 UTC (rev 11799)
@@ -1,20 +0,0 @@
-Index: easyconf-0.9.5/build.xml
-===================================================================
---- easyconf-0.9.5.orig/build.xml	2010-02-22 23:04:18.070250466 +0100
-+++ easyconf-0.9.5/build.xml	2010-02-22 23:04:34.582282093 +0100
-@@ -64,7 +64,7 @@
-       </fileset>
-     </copy>
-   </target>
--  <target name="jar" description="o Create the jar" depends="compile,test">
-+  <target name="jar" description="o Create the jar" depends="compile">
-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-     </jar>
-   </target>
-@@ -220,4 +220,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-     </unjar>
-   </target>
--</project>
-\ No newline at end of file
-+</project>

Added: trunk/easyconf/debian/patches/fix_test.diff
===================================================================
--- trunk/easyconf/debian/patches/fix_test.diff	                        (rev 0)
+++ trunk/easyconf/debian/patches/fix_test.diff	2010-03-01 23:26:43 UTC (rev 11799)
@@ -0,0 +1,40 @@
+Description: build.xml: Fix tests
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-01
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -64,7 +64,7 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
+@@ -91,7 +91,7 @@
+   <target name="internal-test" depends="compile-tests">
+     <mkdir dir="${testreportdir}">
+     </mkdir>
+-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
++    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="false" haltonerror="false">
+       <sysproperty key="basedir" value=".">
+       </sysproperty>
+       <formatter type="xml">
+@@ -134,7 +134,7 @@
+       </classpath>
+     </javac>
+     <copy todir="${testclassesdir}">
+-      <fileset dir="/home/jorge/proyectos/easyconf/target/checkouts/easyconf/src/test">
++      <fileset dir="src/test">
+         <include name="*.properties">
+         </include>
+         <include name="*.xml">
+@@ -220,4 +220,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
++</project>

Modified: trunk/easyconf/debian/patches/series
===================================================================
--- trunk/easyconf/debian/patches/series	2010-03-01 23:05:35 UTC (rev 11798)
+++ trunk/easyconf/debian/patches/series	2010-03-01 23:26:43 UTC (rev 11799)
@@ -1 +1 @@
-disable_test.diff
+fix_test.diff

Modified: trunk/easyconf/debian/rules
===================================================================
--- trunk/easyconf/debian/rules	2010-03-01 23:05:35 UTC (rev 11798)
+++ trunk/easyconf/debian/rules	2010-03-01 23:26:43 UTC (rev 11799)
@@ -8,8 +8,9 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 DEB_JARS  := commons-collections3 commons-logging commons-lang commons-digester commons-configuration commons-beanutils \
-             struts-1.2 servlet-api-2.5 jsp-api-2.1 xstream
+             struts-1.2 servlet-api-2.5 jsp-api-2.1 xstream junit ant-junit
 DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_CHECK_TARGET := internal-test
 
 makebuilddir::
 	-mkdir -p src/conf


