[SCM] jenkins-winstone packaging branch, master, updated. debian/0.9.10-jenkins-37+dfsg-1-9-g8bbc546

[James Page]

The following commit has been merged in the master branch:
commit 8bbc5465bac01a1317e650b632824920c8f7980e
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jan 9 22:08:15 2013 +0000

    New upstream release:
    
    * New upstream release:
      - d/p/java7-compat.patch: Dropped - no longer required.
      - d/control,rules: Ensure package is built with Java 7.
    * Tidied lintian warnings.

diff --git a/debian/changelog b/debian/changelog
index db6304a..b3bf938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-jenkins-winstone (0.9.10-jenkins-41+dfsg-1~exp1) UNRELEASED; urgency=low
+jenkins-winstone (0.9.10-jenkins-41+dfsg-1~exp1) experimental; urgency=low
 
-  * New upstream release. 
+  * New upstream release:
+    - d/p/java7-compat.patch: Dropped - no longer required.
+    - d/control,rules: Ensure package is built with Java 7.
+  * Tidied lintian warnings.
 
  -- James Page <james.page at ubuntu.com>  Wed, 09 Jan 2013 17:07:22 +0000
 
diff --git a/debian/control b/debian/control
index de1ecff..db8bd64 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: James Page <james.page at ubuntu.com>
 Build-Depends:
  cdbs,
  debhelper (>= 7),
- default-jdk (>= 1:1.7) | openjdk-7-jdk,
+ openjdk-7-jdk,
  javahelper,
  maven-debian-helper (>= 1.4)
 Build-Depends-Indep:
@@ -17,11 +17,10 @@ Build-Depends-Indep:
  libmaven-antrun-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-enforcer-plugin-java
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://github.com/jenkinsci/winstone
 Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-winstone.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-winstone.git
-DM-Upload-Allowed: yes
 
 Package: libjenkins-winstone-java
 Architecture: all
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
deleted file mode 100644
index cac2491..0000000
--- a/debian/patches/java7-compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Add stubbed out methods to support compilation under
- Java 7
-Author: James Page <james.page at ubuntu.com>
-Forwarded: https://github.com/jenkinsci/winstone/pull/4
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -121,7 +121,7 @@
-                   <configuration>
-                     <rules>
-                       <requireJavaVersion>
--                        <version>[1.7,)</version>
-+                        <version>1.6,</version>
-                       </requireJavaVersion>
-                     </rules>
-                   </configuration>
diff --git a/debian/patches/series b/debian/patches/series
index 5024a24..e26083f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 specification-resources.patch
-java7-compat.patch
diff --git a/debian/rules b/debian/rules
index 7a3f338..f6ab5e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
-JAVA_HOME := /usr/lib/jvm/default-java
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+JAVA_HOME := /usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH)
 DEB_MAVEN_INSTALL_TO_USJ := false
 PACKAGE   := jenkins-winstone
 JAR       := winstone

-- 
jenkins-winstone packaging