This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository easymock.
commit 63bd78525d72e0c25ef2bd7a18bfd0b55c7ef57d Author: Markus Koschany <[email protected]> Date: Tue Aug 6 18:36:08 2013 +0000 New upstream release 2.5.2+ds-1 - Fix RC bug #713751 - Use dh sequencer and javahelper - Remove unnecessary files. - Update to debhelper 9, compat 9 - Create get-orig-source and get-orig-pom target - Drop 10_create_link_to_samples_and_javadocs_in_Documentation.dpatch - See also changelog for 2.5.2+ds-1 --- debian/README.source | 25 +- debian/ant.properties | 11 - debian/build.xml | 41 ++- debian/changelog | 34 +++ debian/compat | 2 +- debian/control | 54 ++-- debian/copyright | 57 ++-- debian/easymock-2.4.pom | 159 ---------- debian/get-orig-source | 57 ---- debian/libeasymock-java-doc.docs | 4 + debian/libeasymock-java-doc.javadoc | 1 + debian/libeasymock-java.jlibs | 1 + debian/libeasymock-java.poms | 2 +- ...to_samples_and_javadocs_in_Documentation.dpatch | 32 -- debian/patches/java7-compat.patch | 51 ++-- debian/patches/series | 1 - debian/pom.xml | 338 +++++++++++++++++++++ debian/rules | 122 ++++---- debian/uscan-upstream-version.xslt | 10 - debian/uscan-url.xslt | 10 - debian/watch | 5 +- 21 files changed, 555 insertions(+), 462 deletions(-) diff --git a/debian/README.source b/debian/README.source index 56d7b29..a848f01 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,23 +1,12 @@ README.Debian-source for EasyMock ================================= -The download from upstream is a ZIP file which contains: -- src.zip, containing the source files for EasyMock -- tests.zip, containing unit test source and class files -- samples.zip containing sample source and class files -- HTML documentation -- pre-build javadocs -- pre-build JAR file -- Clover results +Please use debian/rules get-orig-source to obtain the dfsg compatible sources for +EasyMock. -The debian/get-orig-source.sh script downloads the upstream source that belongs -with this Debian package, and creates the easymock_$VERSION.orig.tar.gz used as -Debian source file. The script does the following: -- unpack the upstream ZIP file to a temporary directory -- unpack src.zip to src/ -- unpack tests.zip to tests/ and remove all class files from it -- unpack samples.zip to samples/ and remove all class files from it -- remove the pre-build javadocs and JAR file -- remove the Clover result files -- tar and gzip the result +During this process the following files will be removed: +- jar files +- class files +- META-INF directories +- html documentation diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index 9e0d843..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,11 +0,0 @@ -# Ant properties file for Debian easymock source package - -# javac settings used by Lucene compilation -javac.debug=off -javac.nowarn=on -javac.verbose=no -build.compiler=javac1.5 -compile.debug=off -compile.optimize=on -ant.build.javac.source=1.5 -ant.build.javac.target=1.5 diff --git a/debian/build.xml b/debian/build.xml index 55116a5..5bd4c1f 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -1,4 +1,4 @@ -<project name="easymock" default="dist" basedir=".."> +<project name="easymock" default="jar" basedir="../"> <description> build file for easymock </description> @@ -8,7 +8,21 @@ <property name="build" location="build"/> <property name="build.test" location="tests-build"/> <property name="javadoc" location="api"/> - <property name="jarfile" location="${dist}/easymock-2.4.jar"/> + <property name="jarfile" location="${dist}/easymock.jar"/> + <property name="lib.dir" location="/usr/share/java"/> + + <path id="classpath"> + <fileset dir="${lib.dir}" includes="**/*.jar"/> + </path> + <path id="junit.classpath"> + <pathelement location="${build}"/> + <pathelement location="${build.test}"/> + <pathelement location="/usr/share/java/junit4.jar"/> + <!-- only needed for version 3.2 and later --> + <!-- <pathelement location="/usr/share/java/objenesis.jar"/> + <pathelement location="/usr/share/java/cglib.jar"/> + <pathelement location="/usr/share/java/asm3.jar"/>--> + </path> <target name="init"> <!-- Create the build directory structure used by compile --> @@ -18,37 +32,36 @@ <mkdir dir="${dist}"/> </target> - <target name="compile" depends="init" - description="compile the source" > + <target name="compile" depends="init" description="compile the source" > <!-- Compile the java code from ${src} into ${build} --> - <javac srcdir="${src}" destdir="${build}"/> + <javac target="1.5" source="1.5" srcdir="${src}" includeantruntime="true" destdir="${build}" classpathref="classpath"/> </target> <target name="compile-tests" depends="init,compile" description="compile the unit tests" > - <javac srcdir="tests" destdir="${build.test}" classpath="${build}"/> + <javac target="1.5" source="1.5" srcdir="tests" includeantruntime="true" destdir="${build.test}" + classpathref="classpath" classpath="${build}"/> </target> <target name="test" depends="init,compile,compile-tests" description="run unit tests"> <junit printsummary="yes" haltonfailure="yes" haltonerror="yes"> - <classpath> - <pathelement location="${build}"/> - <pathelement location="${build.test}"/> - </classpath> - <formatter type="plain" usefile="false"/> - + <classpath refid="junit.classpath"/> <batchtest> <fileset dir="tests"> <include name="**/*Test*.java"/> - <exclude name="**/AllTests.java"/> + <exclude name="**/*CaptureTest.java"/> + <exclude name="**/*EasyMockPropertiesTest.java"/> + <!-- only needed for version 3.2 and later --> + <!-- <exclude name="**/*BaseEasyMockRunnerTest.java"/> + <exclude name="**/*DependencyTest.java"/>--> </fileset> </batchtest> </junit> </target> <target name="javadoc" depends="init" description="generate api docs"> - <javadoc destdir="${javadoc}" source="1.5"> + <javadoc destdir="${javadoc}" source="1.5" classpathref="classpath"> <fileset dir="${src}" defaultexcludes="yes"/> </javadoc> </target> diff --git a/debian/changelog b/debian/changelog index 027e92e..4191e6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +easymock (2.5.2+ds-1) unstable; urgency=low + + * New upstream release. (Closes: #713751) + * Bump Standards-Version to 3.9.4, no changes. + * Bump compat level to 9 and require debhelper >= 9. + * debian/rules: + - Add a new get-orig-source and get-orig-pom target. + - Use dh sequencer instead of cdbs and simplify debian/rules. + - Build with javahelper and jh_maven_repo_helper. + * Remove the following files, no longer needed. + - get-orig-source script. + - ant.properties. + - uscan helper files. + * debian/control: + - Add myself to Uploaders. + - Remove obsolete DM-Upload-allowed flag. + - Use canonical Vcs-URI. + - Add javahelper and ant to Build-Depends, remove cdbs. + - Move junit4 and default-jdk to Build-Depends-Indep. + - libeasymock-java: Suggest junit4. + * Update debian/watch file to detect the latest upstream release. + * debian/patches: + - Refresh java7-compat.patch. + - Drop 10_create_link_to_samples_and_javadocs_in_Documentation.dpatch + because the rest of the documentation is easy to find in the same place + as Documentation.html. + * Update debian/copyright to copyright format 1.0. The new upstream license + for EasyMock is Apache-2.0. + * Update pom.xml for easymock 2.5.2. + * Update build.xml and extend classpath locations, so that compile and test + targets can be run successfully. + + -- Markus Koschany <[email protected]> Tue, 06 Aug 2013 19:33:38 +0200 + easymock (2.4+ds1-7) unstable; urgency=low * Team upload. diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 899dfa4..76d2a70 100644 --- a/debian/control +++ b/debian/control @@ -2,36 +2,48 @@ Source: easymock Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Jan-Pascal van Best <[email protected]> -DM-Upload-Allowed: yes -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), default-jdk, ant-optional (>= 1.7.0), - junit4 (>= 4.6-2), maven-repo-helper -Standards-Version: 3.9.2 +Uploaders: + Jan-Pascal van Best <[email protected]>, + Markus Koschany <[email protected]> +Build-Depends: + ant, + ant-optional, + debhelper (>= 9), + javahelper, + maven-repo-helper +Build-Depends-Indep: + default-jdk, + junit4 +Standards-Version: 3.9.4 Homepage: http://www.easymock.org +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/easymock/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/easymock/ Package: libeasymock-java Architecture: all -Depends: ${misc:Depends} -Suggests: libeasymock-java-doc +Depends: + ${java:Depends}, + ${misc:Depends} +Suggests: + junit4, + libeasymock-java-doc Description: Java library to generate Mock Objects for given interfaces - EasyMock 2 is a library that provides an easy way to use Mock Objects for given - interfaces. Mock Objects simulate parts of the behavior of domain code, - and are able to check whether they are used as defined. - Domain classes can be tested in isolation - by simulating their collaborators with Mock Objects. + EasyMock 2 is a library that provides an easy way to use Mock Objects for + given interfaces. Mock Objects simulate parts of the behavior of domain code, + and are able to check whether they are used as defined. Domain classes can be + tested in isolation by simulating their collaborators with Mock Objects. Package: libeasymock-java-doc Architecture: all -Depends: ${misc:Depends} +Depends: + ${misc:Depends} Section: doc -Enhances: libeasymock-java +Enhances: + libeasymock-java Description: Java library to generate Mock Objects for given interfaces (documentation) - EasyMock 2 is a library that provides an easy way to use Mock Objects for given - interfaces. Mock Objects simulate parts of the behavior of domain code, - and are able to check whether they are used as defined. - Domain classes can be tested in isolation - by simulating their collaborators with Mock Objects. + EasyMock 2 is a library that provides an easy way to use Mock Objects for + given interfaces. Mock Objects simulate parts of the behavior of domain code, + and are able to check whether they are used as defined. Domain classes can be + tested in isolation by simulating their collaborators with Mock Objects. . This package contains the documentation for the Mock Objects library. diff --git a/debian/copyright b/debian/copyright index af4842a..ba7907c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,37 +1,20 @@ -This package was debianized by Jan-Pascal van Best <[email protected]> on -Tue, 11 Sep 2007 14:03:47 +0200 - -It was downloaded from http://www.easymock.org/Downloads.html - -Run the debian/get-orig-source.sh script to download the upstream ZIP file and -create the source tarball used by Debian. See README.Debian-source for details. - -Upstream Authors: Tammo Freese <http://tammofreese.de> - -Copyright: 2001-2007 OFFIS <http://www.offis.de> - 2001-2007 Tammo Freese <http://tammofreese.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: - - 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. - -The Debian packaging (build.xml and the files under debian/) is -Copyright 2007 Jan-Pascal van Best <[email protected]>. It is -licensed under the terms of the EasyMock 2 License above. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: EasyMock +Source: http://easymock.org/Downloads.html + + +Files: * +Copyright: 2001-2013, OFFIS, Tammo Freese, Henri Tremblay +License: Apache-2.0 + +Files: debian/* +Copyright: 2007-2009, Jan-Pascal van Best <[email protected]> + 2009, Damien Raude-Morvan <[email protected]> + 2010-2011, Torsten Werner <[email protected]> + 2012, Niels Thykier <[email protected]> + 2013, Markus Koschany <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". diff --git a/debian/easymock-2.4.pom b/debian/easymock-2.4.pom deleted file mode 100644 index 575b285..0000000 --- a/debian/easymock-2.4.pom +++ /dev/null @@ -1,159 +0,0 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.4</version> - <packaging>jar</packaging> - <name>EasyMock</name> - <url>http://www.easymock.org</url> - <description>EasyMock provides an easy way to create Mock Objects for interfaces by generating them on the fly using Java's proxy mechanism</description> - <licenses> - <license> - <name>MIT License</name> - <url>http://www.easymock.org/License.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <developers> - <developer> - <id>tammo</id> - <name>Tammo Freese</name> - <timezone>+1</timezone> - </developer> - <developer> - <id>henri</id> - <name>Henri Tremblay</name> - <url>http://www.jroller.com/Henri/</url> - <organization>Ossia Conseil</organization> - <organizationUrl>http://ossia-conseil.com</organizationUrl> - <timezone>+1</timezone> - </developer> - </developers> - <issueManagement> - <system>SourceForge</system> - <url>http://sourceforge.net/tracker/?group_id=82958</url> - </issueManagement> - <mailingLists> - <mailingList> - <name>User List</name> - <subscribe>From Yahoo groups</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - <archive>http://tech.groups.yahoo.com/group/easymock/</archive> - </mailingList> - </mailingLists> - <scm> - <url>http://easymock.cvs.sourceforge.net/easymock/</url> - <developerConnection>scm:cvs:ext:[email protected]:/cvsroot/easymock:easymock</developerConnection> - <connection>scm:cvs:pserver:[email protected]:/cvsroot/easymock:easymock</connection> - </scm> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <sourceDirectory>${basedir}/src</sourceDirectory> - <testSourceDirectory>${basedir}/src-tests</testSourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <index>true</index> - <manifestEntries> - <EasyMock-Version>${pom.version}</EasyMock-Version> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- plugin> - <artifactId>maven-clover-plugin</artifactId> - <version>2.4</version> - <configuration> - <licenseLocation>${basedir}/lib/clover.license</licenseLocation> - <jdk>1.5</jdk> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <configuration> - <targetPercentage>100%</targetPercentage> - </configuration> - <goals> - <goal>instrument</goal> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin--> - </plugins> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - </build> - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <excludePackageNames>*.internal</excludePackageNames> - <bottom><![CDATA[<i>Copyright © 2001-2008 OFFIS, Tammo Freese. This documentation is provided under the terms of the MIT licence.</i>]]></bottom> - </configuration> - </plugin> - </plugins> - </reporting> - <distributionManagement> - <repository> - <id>easymock-release</id> - <name>EasyMock Repository</name> - <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository</url> - </repository> - <snapshotRepository> - <id>easymock-snapshot</id> - <name>EasyMock Snapshot Repository</name> - <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository-snapshot</url> - </snapshotRepository> - </distributionManagement> -</project> diff --git a/debian/get-orig-source b/debian/get-orig-source deleted file mode 100755 index 10be288..0000000 --- a/debian/get-orig-source +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -USCAN_VERSION=`uscan --version | grep -o "version [0-9.]*" | grep -o "[0-9]*\.[0-9]*\.[0-9]*"` -if [ ${USCAN_VERSION:0:4} = "2.9." ]; then - # Version 2.9 of uscan has a bug, fixed in 2.10 - DEHS=`( uscan --no-download --dehs ; echo "</dehs>")` -else - DEHS=`uscan --no-download --dehs` -fi - -URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -` -VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -` - -DESTDIR=$PWD/.. -UPSTREAM_SOURCE=$DESTDIR/easymock$VERSION.zip -ORIGFILE=$DESTDIR/easymock_$VERSION+ds1.orig.tar.gz - -# Download upstream source -wget "$URL" -O $UPSTREAM_SOURCE - -# Easymock.zip contains the source files -# Repackage upstream source file without the third party jars -TEMPDIR=`mktemp -d easymockXXXXXX` -BASEDIR="$TEMPDIR/easymock-$VERSION" - -echo "Unpacking into tempdir $TEMPDIR..." -unzip -q $UPSTREAM_SOURCE -d $TEMPDIR - -mv $TEMPDIR/easymock$VERSION $BASEDIR - -mkdir $BASEDIR/src -mkdir $BASEDIR/tests -mkdir $BASEDIR/samples - -unzip -q $BASEDIR/src.zip -d $BASEDIR/src -rm -f $BASEDIR/src.zip - -unzip -q $BASEDIR/tests.zip -d $BASEDIR/tests -find $BASEDIR/tests -name \*.class -exec rm {} \; -rm -f $BASEDIR/tests.zip - -unzip -q $BASEDIR/samples.zip -d $BASEDIR/samples -find $BASEDIR/samples -name \*.class -exec rm {} \; -rm -f $BASEDIR/samples.zip - -rm -rf $BASEDIR/clover -rm -rf $BASEDIR/javadoc -rm -f $BASEDIR/easymock.jar - -echo "Packing new orig source tarball $ORIGFILE..." -rm -f $ORIGFILE -cd $TEMPDIR -GZIP=--best tar czf $ORIGFILE * -cd $DESTDIR - -echo "Removing tempdir..." -rm -rf "$TEMPDIR" diff --git a/debian/libeasymock-java-doc.docs b/debian/libeasymock-java-doc.docs new file mode 100644 index 0000000..b6133ae --- /dev/null +++ b/debian/libeasymock-java-doc.docs @@ -0,0 +1,4 @@ +Documentation.html +Documentation_fr.html +samples +easymock.css diff --git a/debian/libeasymock-java-doc.javadoc b/debian/libeasymock-java-doc.javadoc new file mode 100644 index 0000000..eedd89b --- /dev/null +++ b/debian/libeasymock-java-doc.javadoc @@ -0,0 +1 @@ +api diff --git a/debian/libeasymock-java.jlibs b/debian/libeasymock-java.jlibs new file mode 100644 index 0000000..00752d9 --- /dev/null +++ b/debian/libeasymock-java.jlibs @@ -0,0 +1 @@ +dist/easymock.jar diff --git a/debian/libeasymock-java.poms b/debian/libeasymock-java.poms index 4ffc7fe..3a895d1 100644 --- a/debian/libeasymock-java.poms +++ b/debian/libeasymock-java.poms @@ -1 +1 @@ -debian/easymock-2.4.pom +debian/pom.xml --no-parent --usj-name=easymock diff --git a/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch b/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch deleted file mode 100644 index 6c01ab1..0000000 --- a/debian/patches/10_create_link_to_samples_and_javadocs_in_Documentation.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_create_link_to_javadocs_in_Documentation.dpatch by Jan-Pascal van Best <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Update documentation to link to the installed API docs and samples - -@DPATCH@ ---- a/Documentation.html -+++ b/Documentation.html -@@ -122,7 +122,7 @@ - <p> - The code for both the class and the interface may be found - in the package --<code>org.easymock.samples</code> in <code>samples.zip</code>. -+<code>org.easymock.samples</code> in the <a href="samples/">samples</a> directory. - </p> - <p> - The following examples assume that you are familiar with the JUnit testing framework. -@@ -877,6 +877,13 @@ - provides the functionality for callbacks. - </p> - <h2> -+EasyMock API documentation -+</h2> -+<p> -+The API documentation for EasyMock is available in the -+<a href="api/">api</a> directory. -+</p> -+<h2> - EasyMock Development - </h2> - <p> diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch index cf69583..15f0567 100644 --- a/debian/patches/java7-compat.patch +++ b/debian/patches/java7-compat.patch @@ -1,16 +1,23 @@ -Description: This patch works around tighter closure handling in - Java 7 and aligns to changes in easymock 3.1 upstream. - . - This patch should be dropped when the new version of easymock - is uploaded. -Author: James Page <[email protected]> +From: James Page <[email protected]> +Date: Tue, 6 Aug 2013 19:50:34 +0200 +Subject: java7 compat + +This patch works around tighter closure handling in Java 7 and aligns to +changes in easymock 3.1 upstream. This patch should be dropped when the new +version of easymock is uploaded. + Forwarded: not-needed -Index: easymock/src/org/easymock/EasyMock.java -=================================================================== ---- easymock.orig/src/org/easymock/EasyMock.java 2012-05-21 11:56:31.111766000 +0100 -+++ easymock/src/org/easymock/EasyMock.java 2012-05-21 12:01:38.793400467 +0100 -@@ -1430,7 +1430,7 @@ +--- + src/org/easymock/EasyMock.java | 12 ++++++------ + tests/org/easymock/tests2/CaptureTest.java | 14 +++++++------- + 2 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/org/easymock/EasyMock.java b/src/org/easymock/EasyMock.java +index 3b3309d..9b10b69 100644 +--- a/src/org/easymock/EasyMock.java ++++ b/src/org/easymock/EasyMock.java +@@ -1468,7 +1468,7 @@ public class EasyMock { * @param captured Where the parameter is captured * @return <code>0</code> */ @@ -19,7 +26,7 @@ Index: easymock/src/org/easymock/EasyMock.java reportMatcher(new Captures<Integer>(captured)); return 0; } -@@ -1441,7 +1441,7 @@ +@@ -1479,7 +1479,7 @@ public class EasyMock { * @param captured Where the parameter is captured * @return <code>0</code> */ @@ -28,7 +35,7 @@ Index: easymock/src/org/easymock/EasyMock.java reportMatcher(new Captures<Long>(captured)); return 0; } -@@ -1452,7 +1452,7 @@ +@@ -1490,7 +1490,7 @@ public class EasyMock { * @param captured Where the parameter is captured * @return <code>0</code> */ @@ -37,7 +44,7 @@ Index: easymock/src/org/easymock/EasyMock.java reportMatcher(new Captures<Float>(captured)); return 0; } -@@ -1463,7 +1463,7 @@ +@@ -1501,7 +1501,7 @@ public class EasyMock { * @param captured Where the parameter is captured * @return <code>0</code> */ @@ -46,7 +53,7 @@ Index: easymock/src/org/easymock/EasyMock.java reportMatcher(new Captures<Double>(captured)); return 0; } -@@ -1474,7 +1474,7 @@ +@@ -1512,7 +1512,7 @@ public class EasyMock { * @param captured Where the parameter is captured * @return <code>0</code> */ @@ -55,7 +62,7 @@ Index: easymock/src/org/easymock/EasyMock.java reportMatcher(new Captures<Byte>(captured)); return 0; } -@@ -1485,7 +1485,7 @@ +@@ -1523,7 +1523,7 @@ public class EasyMock { * @param captured Where the parameter is captured * @return <code>0</code> */ @@ -64,11 +71,11 @@ Index: easymock/src/org/easymock/EasyMock.java reportMatcher(new Captures<Character>(captured)); return 0; } -Index: easymock/tests/org/easymock/tests2/CaptureTest.java -=================================================================== ---- easymock.orig/tests/org/easymock/tests2/CaptureTest.java 2012-05-21 11:56:31.111766000 +0100 -+++ easymock/tests/org/easymock/tests2/CaptureTest.java 2012-05-21 12:08:58.146906680 +0100 -@@ -57,7 +57,7 @@ +diff --git a/tests/org/easymock/tests2/CaptureTest.java b/tests/org/easymock/tests2/CaptureTest.java +index d1b4b98..19b880f 100644 +--- a/tests/org/easymock/tests2/CaptureTest.java ++++ b/tests/org/easymock/tests2/CaptureTest.java +@@ -119,7 +119,7 @@ public class CaptureTest { Capture<Integer> capture = new Capture<Integer>(); IMethods mock = createMock(IMethods.class); @@ -77,7 +84,7 @@ Index: easymock/tests/org/easymock/tests2/CaptureTest.java expect(mock.oneArg((Integer) capture(capture))).andReturn("answer"); replay(mock); -@@ -98,12 +98,12 @@ +@@ -160,12 +160,12 @@ public class CaptureTest { IMethods mock = createMock(IMethods.class); diff --git a/debian/patches/series b/debian/patches/series index 0d34367..3d96cba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -10_create_link_to_samples_and_javadocs_in_Documentation.dpatch java7-compat.patch diff --git a/debian/pom.xml b/debian/pom.xml new file mode 100644 index 0000000..a8dcb9a --- /dev/null +++ b/debian/pom.xml @@ -0,0 +1,338 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- +Copyright 2003-2009 Henri Tremblay + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.5.2</version> + <packaging>jar</packaging> + <name>EasyMock</name> + <url>http://www.easymock.org</url> + <description>EasyMock provides an easy way to create Mock Objects for interfaces by generating them on the fly using Java's proxy mechanism</description> + <inceptionYear>2001</inceptionYear> + <licenses> + <license> + <name>Apache 2</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <organization> + <name>OFFIS, Tammo Freese, Henri Tremblay</name> + </organization> + <developers> + <developer> + <id>tammo</id> + <name>Tammo Freese</name> + <timezone>+1</timezone> + </developer> + <developer> + <id>henri</id> + <name>Henri Tremblay</name> + <url>http://www.ossia-conseil.com/blog/henri</url> + <organization>Ossia Conseil</organization> + <organizationUrl>http://ossia-conseil.com</organizationUrl> + <timezone>+1</timezone> + </developer> + </developers> + <issueManagement> + <system>SourceForge</system> + <url>http://sourceforge.net/tracker/?group_id=82958</url> + </issueManagement> + <mailingLists> + <mailingList> + <name>User List</name> + <subscribe>From Yahoo groups</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://tech.groups.yahoo.com/group/easymock/</archive> + </mailingList> + </mailingLists> + <scm> + <url>http://easymock.svn.sourceforge.net/viewvc/easymock/trunk/easymock/</url> + <developerConnection>scm:svn:https://easymock.svn.sourceforge.net/svnroot/easymock/trunk/easymock</developerConnection> + <connection>scm:svn:http://easymock.svn.sourceforge.net/svnroot/easymock/trunk/easymock</connection> + </scm> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.keyboardsamurais.maven</groupId> + <artifactId>maven-timestamp-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>date</id> + <goals> + <goal>create</goal> + </goals> + <configuration> + <propertyName>date</propertyName> + <timestampPattern>yyyy-MM-dd</timestampPattern> + </configuration> + </execution> + <execution> + <id>year</id> + <goals> + <goal>create</goal> + </goals> + <configuration> + <propertyName>year</propertyName> + <timestampPattern>yyyy</timestampPattern> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <configuration> + <tasks /> + <testSourceRoot>${basedir}/src/samples/java</testSourceRoot> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <useDefaultManifestFile>true</useDefaultManifestFile> + <archive> + <index>true</index> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.7</version> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.0.0</version> + <configuration> + <instructions> + <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser, org.easymock</Export-Package> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <version>2.6.0</version> + <configuration> + <licenseLocation>${basedir}/clover.license</licenseLocation> + <targetPercentage>100.00%</targetPercentage> + <generateHtml>true</generateHtml> + <generateXml>false</generateXml> + <jdk>1.5</jdk> + <excludes> + <exclude>**/org/easymock/tests/IMethods.java</exclude> + <exclude>**/org/easymock/tests/IVarArgs.java</exclude> + <exclude>**/org/easymock/tests/Util.java</exclude> + <exclude>**/org/easymock/samples/*.java</exclude> + </excludes> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>instrument</goal> + <goal>clover</goal> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <!-- Run the tests with JDK 1.5 to be sure EasyMock is compliant --> + <jvm>${jdk1_5.jvm}</jvm> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-4</version> + <configuration> + <finalName>${project.artifactId}-${project.version}</finalName> + <descriptors> + <descriptor>${basedir}/src/main/assembly/assembly-tests.xml</descriptor> + <descriptor>${basedir}/src/main/assembly/assembly-samples.xml</descriptor> + <descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-5</version> + </extension> + </extensions> + </build> + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <excludePackageNames>*.internal</excludePackageNames> + <bottom><![CDATA[<i>Copyright © ${project.inceptionYear}-${year} OFFIS, Tammo Freese, Henri Tremblay. This documentation is provided under the terms of the Apache 2 licence.</i>]]></bottom> + </configuration> + </plugin> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <version>2.6.0</version> + <configuration> + <licenseLocation>${basedir}/clover.license</licenseLocation> + <jdk>1.5</jdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.1</version> + <configuration> + <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.4</version> + <configuration> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javancss-maven-plugin</artifactId> + <version>2.0-beta-2</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + <version>2.0-beta-2</version> + </plugin> + </plugins> + </reporting> + <distributionManagement> + <repository> + <id>easymock-release</id> + <name>EasyMock Repository</name> + <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository</url> + </repository> + <snapshotRepository> + <id>easymock-snapshot</id> + <name>EasyMock Snapshot Repository</name> + <url>scpexe://shell.sf.net/home/groups/e/ea/easymock/htdocs/maven/repository-snapshot</url> + </snapshotRepository> + </distributionManagement> +</project> diff --git a/debian/rules b/debian/rules index 478af48..5831543 100755 --- a/debian/rules +++ b/debian/rules @@ -1,66 +1,58 @@ #!/usr/bin/make -f -# -*- makefile -*- -# -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 - -# UPSTREAM_VERSION is what Apache Solr thinks its version is -# DEB_UPSTREAM_VERSION is the Debian source package version (with the +dsN) -UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*") -UPSTREAM_BASENAME = easymock-$(UPSTREAM_VERSION) -CHANGESFILE = ../easymock_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes - -INSTDIR=$(CURDIR)/debian/libeasymock-java -JAVADIR=$(INSTDIR)/usr/share/java - -JAVA_HOME = /usr/lib/jvm/default-java -JAR = $(JAVA_HOME)/bin/jar - -# Set ant parameters -DEB_ANT_BUILD_TARGET = jar javadoc -DEB_ANT_BUILDFILE = debian/build.xml -DEB_ANT_CHECK_TARGET = test -DEB_JARS = ant-junit junit4 - -DEB_INSTALL_DOCS_libeasymock-java := debian/README.source -DEB_INSTALL_DOCS_libeasymock-java-doc := debian/README.source Documentation*.html easymock.css samples api - -cleanbuilddir:: src -src: - debian/rules restore-from-source - -clean:: - mh_clean - -remove-source: - rm -rf src tests samples - rm -f *.html *.css - rm -f *stamp - rm -rf debian/patched - -restore-from-source: remove-source ../easymock_$(DEB_UPSTREAM_VERSION).orig.tar.gz - tar xzf ../easymock_$(DEB_UPSTREAM_VERSION).orig.tar.gz - mv $(UPSTREAM_BASENAME)/* . - rmdir $(UPSTREAM_BASENAME) - -get-orig-source: ../easymock_$(DEB_UPSTREAM_VERSION).orig.tar.gz - -../easymock_$(DEB_UPSTREAM_VERSION).orig.tar.gz: - debian/get-orig-source - -check: - lintian -i $(CHANGESFILE) - linda -i $(CHANGESFILE) - zgrep "^---" ../easymock_$(DEB_VERSION).diff.gz | grep -v "debian\|build.xml" ; [ $$? != 0 ] - ( dpkg --contents ../libeasymock-java_$(DEB_VERSION)_all.deb ; \ - dpkg --contents ../libeasymock-java-doc_$(DEB_VERSION)_all.deb ) | less - -upload: - dupload -t mentors $(CHANGESFILE) - -binary-post-install/libeasymock-java:: - mh_installpoms -plibeasymock-java - mh_installjar -plibeasymock-java -l debian/easymock-$(UPSTREAM_VERSION).pom dist/easymock-$(UPSTREAM_VERSION).jar +export JAVA_HOME=/usr/lib/jvm/default-java +PKD = $(abspath $(dir $(MAKEFILE_LIST))) +PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) +VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}') +DTYPE = +ds + +%: + dh $@ --with javahelper --with jh_maven_repo_helper + +override_dh_auto_build: + ant -f $(CURDIR)/debian/build.xml jar javadoc test + +override_dh_auto_clean: + dh_auto_clean + ant -f $(CURDIR)/debian/build.xml clean + +.PHONY: get-orig-source +## http://wiki.debian.org/onlyjob/get-orig-source +get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE)) + @ + +$(PKG)-$(VER): + @echo "# Downloading..." + uscan --noconf --verbose --rename --repack --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD) + @echo "# Extracting..." + mkdir -p \ + $(PKG)-$(VER)-PRE \ + $(PKG)-$(VER)/src \ + $(PKG)-$(VER)/samples \ + $(PKG)-$(VER)/tests \ + && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER)-PRE --strip-components 1 \ + || $(RM) -r $(PKG)-$(VER)-PRE + unzip $(PKG)-$(VER)-PRE/easymock-$(VER)-sources.jar -d $(PKG)-$(VER)/src + unzip $(PKG)-$(VER)-PRE/easymock-$(VER)-samples.jar -d $(PKG)-$(VER)/samples + unzip $(PKG)-$(VER)-PRE/easymock-$(VER)-tests.jar -d $(PKG)-$(VER)/tests + @echo "# Cleaning-up..." + $(RM) -r -v \ + $(PKG)-$(VER)-PRE/*.jar \ + $(PKG)-$(VER)-PRE/clover + cp -v $(PKG)-$(VER)-PRE/* $(PKG)-$(VER) + cd $(PKG)-$(VER) \ + && $(RM) -r -v \ + samples/META-INF/ \ + tests/META-INF/ \ + src/META-INF/ \ + && find . -depth -type f -name "*.class" -exec $(RM) '{}' \; + +$(PKG)_$(VER)$(DTYPE).orig.tar.xz: $(PKG)-$(VER) + @echo "# Packing..." + find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \ + | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \ + && $(RM) -r "$(PKG)-$(VER)" "$(PKG)-$(VER)-PRE" + + +get-orig-pom: + wget -O debian/pom.xml \ + http://repo1.maven.org/maven2/org/easymock/easymock/$(VER)/easymock-$(VER).pom diff --git a/debian/uscan-upstream-version.xslt b/debian/uscan-upstream-version.xslt deleted file mode 100644 index c257df4..0000000 --- a/debian/uscan-upstream-version.xslt +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> -<xsl:output method="text"/> - -<xsl:template match="dehs"> - <xsl:value-of select="upstream-version"/> -</xsl:template> - -</xsl:stylesheet> - diff --git a/debian/uscan-url.xslt b/debian/uscan-url.xslt deleted file mode 100644 index a5eedf2..0000000 --- a/debian/uscan-url.xslt +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> -<xsl:output method="text"/> - -<xsl:template match="dehs"> - <xsl:value-of select="upstream-url"/> -</xsl:template> - -</xsl:stylesheet> - diff --git a/debian/watch b/debian/watch index a02477a..d7fa572 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=3 - -opts=dversionmangle=s/\+ds\d+$// \ - http://sf.net/easymock/easymock([0-9.\.]*).zip +opts=dversionmangle=s/\+ds// \ + http://sf.net/easymock/easymock-([\d\.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
