This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository easyconf.
commit e85cbc65d071025cfa0467878eac97fd35736865
Author: Damien Raude-Morvan <draz...@debian.org>
Date: Mon Mar 1 23:26:43 2010 +0000
fix debian/copyright and active unit testing
---
debian/changelog | 4 ++--
debian/control | 4 ++--
debian/copyright | 15 ++++++++++-----
debian/patches/disable_test.diff | 20 --------------------
debian/patches/fix_test.diff | 40 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +-
debian/rules | 3 ++-
7 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 732e017..8413509 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <draz...@debian.org> Mon, 22 Feb 2010 21:51:10 +0100
+ -- Damien Raude-Morvan <draz...@debian.org> Mon, 01 Mar 2010 23:32:58 +0100
diff --git a/debian/control b/debian/control
index f7a04c3..e9904db 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Damien Raude-Morvan <draz...@debian.org>
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 @@ Architecture: all
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.
.
diff --git a/debian/copyright b/debian/copyright
index 1bb10ee..f5567e3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,23 +5,28 @@ Source: http://sourceforge.net/projects/easyconf/files/
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 <draz...@debian.org>
-License: Apache-2.0 | BSD
+Copyright: 2010, Damien Raude-Morvan <draz...@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
diff --git a/debian/patches/disable_test.diff b/debian/patches/disable_test.diff
deleted file mode 100644
index 1c741db..0000000
--- a/debian/patches/disable_test.diff
+++ /dev/null
@@ -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>
diff --git a/debian/patches/fix_test.diff b/debian/patches/fix_test.diff
new file mode 100644
index 0000000..f19baa4
--- /dev/null
+++ b/debian/patches/fix_test.diff
@@ -0,0 +1,40 @@
+Description: build.xml: Fix tests
+Author: Damien Raude-Morvan <draz...@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>
diff --git a/debian/patches/series b/debian/patches/series
index 3990915..4ba54ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-disable_test.diff
+fix_test.diff
diff --git a/debian/rules b/debian/rules
index 63db799..e568cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,9 @@ MAVEN_REPO :=
http://repository.sonatype.org/service/local/repositorie
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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/easyconf.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
