[SCM] sezpoz packaging branch, master, updated. upstream/1.9-3-g9c1de51

[James Page]

The following commit has been merged in the master branch:
commit 9c1de51b3bbab54121e8c757823dfbf591629eb8
Author: James Page <james.page at ubuntu.com>
Date:   Mon Dec 12 09:47:29 2011 +0000

    Fix FTBFS with OpenJDK7:
    
    * Fix FTBFS with OpenJDK7:
      - d/patches/fix-java7-compat.patch: Backported patch from upstream trunk
        to ensure tools.jar picked up during build process.

diff --git a/debian/changelog b/debian/changelog
index a0384a9..a033ae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sezpoz (1.9-2) unstable; urgency=low
+
+  * Fix FTBFS with OpenJDK7:
+    - d/patches/fix-java7-compat.patch: Backported patch from upstream trunk
+      to ensure tools.jar picked up during build process. 
+
+ -- James Page <james.page at ubuntu.com>  Mon, 12 Dec 2011 09:46:17 +0000
+
 sezpoz (1.9-1) unstable; urgency=low
 
   * Initial release. (Closes: #629083)
diff --git a/debian/patches/fix-java7-compat.patch b/debian/patches/fix-java7-compat.patch
new file mode 100644
index 0000000..96f2698
--- /dev/null
+++ b/debian/patches/fix-java7-compat.patch
@@ -0,0 +1,21 @@
+Description: Fix compilation error on JDK 7u1.
+ (${java.vendor} is now "Oracle Corporation".)
+Author: jglick
+Origin: http://java.net/projects/sezpoz/sources/svn/revision/156
+
+--- a/sezpoz/pom.xml (revision 155)
++++ b/sezpoz/pom.xml (revision 156)
+@@ -14,10 +14,9 @@
+         <profile>
+             <id>default-tools.jar</id>
+             <activation>
+-                <property>
+-                    <name>java.vendor</name>
+-                    <value>Sun Microsystems Inc.</value>
+-                </property>
++                <file>
++                    <exists>${java.home}/../lib/tools.jar</exists>
++                </file>
+             </activation>
+             <dependencies>
+                 <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index 5879227..185b715 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build.patch
+fix-java7-compat.patch

-- 
sezpoz packaging