[SCM] libjgoodies-common-java packaging branch, master, updated. debian/1.4.0-1-6-g74c7f46

[gregor herrmann]

The following commit has been merged in the master branch:
commit 423ffcb5452432f2fbbaaeb7b2ec52db65246f92
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun May 5 20:38:41 2013 +0200

    Re-enable test suite.

diff --git a/debian/control b/debian/control
index c376282..8e456d5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: gregor herrmann <gregoa at debian.org>
  , tony mancill <tmancill at debian.org>
 Build-Depends: debhelper (>= 8), cdbs, default-jdk,
- maven-debian-helper (>= 1.5)
+ maven-debian-helper (>= 1.5), xvfb, xauth
 Build-Depends-Indep: junit4, default-jdk-doc, libmaven-javadoc-plugin-java 
 Standards-Version: 3.9.4
 Homepage: http://www.jgoodies.com/downloads/libraries/
diff --git a/debian/maven.properties b/debian/maven.properties
index 925b693..b416b9d 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,5 +1,5 @@
 # Include here properties to pass to Maven during the build.
-maven.test.skip=true
+#maven.test.skip=true
 maven.compiler.source=1.5
 maven.compiler.target=1.5
 # Set encoding for compatibilty with Java 7
diff --git a/debian/rules b/debian/rules
index 0654c38..28ce069 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,5 +7,11 @@ JAVA_HOME := /usr/lib/jvm/default-java
 DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
 
+# ugly, but DEB_MAKE_CHECK_INVOKE doesn't seem to be implemented yet
+# and maven-sanity-check fails with the compund JAVACMD
+export JAVACMD := xvfb-run -a $(JAVACMD)
+maven-sanity-check:
+	true
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
libjgoodies-common-java packaging