This is an automated email from the git hooks/post-receive script. nomadium-guest pushed a commit to branch master in repository jmock2.
commit 2725ea0085621c6daa9f6aa52f261c5d64cc55c7 Author: Stephen Nelson <[email protected]> Date: Sun Sep 29 21:30:22 2013 +0100 Add fix for #717122 --- debian/changelog | 10 ++++++++-- debian/control | 6 +++--- debian/patches/00ignore.pc | 10 +++++----- debian/patches/03runtestsagainstsyslibs | 9 ++++----- debian/patches/04javadoc | 16 ++++++++-------- debian/patches/series | 3 --- debian/rules | 2 +- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e98256..35e5197 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ -jmock2 (2.5.1+dfsg-3) UNRELEASED; urgency=low +jmock2 (2.7-SNAPSHOT+dfsg-1) UNRELEASED; urgency=low + [ Emmanuel Bourg ] * Use canonical URLs for the Vcs-* fields * debian/copyright: Removed the reference to /usr/share/common-licenses/BSD and quote the license text. * debian/rules: Improved the clean target - -- Emmanuel Bourg <[email protected]> Wed, 17 Jul 2013 13:31:36 +0200 + [ Stephen Nelson ] + * New upstream version to fix FTBFS. (Closes: #717122) + * Updated standards version. No changes + * Removed bundled jar files + + -- Stephen Nelson <[email protected]> Thu, 05 Sep 2013 21:16:12 +0100 jmock2 (2.5.1+dfsg-2) unstable; urgency=low diff --git a/debian/control b/debian/control index b81afa4..056c7f0 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: jmock2 Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Gabriele Giacone <[email protected]> +Uploaders: Gabriele Giacone <[email protected]>, Stephen Nelson <[email protected]> Build-Depends: debhelper (>> 7), javahelper (>= 0.29), ant, cdbs, ant-optional, maven-repo-helper -Build-Depends-Indep: default-jdk, libhamcrest-java (>= 1.2), libcglib-java, libasm3-java, +Build-Depends-Indep: default-jdk, libhamcrest-java (>= 1.3), libcglib-java, libasm3-java, junit4, bsh, libobjenesis-java -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-java/jmock2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jmock2.git Homepage: http://www.jmock.org diff --git a/debian/patches/00ignore.pc b/debian/patches/00ignore.pc index 45742ee..5599527 100644 --- a/debian/patches/00ignore.pc +++ b/debian/patches/00ignore.pc @@ -1,11 +1,11 @@ Description: Ignores .pc directory Author: Gabriele Giacone <[email protected]> ---- jmock2-2.5.1+dfsg.orig/build.xml -+++ jmock2-2.5.1+dfsg/build.xml +--- a/build.xml ++++ b/build.xml @@ -1,4 +1,5 @@ <project name="jMock 2" default="build"> -+ <defaultexcludes add=".pc/**"/> - <property name="version" value="2-SNAPSHOT"/> ++ <defaultexcludes add=".pc/**"/> + <property name="version" value="2.7-SNAPSHOT"/> + <property name="hamcrest.version" value="1.3" /> <property name="distdir" value="build/jmock-${version}"/> - diff --git a/debian/patches/03runtestsagainstsyslibs b/debian/patches/03runtestsagainstsyslibs index 6e75041..8610d1a 100644 --- a/debian/patches/03runtestsagainstsyslibs +++ b/debian/patches/03runtestsagainstsyslibs @@ -1,17 +1,16 @@ Description: Runs tests against system libraries Author: Gabriele Giacone <[email protected]> ---- jmock2-2.5.1+dfsg.orig/build.xml -+++ jmock2-2.5.1+dfsg/build.xml -@@ -226,6 +226,13 @@ +--- a/build.xml ++++ b/build.xml +@@ -232,6 +232,12 @@ <classpath> <path refid="build.classpath"/> <fileset dir="${distdir}" includes="*.jar"/> + <fileset dir="/usr/share/java" includes="hamcrest-core.jar"/> + <fileset dir="/usr/share/java" includes="hamcrest-library.jar"/> -+ <fileset dir="/usr/share/java" includes="cglib.jar"/> ++ <fileset dir="/usr/share/java" includes="cglib-nodeps.jar"/> + <fileset dir="/usr/share/java" includes="objenesis.jar"/> -+ <fileset dir="/usr/share/java" includes="asm3.jar"/> + <fileset dir="/usr/share/java" includes="junit4.jar"/> + <fileset dir="/usr/share/java" includes="bsh.jar"/> </classpath> diff --git a/debian/patches/04javadoc b/debian/patches/04javadoc index 41dca86..da848ae 100644 --- a/debian/patches/04javadoc +++ b/debian/patches/04javadoc @@ -1,23 +1,23 @@ Description: To use Javadoc from upstream Author: Gabriele Giacone <[email protected]> ---- jmock2-2.5.1+dfsg.orig/build.xml -+++ jmock2-2.5.1+dfsg/build.xml -@@ -193,8 +193,6 @@ +--- a/build.xml ++++ b/build.xml +@@ -195,8 +195,6 @@ <target name="javadoc" depends="dir.dist"> <mkdir dir="build/extract/hamcrest-api"/> -- <unzip src="lib/hamcrest-core-1.1.jar" dest="build/extract/hamcrest-api"/> -- <unzip src="lib/hamcrest-library-1.1.jar" dest="build/extract/hamcrest-api"/> +- <unzip src="lib/hamcrest-core-${hamcrest.version}.jar" dest="build/extract/hamcrest-api"/> +- <unzip src="lib/hamcrest-library-${hamcrest.version}.jar" dest="build/extract/hamcrest-api"/> <mkdir dir="${distdir}/doc"/> <javadoc destdir="${distdir}/doc" source="1.5" failonerror="yes" -@@ -209,8 +207,6 @@ +@@ -211,8 +209,6 @@ </packageset> <group title="jMock 2" packages="org.jmock, org.jmock.*"/> - <group title="Hamcrest API" packages="org.hamcrest"/> - <group title="Hamcrest Matcher Library" packages="org.hamcrest.*"/> - <link offline="false" href="http://java.sun.com/j2se/1.5.0/docs/api/"/> - <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/> + <link offline="true" href="http://www.junit.org/junit/javadoc_40/"; + packagelistloc="javadoc-lists/junit-4.11"/> diff --git a/debian/patches/series b/debian/patches/series index fc13b14..a8a2856 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ 00ignore.pc -01buildwithjdk1.6only -02buildwithcglib2.2 03runtestsagainstsyslibs 04javadoc -05hamcrest12.diff diff --git a/debian/rules b/debian/rules index a7ef27c..a77bdba 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := hamcrest-core hamcrest-library junit4 cglib bsh asm3 objenesis \ +DEB_JARS := hamcrest-core hamcrest-library junit4 cglib-nodep bsh asm3 objenesis \ ant-junit DEB_ANT_BUILD_TARGET = zip.jars javadoc UVERSION := $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|sed 's/+dfsg-[^-]*$$//') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
