[mongo-java-driver] 02/02: Use generated poms (requires gradle-debian-helper>=1.4, see #841491)

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository mongo-java-driver.

commit b113b188726a661c77f3f2c3e9d6aee060998555
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sat Aug 12 18:09:05 2017 +0100

    Use generated poms (requires gradle-debian-helper>=1.4, see #841491)
---
 debian/changelog             | 1 +
 debian/control               | 2 +-
 debian/libmongodb-java.jlibs | 7 -------
 debian/libmongodb-java.poms  | 8 +++++++-
 debian/rules                 | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b7372c..5f6cfbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ mongo-java-driver (3.3.0-1) UNRELEASED; urgency=medium
   * Add DEP-3 headers to test.patch
   * Add myself to uploaders, use secure VCS, bump standards version to
     3.9.8 (no change required)
+  * Use generated poms (requires gradle-debian-helper>=1.4, see #841491)
 
  -- Christopher Hoskin <christopher.hoskin at gmail.com>  Fri, 19 Aug 2016 13:50:19 +0100
 
diff --git a/debian/control b/debian/control
index 6543ae7..0c9de2a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>, Christopher Hoskin <christopher.hoskin at gmail.com>
-Build-Depends: debhelper (>= 9), default-jdk, gradle-debian-helper, javahelper, libnetty-java,
+Build-Depends: debhelper (>= 9), default-jdk, gradle-debian-helper (>= 1.4), maven-repo-helper, libnetty-java,
 # Required for tests
  libcodenarc-groovy-java, libspock-java, iproute2, mongodb-server
 Standards-Version: 3.9.8
diff --git a/debian/libmongodb-java.jlibs b/debian/libmongodb-java.jlibs
deleted file mode 100644
index ce838c8..0000000
--- a/debian/libmongodb-java.jlibs
+++ /dev/null
@@ -1,7 +0,0 @@
-mongo-java-driver/build/libs/mongo-java-driver-3.3.0.jar
-driver-core/build/libs/mongodb-driver-core-3.3.0.jar
-driver/build/libs/mongodb-driver-3.3.0.jar
-bson/build/libs/bson-3.3.0.jar
-driver-async/build/libs/mongodb-driver-async-3.3.0.jar
-util/build/libs/util.jar
-
diff --git a/debian/libmongodb-java.poms b/debian/libmongodb-java.poms
index 0417132..1dc715e 100644
--- a/debian/libmongodb-java.poms
+++ b/debian/libmongodb-java.poms
@@ -25,4 +25,10 @@
 #   --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
+bson/build/debian/bson.pom --artifact=bson/build/libs/*.jar --java-lib
+driver-async/build/debian/mongodb-driver-async.pom --artifact=driver-async/build/libs/*.jar --java-lib
+driver/build/debian/mongodb-driver.pom --artifact=driver/build/libs/*.jar --java-lib
+mongo-java-driver/build/debian/mongo-java-driver.pom --artifact=mongo-java-driver/build/libs/*.jar --java-lib
+util/build/debian/util.pom --ignore-pom
+driver-core/build/debian/mongodb-driver-core.pom --artifact=driver-core/build/libs/*.jar --java-lib
+
diff --git a/debian/rules b/debian/rules
index 9117402..e4aee40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export JAVA_HOME := /usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=gradle --with javahelper
+	dh $@ --buildsystem=gradle --with maven_repo_helper
 
 override_dh_auto_test:
 	debian/runtest.sh

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