[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 0337a21be52b3eca0c187a789489b4c4490bc6e4
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jan 9 17:27:45 2013 +0000

    Updates for new upstream release

diff --git a/debian/changelog b/debian/changelog
index 50500c4..be1f9f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jenkins-winstone (0.9.10-jenkins-41-1~exp1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+
+ -- James Page <james.page at ubuntu.com>  Wed, 09 Jan 2013 17:07:22 +0000
+
 jenkins-winstone (0.9.10-jenkins-37+dfsg-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 5c77528..de1ecff 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,
+ default-jdk (>= 1:1.7) | openjdk-7-jdk,
  javahelper,
  maven-debian-helper (>= 1.4)
 Build-Depends-Indep:
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
index b2ccada..cac2491 100644
--- a/debian/patches/java7-compat.patch
+++ b/debian/patches/java7-compat.patch
@@ -3,76 +3,14 @@ Description: Add stubbed out methods to support compilation under
 Author: James Page <james.page at ubuntu.com>
 Forwarded: https://github.com/jenkinsci/winstone/pull/4
 
-Index: jenkins-winstone/pom.xml
-===================================================================
---- jenkins-winstone.orig/pom.xml	2012-06-21 20:25:25.000000000 +0100
-+++ jenkins-winstone/pom.xml	2012-06-21 20:28:22.549686595 +0100
-@@ -126,7 +126,7 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -121,7 +121,7 @@
                    <configuration>
                      <rules>
                        <requireJavaVersion>
--                        <version>(1.6,1.7)</version>
+-                        <version>[1.7,)</version>
 +                        <version>1.6,</version>
                        </requireJavaVersion>
                      </rules>
                    </configuration>
-Index: jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
-===================================================================
---- jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java	2012-06-21 20:25:25.000000000 +0100
-+++ jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java	2012-06-21 20:28:22.549686595 +0100
-@@ -24,6 +24,7 @@
- import java.sql.Struct;
- import java.util.Map;
- import java.util.Properties;
-+import java.util.concurrent.Executor;
- 
- import winstone.Logger;
- 
-@@ -305,4 +306,25 @@
- 		// TODO Auto-generated method stub
- 		
- 	}
-+
-+	public void abort(Executor executor) throws SQLException {
-+		throw new SQLFeatureNotSupportedException();
-+	}
-+
-+	public int getNetworkTimeout() throws SQLException {
-+		throw new SQLFeatureNotSupportedException();
-+	}
-+
-+	public String getSchema() throws SQLException {
-+		throw new SQLFeatureNotSupportedException();
-+	}
-+
-+	public void setNetworkTimeout(Executor executor, int milliseconds)
-+			throws SQLException {
-+		throw new SQLFeatureNotSupportedException();
-+	}
-+
-+	public void setSchema(String schema) throws SQLException {
-+		throw new SQLFeatureNotSupportedException();		
-+	}
- }
-Index: jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
-===================================================================
---- jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java	2012-06-21 20:25:25.000000000 +0100
-+++ jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java	2012-06-21 20:28:22.549686595 +0100
-@@ -11,6 +11,7 @@
- import java.sql.Driver;
- import java.sql.PreparedStatement;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.List;
-@@ -480,4 +481,9 @@
- 		// TODO Auto-generated method stub
- 		return false;
- 	}
-+
-+	public java.util.logging.Logger getParentLogger()
-+			throws SQLFeatureNotSupportedException {
-+		throw new SQLFeatureNotSupportedException();
-+	}
- }
diff --git a/debian/rules b/debian/rules
index f73ae11..d32bd26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_MAVEN_INSTALL_TO_USJ := false
 PACKAGE   := jenkins-winstone
 JAR       := winstone
 # Parse upstream version without +dfsg for source download+
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p')
 
 # Run mh_installjar to ensure USJ name matches package
 # and does not conflict with any pure winstone packaged
@@ -18,9 +18,6 @@ install/lib$(PACKAGE)-java::
 		target/$(JAR)-$(DEB_UPSTREAM_VERSION).jar
 	jh_classpath -plib$(PACKAGE)-java
 
-# Parse upstream version without +dfsg for source download
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
-
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 	mv ../$(PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \

-- 
jenkins-winstone packaging