[SCM] maven-stapler-plugin packaging branch, master, updated. debian/1.16-3-1-g063965b

[James Page]

The following commit has been merged in the master branch:
commit 063965b5063aa6af6de4fd60906ede9754ae2ae6
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jun 20 19:45:02 2012 +0100

    Fix FTBFS with openjdk-7 (LP: #888980):
    
    * Fix FTBFS with openjdk-7 (LP: #888980):
      - d/patches/java7-compat.patch: Add profile to pickup tools.jar for
        OpenJDK7.
    * Bumped Standards-Version to 3.9.3:
      - d/copyright: Reference released version of DEP-5.

diff --git a/debian/changelog b/debian/changelog
index f6bc475..c13b371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+maven-stapler-plugin (1.16-4) unstable; urgency=low
+
+  * Fix FTBFS with openjdk-7 (LP: #888980):
+    - d/patches/java7-compat.patch: Add profile to pickup tools.jar for
+      OpenJDK7.
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Reference released version of DEP-5.
+
+ -- James Page <james.page at ubuntu.com>  Wed, 20 Jun 2012 19:34:31 +0100
+
 maven-stapler-plugin (1.16-3) unstable; urgency=low
 
   * d/control: Fixup missing runtime dependencies due to failure in 
diff --git a/debian/control b/debian/control
index 60374da..1f60e52 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends-Indep:
  libqdox-java,
  libstapler-java,
  libstapler-java-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://stapler.java.net/
 Vcs-Git: git://git.debian.org/git/pkg-java/maven-stapler-plugin.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/maven-stapler-plugin.git
diff --git a/debian/copyright b/debian/copyright
index f097135..aea3257 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: Maven Stapler plugin
 Source: http://stapler.java.net/
 
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
new file mode 100644
index 0000000..16d364d
--- /dev/null
+++ b/debian/patches/java7-compat.patch
@@ -0,0 +1,34 @@
+Description: Add profile to pickup tools.jar file when vendor
+ is Oracle Corporation - this ensure compatiblity with OpenJDK7
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+Index: maven-stapler-plugin/pom.xml
+===================================================================
+--- maven-stapler-plugin.orig/pom.xml	2012-06-19 18:11:12.786411092 +0100
++++ maven-stapler-plugin/pom.xml	2012-06-20 19:34:21.778450559 +0100
+@@ -170,5 +170,24 @@
+         </dependency>
+       </dependencies>
+     </profile>
++    <profile>
++      <!-- OpenJDK7 Compatibility -->
++      <id>default-tools7.jar</id>
++      <activation>
++        <property>
++          <name>java.vendor</name>
++          <value>Oracle Corporation</value>
++        </property>
++      </activation>
++      <dependencies>
++        <dependency>
++          <groupId>com.sun</groupId>
++          <artifactId>tools</artifactId>
++          <version>1.7.0</version>
++          <scope>system</scope>
++          <systemPath>${java.home}/../lib/tools.jar</systemPath>
++        </dependency>
++      </dependencies>
++    </profile>
+   </profiles>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index 250fb7f..00b7b03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+java7-compat.patch
 disable-taglibdoc-mojo.patch
 stapler-compat.patch

-- 
maven-stapler-plugin packaging