[pkg-java] r6844 - in trunk/easymock: . debian
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Sat Aug 9 20:06:04 UTC 2008
Author: janpascal-guest
Date: 2008-08-09 20:06:04 +0000 (Sat, 09 Aug 2008)
New Revision: 6844
Modified:
trunk/easymock/build.xml
trunk/easymock/debian/changelog
trunk/easymock/debian/control
trunk/easymock/debian/copyright
trunk/easymock/debian/libeasymock-java-doc.doc-base
trunk/easymock/debian/rules
Log:
New upstream version
Build with OpenJDK
Reformatted debian/copyright to pacify lintian
Update build.xml to build javadocs with source=5
Update standards-version to 3.8.0
Update doc-base section to Programming/Java
Modified: trunk/easymock/build.xml
===================================================================
--- trunk/easymock/build.xml 2008-08-06 18:55:47 UTC (rev 6843)
+++ trunk/easymock/build.xml 2008-08-09 20:06:04 UTC (rev 6844)
@@ -8,7 +8,7 @@
<property name="build" location="build"/>
<property name="build.test" location="tests-build"/>
<property name="javadoc" location="api"/>
- <property name="jarfile" location="${dist}/easymock-2.3.jar"/>
+ <property name="jarfile" location="${dist}/easymock-2.4.jar"/>
<target name="init">
<!-- Create the build directory structure used by compile -->
@@ -48,12 +48,8 @@
</target>
<target name="javadoc" depends="init" description="generate api docs">
- <!-- gjdoc does not support source=1.5 -->
- <javadoc destdir="${javadoc}" source="1.4">
- <fileset dir="${src}" defaultexcludes="yes">
- <!-- gjdoc barfs on the following class -->
- <exclude name="org/easymock/LogicalOperator.java"/>
- </fileset>
+ <javadoc destdir="${javadoc}" source="1.5">
+ <fileset dir="${src}" defaultexcludes="yes"/>
</javadoc>
</target>
Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog 2008-08-06 18:55:47 UTC (rev 6843)
+++ trunk/easymock/debian/changelog 2008-08-09 20:06:04 UTC (rev 6844)
@@ -1,3 +1,14 @@
+easymock (2.4+ds1-1) unstable; urgency=low
+
+ * New upstream version
+ * Build with OpenJDK
+ * Reformatted debian/copyright to pacify lintian
+ * Update build.xml to build javadocs with source=5
+ * Update standards-version to 3.8.0
+ * Update doc-base section to Programming/Java
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Sat, 09 Aug 2008 22:03:08 +0200
+
easymock (2.3+ds1-2) unstable; urgency=low
* Updated Vcs-* and Homepage fields in control file
Modified: trunk/easymock/debian/control
===================================================================
--- trunk/easymock/debian/control 2008-08-06 18:55:47 UTC (rev 6843)
+++ trunk/easymock/debian/control 2008-08-09 20:06:04 UTC (rev 6844)
@@ -6,9 +6,9 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/easymock/
Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/easymock/
Build-Depends: cdbs, debhelper (>= 5.0.42), dpatch (>= 2.0),
- java-gcj-compat-dev (>= 1.0.77-2), ant-optional (>= 1.7.0),
+ openjdk-6-jdk (>= 6b11-5), ant-optional (>= 1.7.0),
junit4 (>= 4.3.1)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://www.easymock.org
Package: libeasymock-java
Modified: trunk/easymock/debian/copyright
===================================================================
--- trunk/easymock/debian/copyright 2008-08-06 18:55:47 UTC (rev 6843)
+++ trunk/easymock/debian/copyright 2008-08-09 20:06:04 UTC (rev 6844)
@@ -14,22 +14,23 @@
License:
EasyMock 2 License (MIT License)
- 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 to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- the Software, and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
+ 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
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
The Debian packaging (build.xml and the files under debian/) is
Copyright 2007 Jan-Pascal van Best <janpascal at vanbest.org>. It is
Modified: trunk/easymock/debian/libeasymock-java-doc.doc-base
===================================================================
--- trunk/easymock/debian/libeasymock-java-doc.doc-base 2008-08-06 18:55:47 UTC (rev 6843)
+++ trunk/easymock/debian/libeasymock-java-doc.doc-base 2008-08-09 20:06:04 UTC (rev 6844)
@@ -4,7 +4,7 @@
Abstract: This document describes how to use the
Java EasyMock library when testing your Java code.
Contains API documentation and sample code.
-Section: Apps/Programming
+Section: Programming/Java
Format: HTML
Index: /usr/share/doc/libeasymock-java-doc/Documentation.html
Modified: trunk/easymock/debian/rules
===================================================================
--- trunk/easymock/debian/rules 2008-08-06 18:55:47 UTC (rev 6843)
+++ trunk/easymock/debian/rules 2008-08-09 20:06:04 UTC (rev 6844)
@@ -17,8 +17,8 @@
INSTDIR=$(CURDIR)/debian/libeasymock-java
JAVADIR=$(INSTDIR)/usr/share/java
-# Explicitly build with gcj
-JAVA_HOME = /usr/lib/jvm/java-gcj
+# Explicitly build with OpenJDK
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk
JAR = $(JAVA_HOME)/bin/jar
# Set ant parameters
More information about the pkg-java-commits
mailing list