The following commit has been merged in the master branch:
commit df876c0072f0a33b7f565ea656e15278d6a8df36
Author: James Page <james.p...@ubuntu.com>
Date:   Thu Apr 26 11:54:46 2012 +0100

    New upstream release.
    
    * New upstream release.
    * Bumped Standards-Version to 3.9.3:
      - d/copyright: Switched Format to reference release version of DEP-5.
    * Added missing patch headers.

diff --git a/debian/changelog b/debian/changelog
index 9f60801..563aca1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jenkins-winstone (0.9.10-jenkins-35+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Switched Format to reference release version of DEP-5.
+  * Added missing patch headers.
+
+ -- James Page <james.p...@ubuntu.com>  Thu, 26 Apr 2012 11:44:36 +0100
+
 jenkins-winstone (0.9.10-jenkins-31+dfsg-1) unstable; urgency=low
 
   [ James Page ]
diff --git a/debian/control b/debian/control
index a684e64..dfc48d5 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends-Indep:
  libhttpunit-java,
  libmaven-antrun-plugin-java,
  libmaven-javadoc-plugin-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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
diff --git a/debian/copyright b/debian/copyright
index e3de1ab..1ba2c54 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: Jenkins branch of Winstone Servlet Container
 Source: http://github.com/jenkinsci/winstone
 
diff --git a/debian/patches/java-1.6.patch b/debian/patches/java-1.6.patch
index ad9d1f8..98e65f9 100644
--- a/debian/patches/java-1.6.patch
+++ b/debian/patches/java-1.6.patch
@@ -1,12 +1,12 @@
-Description: Patch to make source code Java 1.6 compilable as 
+Description: Patch to make source code Java 1.6 compatible as
  Java is not source backwards compatible.
 Author: James Page <james.p...@canonical.com>
 Forwarded: not-needed
 
-Index: 
jenkinsci-winstone-d1bef93/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
+Index: 
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
 ===================================================================
---- 
jenkinsci-winstone-d1bef93.orig/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
   2011-02-16 11:44:26.788383486 +0000
-+++ 
jenkinsci-winstone-d1bef93/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
        2011-02-16 12:05:48.581557225 +0000
+--- 
jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
     2012-04-26 11:45:34.870800553 +0100
++++ 
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
  2012-04-26 11:45:47.462328217 +0100
 @@ -6,15 +6,23 @@
   */
  package winstone.jndi.resourceFactories;
@@ -121,11 +121,11 @@ Index: 
jenkinsci-winstone-d1bef93/src/java/winstone/jndi/resourceFactories/Winst
 +              return this.realConnection.unwrap(arg0);
 +      }
  }
-Index: 
jenkinsci-winstone-d1bef93/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
+Index: 
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
 ===================================================================
---- 
jenkinsci-winstone-d1bef93.orig/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
   2011-02-16 11:44:26.808383212 +0000
-+++ 
jenkinsci-winstone-d1bef93/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
        2011-02-16 11:45:07.827844846 +0000
-@@ -467,4 +467,14 @@
+--- 
jenkins-winstone.orig/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
     2012-04-26 11:45:34.898799502 +0100
++++ 
jenkins-winstone/src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
  2012-04-26 11:45:47.462328217 +0100
+@@ -468,4 +468,14 @@
                  "" + this.usedRealConnections.size(), 
                  "" + this.unusedRealConnections.size()});
      }
@@ -140,10 +140,10 @@ Index: 
jenkinsci-winstone-d1bef93/src/java/winstone/jndi/resourceFactories/Winst
 +        throw new UnsupportedOperationException();
 +    }
  }
-Index: jenkinsci-winstone-d1bef93/pom.xml
+Index: jenkins-winstone/pom.xml
 ===================================================================
---- jenkinsci-winstone-d1bef93.orig/pom.xml    2011-02-16 11:44:26.778383621 
+0000
-+++ jenkinsci-winstone-d1bef93/pom.xml 2011-02-16 11:45:07.827844846 +0000
+--- jenkins-winstone.orig/pom.xml      2012-04-26 11:45:34.854801153 +0100
++++ jenkins-winstone/pom.xml   2012-04-26 11:45:47.462328217 +0100
 @@ -57,6 +57,14 @@
          </testResources>
  
@@ -157,5 +157,5 @@ Index: jenkinsci-winstone-d1bef93/pom.xml
 +           </plugin>
 +
              <plugin>
-                 <artifactId>maven-antrun-plugin</artifactId>
-                 <executions>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <configuration>
diff --git a/debian/patches/specification-resources.patch 
b/debian/patches/specification-resources.patch
index 060e65a..ecc5869 100644
--- a/debian/patches/specification-resources.patch
+++ b/debian/patches/specification-resources.patch
@@ -1,7 +1,13 @@
+Description: Winstone ships a number of non-DFSG compliant resources
+ for specifications around JEE - Sun did release these under compatible
+ licenses (this patch).
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
 Index: jenkins-winstone/src/conf/javax/servlet/resources/XMLSchema.dtd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/XMLSchema.dtd    
2011-08-18 09:37:53.671397840 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/XMLSchema.dtd    
2012-04-26 11:45:47.794315763 +0100
 @@ -0,0 +1,402 @@
 +<!-- DTD for XML Schemas: Part 1: Structures
 +     Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
@@ -408,7 +414,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/XMLSchema.dtd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/datatypes.dtd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/datatypes.dtd    
2011-08-18 09:38:09.181383207 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/datatypes.dtd    
2012-04-26 11:45:47.794315763 +0100
 @@ -0,0 +1,203 @@
 +<!--
 +        DTD for XML Schemas: Part 2: Datatypes
@@ -616,7 +622,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/datatypes.dtd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/j2ee_1_4.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/j2ee_1_4.xsd     
2011-08-18 09:34:02.141615523 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/j2ee_1_4.xsd     
2012-04-26 11:45:47.798315613 +0100
 @@ -0,0 +1,1616 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema
@@ -2237,7 +2243,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/j2ee_1_4.xsd
 Index: 
jenkins-winstone/src/conf/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ 
jenkins-winstone/src/conf/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
 2011-08-18 09:34:14.231604192 +0100
++++ 
jenkins-winstone/src/conf/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
 2012-04-26 11:45:47.798315613 +0100
 @@ -0,0 +1,353 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
@@ -2595,7 +2601,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/j2ee_web_services_clien
 Index: jenkins-winstone/src/conf/javax/servlet/resources/javaee_5.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/javaee_5.xsd     
2011-08-18 09:36:03.641501467 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/javaee_5.xsd     
2012-04-26 11:45:47.802315463 +0100
 @@ -0,0 +1,2102 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema
@@ -4702,7 +4708,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/javaee_5.xsd
 Index: 
jenkins-winstone/src/conf/javax/servlet/resources/javaee_web_services_client_1_2.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ 
jenkins-winstone/src/conf/javax/servlet/resources/javaee_web_services_client_1_2.xsd
       2011-08-18 09:36:00.211504693 +0100
++++ 
jenkins-winstone/src/conf/javax/servlet/resources/javaee_web_services_client_1_2.xsd
       2012-04-26 11:45:47.802315463 +0100
 @@ -0,0 +1,585 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
@@ -5292,7 +5298,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/javaee_web_services_cli
 Index: jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_0.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_0.xsd      
2011-08-18 09:33:10.591663795 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_0.xsd      
2012-04-26 11:45:47.802315463 +0100
 @@ -0,0 +1,316 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
@@ -5613,7 +5619,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_0.xsd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_1.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_1.xsd      
2011-08-18 09:35:51.471512909 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_1.xsd      
2012-04-26 11:45:47.806315312 +0100
 @@ -0,0 +1,349 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
@@ -5967,7 +5973,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/jsp_2_1.xsd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_2.dtd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_2.dtd  
2011-08-18 09:35:26.221536636 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_2.dtd  
2012-04-26 11:45:47.806315312 +0100
 @@ -0,0 +1,602 @@
 +<!--
 +
@@ -6574,7 +6580,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_2.dtd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_3.dtd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_3.dtd  
2011-08-18 09:34:51.951568814 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_3.dtd  
2012-04-26 11:45:47.806315312 +0100
 @@ -0,0 +1,1022 @@
 +<!--
 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
@@ -7601,7 +7607,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_3.dtd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_4.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_4.xsd  
2011-08-18 09:33:30.001645628 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_4.xsd  
2012-04-26 11:45:47.806315312 +0100
 @@ -0,0 +1,1242 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
@@ -8848,7 +8854,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_4.xsd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_5.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_5.xsd  
2011-08-18 09:35:55.711508924 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_5.xsd  
2012-04-26 11:45:47.806315312 +0100
 @@ -0,0 +1,1275 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
@@ -10128,7 +10134,7 @@ Index: 
jenkins-winstone/src/conf/javax/servlet/resources/web-app_2_5.xsd
 Index: jenkins-winstone/src/conf/javax/servlet/resources/xml.xsd
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ jenkins-winstone/src/conf/javax/servlet/resources/xml.xsd  2011-08-18 
09:34:53.861567020 +0100
++++ jenkins-winstone/src/conf/javax/servlet/resources/xml.xsd  2012-04-26 
11:45:47.806315312 +0100
 @@ -0,0 +1,287 @@
 +<?xml version='1.0'?>
 +<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?>

-- 
jenkins-winstone packaging

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to