[jasperreports] 04/07: Adapted the build to the new source layout

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jasperreports.

commit 0ce6566b15939e8303c0581f36640d70bccb14e5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 11 10:44:43 2017 +0100

    Adapted the build to the new source layout
---
 debian/changelog                  |  1 +
 debian/libjasperreports-java.poms |  2 +-
 debian/rules                      | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b33a6a6..a05bb31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jasperreports (6.3.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+    - Adapted the build to the new source layout
   * Track and download the new releases from GitHub
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 11 Dec 2017 08:52:07 +0100
diff --git a/debian/libjasperreports-java.poms b/debian/libjasperreports-java.poms
index 0417132..589a88b 100644
--- a/debian/libjasperreports-java.poms
+++ b/debian/libjasperreports-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --has-package-version
+jasperreports/pom.xml --has-package-version
diff --git a/debian/rules b/debian/rules
index f6c19ca..0609638 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,21 @@
 %:
 	dh $@ --buildsystem=maven
 
+override_dh_auto_configure:
+	dh_auto_configure -- -f jasperreports/pom.xml
+
 override_dh_auto_build:
-	ant preparedocs schemaref componentschemaref configref
-	dh_auto_build
+	ant -f jasperreports/build.xml preparedocs schemaref componentschemaref configref
+	dh_auto_build -- -f jasperreports/pom.xml package -DskipTests
+
+override_dh_auto_test:
+
+override_dh_auto_install:
+	dh_auto_install -- -f jasperreports/pom.xml
 
 override_dh_auto_clean:
-	dh_auto_clean
-	rm -Rf dist
+	dh_auto_clean -- -f jasperreports/pom.xml
+	rm -Rf jasperreports/dist
 
 get-orig-source:
 	uscan --verbose --download-current-version --force-download --rename

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