[libgoogle-gson-java] 08/09: Adapted the build to the new project 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 libgoogle-gson-java.

commit 68d281955e94e64eb667a93408901044401eca14
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 3 22:50:26 2015 +0100

    Adapted the build to the new project layout
---
 debian/changelog                       | 4 +++-
 debian/libgoogle-gson-java-doc.install | 2 +-
 debian/libgoogle-gson-java.poms        | 6 +++++-
 debian/rules                           | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fab912..4e220fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-libgoogle-gson-java (2.2.4-2) UNRELEASED; urgency=medium
+libgoogle-gson-java (2.4-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Adapted the build to the new project layout
   * Standards-Version updated to 3.9.6 (no changes)
   * Updated the Homepage field
   * debian/watch: Watch the release tags on Github
diff --git a/debian/libgoogle-gson-java-doc.install b/debian/libgoogle-gson-java-doc.install
index bacbab3..a0f7533 100644
--- a/debian/libgoogle-gson-java-doc.install
+++ b/debian/libgoogle-gson-java-doc.install
@@ -1 +1 @@
-target/apidocs/* usr/share/doc/libgoogle-gson-java/api
+gson/target/apidocs/* usr/share/doc/libgoogle-gson-java/api
diff --git a/debian/libgoogle-gson-java.poms b/debian/libgoogle-gson-java.poms
index b68401f..aeed3de 100644
--- a/debian/libgoogle-gson-java.poms
+++ b/debian/libgoogle-gson-java.poms
@@ -25,4 +25,8 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --java-lib
+codegen/pom.xml --ignore
+extras/pom.xml --ignore
+gson/pom.xml --no-parent --java-lib
+metrics/pom.xml --ignore
+proto/pom.xml --ignore
diff --git a/debian/rules b/debian/rules
index 663c7e6..44fe611 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,7 @@ include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
+DEB_MAVEN_ARGS := --file gson/pom.xml
+
 get-orig-source:
 	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename

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