[SCM] stapler packaging branch, master, updated. debian/1.174-1-1-g25a85ac

[James Page]

The following commit has been merged in the master branch:
commit 25a85ac0466b514e0b915a97aebf3c8c895c08fe
Author: James Page <james.page at ubuntu.com>
Date:   Tue Mar 13 12:32:43 2012 +0000

    Fix FTBFS (Closes: #663548):
    
    * Fix FTBFS (Closes: #663548):
      - d/libstapler-java.poms: Add --java-lib to ensure artifacts are
        deployed to /usr/share/java.
    * Bumped Standards-Version: 3.9.3
      - d/copyright: Updated Format to release specification.
    * d/libstapler-java-doc.lintian-overrides: Dropped - no longer required.

diff --git a/debian/changelog b/debian/changelog
index 08e87ab..0ffb691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+stapler (1.174-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS (Closes: #663548):
+    - d/libstapler-java.poms: Add --java-lib to ensure artifacts are 
+      deployed to /usr/share/java.
+  * Bumped Standards-Version: 3.9.3
+    - d/copyright: Updated Format to release specification.
+  * d/libstapler-java-doc.lintian-overrides: Dropped - no longer required.
+
+ -- James Page <james.page at ubuntu.com>  Tue, 13 Mar 2012 11:51:03 +0000
+
 stapler (1.174-1) unstable; urgency=low
 
   * Initial Debian release (Closes: #631959)
diff --git a/debian/control b/debian/control
index 9ad2619..2d41dd6 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Build-Depends-Indep:
  libmetainf-services-java-doc,
  libservlet2.5-java,
  libtiger-types-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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/copyright b/debian/copyright
index 4e38b8b..3740b21 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: Stapler
 Upstream-Contact: Kohsuke Kawaguchi <kk at kohsuke.org> as developer
 Source: http://stapler.java.net
diff --git a/debian/libstapler-java-doc.lintian-overrides b/debian/libstapler-java-doc.lintian-overrides
deleted file mode 100644
index 260f44d..0000000
--- a/debian/libstapler-java-doc.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# False positive; document package contains a jar file which triggers this 
-# warning
-libstapler-java-doc binary: missing-classpath libcommons-fileupload-java
diff --git a/debian/libstapler-java.poms b/debian/libstapler-java.poms
index ee0f674..5ef7d10 100644
--- a/debian/libstapler-java.poms
+++ b/debian/libstapler-java.poms
@@ -17,8 +17,8 @@
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
 #   --dest-jar=<path>: the destination for the real jar
 #
-pom.xml 
-core/pom.xml 
-jelly/pom.xml 
-jsp/pom.xml 
-groovy/pom.xml 
+pom.xml
+core/pom.xml --java-lib
+jelly/pom.xml --java-lib
+jsp/pom.xml --java-lib
+groovy/pom.xml --java-lib

-- 
stapler packaging