[jmock2] 01/01: * Amended build path to include system jars and upped source to 1.6. * Fixed unmappable characters when compiling with java 6. * Bumped debhelper to 9

Stephen Nelson stephenonelson-guest at alioth.debian.org
Thu Oct 3 20:36:56 UTC 2013


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

stephenonelson-guest pushed a commit to branch master
in repository jmock2.

commit aced803affbbd1b9e406aafb89c6f51d50880df2
Author: Stephen Nelson <stephen at eccostudio.com>
Date:   Thu Oct 3 20:37:04 2013 +0100

     * Amended build path to include system jars and upped source to 1.6.
     * Fixed unmappable characters when compiling with java 6.
     * Bumped debhelper to 9
---
 debian/changelog                        |    3 ++
 debian/compat                           |    2 +-
 debian/control                          |    2 +-
 debian/patches/03runtestsagainstsyslibs |   48 ++++++++++++++++++++++---------
 debian/patches/04javadoc                |   10 +++++--
 debian/patches/09unmappablecharacters   |   18 ++++++++++++
 debian/patches/series                   |    1 +
 7 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90e3e22..71b4973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ jmock2 (2.7~snapshot+201309170925-gitd7fe69b5+dfsg-1) UNRELEASED; urgency=low
   * New upstream version to fix FTBFS. (Closes: #717122, #717249).
   * Bump Standards-Version. No changes were required.
   * Removed bundled jar files.
+  * Bumped debhelper to version 9.
+  * Patched build.xml to create java 1.6 source.
+  * Patched source for unmappable character when using java 1.6 javadoc generation. 
 
  -- Miguel Landaeta <miguel at miguel.cc>  Sun, 29 Sep 2013 18:03:06 -0300
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 056c7f0..5e6a99e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>, Stephen Nelson <stephen at eccostudio.com>
-Build-Depends: debhelper (>> 7), javahelper (>= 0.29), ant, cdbs, ant-optional,
+Build-Depends: debhelper (>= 9), javahelper (>= 0.29), ant, cdbs, ant-optional,
  maven-repo-helper
 Build-Depends-Indep: default-jdk, libhamcrest-java (>= 1.3), libcglib-java, libasm3-java,
  junit4, bsh, libobjenesis-java
diff --git a/debian/patches/03runtestsagainstsyslibs b/debian/patches/03runtestsagainstsyslibs
index 33947e2..0c67796 100644
--- a/debian/patches/03runtestsagainstsyslibs
+++ b/debian/patches/03runtestsagainstsyslibs
@@ -3,16 +3,38 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- 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-nodep.jar"/>
-+				<fileset dir="/usr/share/java" includes="objenesis.jar"/>
-+				<fileset dir="/usr/share/java" includes="junit4.jar"/>
-+				<fileset dir="/usr/share/java" includes="bsh.jar"/>
- 			</classpath>
- 			
- 			<formatter type="brief" usefile="no"/>
+@@ -6,6 +6,12 @@
+ 
+ 	<path id="build.classpath">
+ 		<fileset dir="lib" includes="*.jar" excludes="*-src.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-nodep.jar"/>
++                <fileset dir="/usr/share/java" includes="objenesis.jar"/>
++                <fileset dir="/usr/share/java" includes="junit4.jar"/>
++                <fileset dir="/usr/share/java" includes="bsh.jar"/>    
+ 	</path>
+ 
+ 	<target name="build"
+@@ -57,8 +63,8 @@
+ 			   sourcepath="src;test;example;testdata-classes"
+ 			   debug="yes"
+ 			   failonerror="yes"
+-			   source="1.5" 
+-			   target="1.5"
++			   source="1.6" 
++			   target="1.6"
+ 			   excludes="testdata/**"/>
+ 	</target>
+ 
+@@ -172,8 +178,8 @@
+ 		       srcdir="testdata"
+ 			   debug="yes"
+ 			   failonerror="yes"
+-		       source="1.5" 
+-		       target="1.5"/>
++		       source="1.6" 
++		       target="1.6"/>
+ 	</target>
+ 	
+ 	<target name="testdata.unsigned-jar" depends="testdata.classes">
diff --git a/debian/patches/04javadoc b/debian/patches/04javadoc
index da848ae..2a92b53 100644
--- a/debian/patches/04javadoc
+++ b/debian/patches/04javadoc
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -195,8 +195,6 @@
+@@ -201,11 +201,9 @@
  	
  	<target name="javadoc" depends="dir.dist">
  		<mkdir dir="build/extract/hamcrest-api"/>
@@ -11,8 +11,12 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 -		<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"
-@@ -211,8 +209,6 @@
+-		<javadoc destdir="${distdir}/doc" source="1.5" failonerror="yes"
++		<javadoc destdir="${distdir}/doc" source="1.6" failonerror="yes"
+ 			classpathref="build.classpath"
+ 			overview="src/overview.html">
+ 
+@@ -217,8 +215,6 @@
  			</packageset>
  			
  			<group title="jMock 2" packages="org.jmock, org.jmock.*"/>
diff --git a/debian/patches/09unmappablecharacters b/debian/patches/09unmappablecharacters
new file mode 100644
index 0000000..88c5d3a
--- /dev/null
+++ b/debian/patches/09unmappablecharacters
@@ -0,0 +1,18 @@
+Description: Fix unmappable character
+  The pound symbol was not valid ascii so it was replaced
+  by the unicode character.
+Author: Stephen Nelson <stephen at eccostudio.com> 
+Forwarded: no
+Last-Update: 2013-10-03
+
+--- a/example/org/jmock/example/sniper/Money.java
++++ b/example/org/jmock/example/sniper/Money.java
+@@ -27,7 +27,7 @@
+ 
+     @Override
+     public String toString() {
+-        return "£" + amount;
++        return "\u00a3" + amount;
+     }
+ 
+     @Override
diff --git a/debian/patches/series b/debian/patches/series
index ebeb1ec..40fe8b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 06donthaltonjunitfailure
 07missinghamcrestjar
 08mavenpoms
+09unmappablecharacters

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



More information about the pkg-java-commits mailing list