[Pkg-osm-maint] Bug#713278: checkstyle version update patch

[Anders Jonsson]

Good evening,

the FTBFS is in testing and unstable and is caused by checkstyle there 
being 5.7 rather than 5.4 that is expected by this version of osmosis.

Attached is a patch that makes it build again, tested in Jessie. It is 
based on osmosis upstream commit
https://github.com/openstreetmap/osmosis/commit/fe7b77d182b0a8c30118e2b53712cc3aa629c73e
that updated checkstyle to 5.6, together with a change in a quilt patch 
to set checkstyle version to debian rather than 5.4.

Worth noting is that even with this patch, it will fail to build since 
it runs into bug #721721. I have proposed a patch at that bug that makes 
the symlink work. With these fixes together, osmosis once more builds.


Regards,
Anders Jonsson
-------------- next part --------------
>From b62749dcaf12eee32adb9ef9a303480ce7876e20 Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson at norsjovallen.se>
Date: Wed, 26 Feb 2014 23:40:30 +0100
Subject: fix FTBFS by allowing checkstyle newer than 5.4

---
 build-support/checkstyle.xml                      | 7 ++++---
 build-support/config/ant-build-common.properties  | 2 +-
 debian/control                                    | 2 +-
 debian/patches/04-fix_dependencies_versions.patch | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build-support/checkstyle.xml b/build-support/checkstyle.xml
index e77c3a5..9465657 100644
--- a/build-support/checkstyle.xml
+++ b/build-support/checkstyle.xml
@@ -7,8 +7,9 @@
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
+    <module name="NewlineAtEndOfFile">
+        <property name="fileExtensions" value="java"/>
+    </module>
     <!-- Checks that property files contain the same keys.         -->
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
@@ -23,6 +24,7 @@
         <property
              name="header"
              value="// This software is released into the Public Domain.  See copying.txt for details."/>
+        <property name="fileExtensions" value="java"/>
     </module>
 
 
@@ -111,7 +113,6 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <module name="AvoidInlineConditionals"/>
-        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <module name="HiddenField">
diff --git a/debian/patches/04-fix_dependencies_versions.patch b/debian/patches/04-fix_dependencies_versions.patch
index 7ae2bde..da59fbb 100644
--- a/debian/patches/04-fix_dependencies_versions.patch
+++ b/debian/patches/04-fix_dependencies_versions.patch
@@ -15,10 +15,11 @@ Index: osmosis/build-support/config/ant-build-common.properties
 @@ -2,19 +2,18 @@
  
  # 3rd Party Library Versions
- dependency.version.checkstyle=5.4
+-dependency.version.checkstyle=5.4
 -dependency.version.classworlds=2.4
 -dependency.version.commons-codec=1.5
 -dependency.version.commons-compress=1.2
++dependency.version.checkstyle=debian
 +dependency.version.classworlds=debian
 +dependency.version.commons-codec=debian
 +dependency.version.commons-compress=debian
-- 
1.8.5.3