[SCM] stapler packaging branch, master, updated. debian/1.189-1-3-g66d728a

James Page james.page at ubuntu.com
Sun Feb 17 19:17:51 UTC 2013 

The following commit has been merged in the master branch:
commit 66d728a05d2bab2afa0cccddfd37a0fae9316dc7
Author: James Page <james.page at ubuntu.com>
Date:   Sun Feb 17 19:17:39 2013 +0000

    New upstream release:
    
    * New upstream release:
      - d/maven.ignoreRules,maven.properties: Drop test dependency
        on hickory, skip tests for the time being.
      - Refreshed patches.
    * Tidied lintian warnings.

diff --git a/debian/changelog b/debian/changelog
index 66e620c..f8f081f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+stapler (1.198-1~exp1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - d/maven.ignoreRules,maven.properties: Drop test dependency
+      on hickory, skip tests for the time being.
+    - Refreshed patches.
+  * Tidied lintian warnings.
+
+ -- James Page <james.page at ubuntu.com>  Sun, 17 Feb 2013 18:23:12 +0000
+
 stapler (1.189-1) experimental; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index d230851..2ad852f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at ubuntu.com>
-DM-Upload-Allowed: yes
 Build-Depends:
  cdbs,
  debhelper (>= 7),
@@ -39,7 +38,7 @@ Build-Depends-Indep:
  libmockito-java,
  libservlet2.5-java,
  libtiger-types-java
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://stapler.java.net
 Vcs-Git: git://git.debian.org/git/pkg-java/stapler.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/stapler.git
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 42c79dd..1e41054 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -21,3 +21,5 @@ org.jvnet.wagon-svn wagon-svn * * * *
 org.apache.maven.wagon wagon-webdav * * * *
 org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
 org.apache.maven.plugins maven-site-plugin * * * *
+com.jolira hickory * * * *
+org.kohsuke.stapler stapler * * tests *
diff --git a/debian/maven.properties b/debian/maven.properties
index ad2ba29..11f9276 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,2 +1,4 @@
 # Include here properties to pass to Maven during the build.
 # For example:
+maven.test.skip=true
+
diff --git a/debian/patches/beanutils18-compat.patch b/debian/patches/beanutils18-compat.patch
index 7605f10..ea4aaf5 100644
--- a/debian/patches/beanutils18-compat.patch
+++ b/debian/patches/beanutils18-compat.patch
@@ -3,11 +3,9 @@ Descrition: Patch to sort out compatibility with Commons Beanutils 1.8
 Author: James Page <james.page at ubuntu.com>
 Forwarded: no
 
-Index: stapler/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
-===================================================================
---- stapler.orig/core/src/main/java/org/kohsuke/stapler/RequestImpl.java	2012-04-26 10:12:32.712639118 +0100
-+++ stapler/core/src/main/java/org/kohsuke/stapler/RequestImpl.java	2012-04-26 10:12:48.703729126 +0100
-@@ -693,7 +693,7 @@
+--- a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
++++ b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
+@@ -642,7 +642,7 @@ public class RequestImpl extends HttpSer
                  if (converter==null)
                      throw new IllegalArgumentException("Unable to convert to "+type);
  
diff --git a/debian/patches/disable-jrebel-bindings.patch b/debian/patches/disable-jrebel-bindings.patch
index 94a49fe..e1bf394 100644
--- a/debian/patches/disable-jrebel-bindings.patch
+++ b/debian/patches/disable-jrebel-bindings.patch
@@ -2,10 +2,8 @@ Description: Don't build jrebel bindings as jrebel is not packaged.
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: stapler/pom.xml
-===================================================================
---- stapler.orig/pom.xml	2012-04-26 10:12:48.995712215 +0100
-+++ stapler/pom.xml	2012-04-26 10:12:49.479684125 +0100
+--- a/pom.xml
++++ b/pom.xml
 @@ -14,7 +14,6 @@
      <module>jsp</module>
      <module>jelly</module>
@@ -13,4 +11,4 @@ Index: stapler/pom.xml
 -    <module>jrebel</module>
    </modules>
  
-   <organization>
+   <url>http://stapler.kohsuke.org/</url>
diff --git a/debian/patches/disable-jruby-bindings.patch b/debian/patches/disable-jruby-bindings.patch
index a471f63..a98ab2c 100644
--- a/debian/patches/disable-jruby-bindings.patch
+++ b/debian/patches/disable-jruby-bindings.patch
@@ -2,10 +2,8 @@ Description: Disable jruby binding until upgraded in Debian
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: stapler/pom.xml
-===================================================================
---- stapler.orig/pom.xml	2012-04-26 10:12:32.676641127 +0100
-+++ stapler/pom.xml	2012-04-26 10:12:48.995712215 +0100
+--- a/pom.xml
++++ b/pom.xml
 @@ -13,7 +13,6 @@
      <module>core</module>
      <module>jsp</module>
diff --git a/debian/patches/fix-groovy-build.patch b/debian/patches/fix-groovy-build.patch
index 04e4b15..def54b0 100644
--- a/debian/patches/fix-groovy-build.patch
+++ b/debian/patches/fix-groovy-build.patch
@@ -3,10 +3,8 @@ Description: Groovy module needs ant as well; not pulled in automatically
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: stapler/groovy/pom.xml
-===================================================================
---- stapler.orig/groovy/pom.xml	2012-04-26 10:12:32.620644253 +0100
-+++ stapler/groovy/pom.xml	2012-04-26 10:12:49.283695501 +0100
+--- a/groovy/pom.xml
++++ b/groovy/pom.xml
 @@ -22,6 +22,11 @@
        <version>1.8.3</version>
      </dependency>
diff --git a/debian/patches/revert-kohsuke-asm3.patch b/debian/patches/revert-kohsuke-asm3.patch
index e9a4c8a..c9d0aa2 100644
--- a/debian/patches/revert-kohsuke-asm3.patch
+++ b/debian/patches/revert-kohsuke-asm3.patch
@@ -7,10 +7,8 @@ Description: Stapler uses a forked version of asm3 to ensure that it
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: stapler/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java
-===================================================================
---- stapler.orig/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java	2012-04-26 10:11:55.000000000 +0100
-+++ stapler/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java	2012-04-26 10:33:02.128754376 +0100
+--- a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java
++++ b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java
 @@ -24,11 +24,11 @@
  package org.kohsuke.stapler;
  
@@ -27,4 +25,4 @@ Index: stapler/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java
 +import org.objectweb.asm.commons.EmptyVisitor;
  
  import java.io.IOException;
- import java.lang.reflect.Constructor;
+ import java.io.InputStream;
diff --git a/debian/patches/servlet25-compat.patch b/debian/patches/servlet25-compat.patch
index 6e81585..0c42c68 100644
--- a/debian/patches/servlet25-compat.patch
+++ b/debian/patches/servlet25-compat.patch
@@ -2,11 +2,9 @@ Description: Compatiblity Patch for Servlet 2.5 Specification
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: stapler-1.152/core/src/test/java/org/kohsuke/stapler/MockRequest.java
-===================================================================
---- stapler-1.152.orig/core/src/test/java/org/kohsuke/stapler/MockRequest.java	2010-11-16 09:59:49.966017999 +0000
-+++ stapler-1.152/core/src/test/java/org/kohsuke/stapler/MockRequest.java	2010-11-18 14:56:25.948474660 +0000
-@@ -267,4 +267,24 @@
+--- a/core/src/test/java/org/kohsuke/stapler/MockRequest.java
++++ b/core/src/test/java/org/kohsuke/stapler/MockRequest.java
+@@ -267,4 +267,24 @@ public class MockRequest implements Http
          // TODO
          throw new UnsupportedOperationException();
      }
@@ -31,11 +29,9 @@ Index: stapler-1.152/core/src/test/java/org/kohsuke/stapler/MockRequest.java
 +        throw new UnsupportedOperationException();
 +    }
  }
-Index: stapler-1.152/core/src/test/java/org/kohsuke/stapler/MockServletContext.java
-===================================================================
---- stapler-1.152.orig/core/src/test/java/org/kohsuke/stapler/MockServletContext.java	2010-11-18 14:56:41.918474662 +0000
-+++ stapler-1.152/core/src/test/java/org/kohsuke/stapler/MockServletContext.java	2010-11-18 14:58:24.728474659 +0000
-@@ -105,4 +105,8 @@
+--- a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java
++++ b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java
+@@ -105,4 +105,8 @@ public class MockServletContext implemen
      public String getServletContextName() {
          return null;
      }

-- 
stapler packaging

More information about the pkg-java-commits mailing list