[easymock] 11/41: 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

Markus Koschany apo-guest at moszumanska.debian.org
Tue Nov 25 16:49:10 GMT 2014 

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository easymock.

commit 574faa10167d4f8a258a0eeafaefe965c1f95779
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Sat Aug 9 20:06:04 2008 +0000

    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
---
 build.xml                            | 10 +++-------
 debian/changelog                     | 11 +++++++++++
 debian/control                       |  4 ++--
 debian/copyright                     | 23 ++++++++++++-----------
 debian/libeasymock-java-doc.doc-base |  2 +-
 debian/rules                         |  4 ++--
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/build.xml b/build.xml
index 1088f58..77fa4dc 100644
--- a/build.xml
+++ b/build.xml
@@ -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>
 
diff --git a/debian/changelog b/debian/changelog
index 2bf9953..fa93118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index c273136..dab0a79 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
 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
diff --git a/debian/copyright b/debian/copyright
index 539588a..af4842a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,22 +14,23 @@ Copyright: 2001-2007 OFFIS <http://www.offis.de>
 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
diff --git a/debian/libeasymock-java-doc.doc-base b/debian/libeasymock-java-doc.doc-base
index c03f1b2..84f984d 100644
--- a/debian/libeasymock-java-doc.doc-base
+++ b/debian/libeasymock-java-doc.doc-base
@@ -4,7 +4,7 @@ Author: Tammo Freese
 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
diff --git a/debian/rules b/debian/rules
index 14f8f8d..4f10015 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,8 @@ CHANGESFILE = ../easymock_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git

More information about the pkg-java-commits mailing list