[commons-httpclient] 65/66: Build with maven-debian-helper instead of ant

[Emmanuel Bourg]

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

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

commit b227a54b1f60ae64720074396288da0f40f8a07a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 4 09:59:21 2017 +0200

    Build with maven-debian-helper instead of ant
---
 debian/ant.properties                      |  5 -----
 debian/changelog                           |  1 +
 debian/clean                               |  1 +
 debian/control                             | 12 ++++++------
 debian/libcommons-httpclient-java-doc.dirs |  1 -
 debian/libcommons-httpclient-java.dirs     |  1 -
 debian/maven.properties                    |  1 +
 debian/pom.xml                             |  3 +--
 debian/rules                               | 29 ++++++-----------------------
 9 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 02c8209..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# JSSE stub classes required for build
-lib.dir=/usr/share/java
-#jsse.jar=/usr/share/java/jsse.jar
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
diff --git a/debian/changelog b/debian/changelog
index 0b2d21d..efcbbf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 commons-httpclient (3.1-13) UNRELEASED; urgency=medium
 
+  * Build with maven-debian-helper instead of ant
   * Moved the package to Git
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d4f7111
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+pom.xml
diff --git a/debian/control b/debian/control
index 7ba76f1..a56c255 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,13 @@ Uploaders:
  Torsten Werner <twerner at debian.org>,
  Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
- ant,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  junit,
  libcommons-codec-java,
  libcommons-logging-java,
- maven-repo-helper
+ libmaven-javadoc-plugin-java,
+ maven-debian-helper
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/commons-httpclient.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/commons-httpclient.git
@@ -23,8 +22,8 @@ Homepage: http://hc.apache.org/httpclient-3.x
 
 Package: libcommons-httpclient-java
 Architecture: all
-Suggests: libcommons-httpclient-java-doc
-Depends: libcommons-codec-java, libcommons-logging-java, ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}, libcommons-httpclient-java-doc
 Description: Commons HTTPClient - Java library for creating HTTP clients
  The Jakarta Commons HTTPClient library provides an efficient,
  up-to-date, and feature-rich package implementing the client side of
@@ -33,7 +32,8 @@ Description: Commons HTTPClient - Java library for creating HTTP clients
 Package: libcommons-httpclient-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
 Suggests: libcommons-httpclient-java
 Description: Documentation for libcommons-httpclient-java
  The Jakarta Commons HTTPClient library provides an efficient,
diff --git a/debian/libcommons-httpclient-java-doc.dirs b/debian/libcommons-httpclient-java-doc.dirs
deleted file mode 100644
index 985522f..0000000
--- a/debian/libcommons-httpclient-java-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libcommons-httpclient-java-doc
diff --git a/debian/libcommons-httpclient-java.dirs b/debian/libcommons-httpclient-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libcommons-httpclient-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..93adf72
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1 @@
+project.build.sourceEncoding=ISO-8859-1
diff --git a/debian/pom.xml b/debian/pom.xml
index 595a1b0..2397259 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -249,6 +249,5 @@
       <name>Default Site</name>
       <url>scp://people.apache.org//www/jakarta.apache.org/httpcomponents/httpclient-3.x/</url>
     </site>
-    <status>converted</status>
   </distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/debian/rules b/debian/rules
index 1cb86c9..ff8a203 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,11 @@
 #!/usr/bin/make -f
-# debian/rules for libcommons-httpclient-java (uses CDBS)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=maven
 
-PACKAGE			     := $(DEB_SOURCE_PACKAGE)
-VERSION			     := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := junit commons-logging commons-codec
-DEB_ANT_BUILD_TARGET := dist
-
-DEB_INSTALL_CHANGELOGS_ALL = RELEASE_NOTES.txt
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml dist/$(PACKAGE)-$(VERSION).jar
-
-clean::
-	mh_clean
-
-get-orig-pom:
-	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/commons-httpclient/commons-httpclient/$(DEB_UPSTREAM_VERSION)/commons-httpclient-$(DEB_UPSTREAM_VERSION).pom
+override_dh_auto_build:
+	cp debian/pom.xml .
+	dh_auto_build
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-
+	-uscan --download-current-version --force-download --rename

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