[osmosis] 13/14: Fix checkstyle and jdepend local dependencies.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osmosis.

commit 2e442e65e61ae5a3d5ac4e6f3da80fbb11ff39f1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 10 22:26:20 2014 +0200

    Fix checkstyle and jdepend local dependencies.
---
 debian/changelog                           |  1 +
 debian/patches/03-local-dependencies.patch | 16 +++++++++++++++-
 debian/rules                               |  4 +---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d4161e..f14857d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ osmosis (0.43.1-1) UNRELEASED; urgency=low
   * Use dh with maven-repo-helper.
   * Add build dependency on libwoodstox-java.
   * Add patch to use packaged libraries during build.
+    (closes: #713278)
   * Remove generated files and directories on clean.
   * Bump Standards-Version to 3.9.5, changes: Vcs-* fields.
   * Add patch to get version from changelog instead of git.
diff --git a/debian/patches/03-local-dependencies.patch b/debian/patches/03-local-dependencies.patch
index 382d3df..62c7864 100644
--- a/debian/patches/03-local-dependencies.patch
+++ b/debian/patches/03-local-dependencies.patch
@@ -2,7 +2,7 @@ Description: Use packaged libraries during build.
 Author: Bas Couwenberg <sebastic at xs4all.nl>
 --- a/build.gradle
 +++ b/build.gradle
-@@ -25,7 +25,9 @@ subprojects {
+@@ -25,7 +25,13 @@ subprojects {
  	// Enable access to artefact dependency repositories.
  	repositories {
  		// Standard Maven repository.
@@ -10,9 +10,23 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
 +		maven {
 +			url "/usr/share/maven-repo"
 +		}
++		// Flat directory for JARs unavailable in Maven repository
++		flatDir {
++			dirs "/usr/share/java"
++		}
  	}
  }
  
+@@ -54,6 +60,9 @@ configure(javaProjects) {
+ 	}
+ 
+ 	dependencies {
++		checkstyle 'com.puppycrawl.tools:checkstyle:debian'
++		jdepend 'org.apache.ant:ant-jdepend:debian'
++
+ 		testCompile group: 'junit', name: 'junit', version: dependencyVersionJunit
+ 	}
+ 
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -4,26 +4,26 @@
diff --git a/debian/rules b/debian/rules
index fd82c8b..3197255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,7 @@ override_dh_auto_build:
 	gradle --offline --no-daemon \
 	       --gradle-user-home debian/gradle-user-home \
 	       --project-prop osmosisBuildType=RELEASE \
-	       build -x checkstyleMain -x checkstyleTest \
-	             -x jdependMain    -x jdependTest \
-	             -x test
+	       build -x test
 
 override_dh_clean:
 	gradle --offline --no-daemon \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git