[httpcomponents-client] 04/05: Build with maven-debian-helper

[Emmanuel Bourg]

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

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

commit 1131a4e635909b77d13bb95532dd5d8398d5142c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 2 23:24:20 2015 +0200

    Build with maven-debian-helper
---
 debian/changelog                  |  1 +
 debian/control                    |  3 ++-
 debian/libhttpclient-java.poms    |  8 ++++--
 debian/maven.properties           |  1 +
 debian/patches/00-fix_build.patch | 15 -----------
 debian/patches/series             |  1 -
 debian/rules                      | 55 +++------------------------------------
 7 files changed, 14 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dd6708..820847c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 httpcomponents-client (4.5.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Build with maven-debian-helper
   * Set the source encoding to make the build reproducible
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 02 Oct 2015 22:53:34 +0200
diff --git a/debian/control b/debian/control
index 6fd78ba..694c20d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Miguel Landaeta <nomadium at debian.org>,
            Jakub Adam <jakub.adam at ktknet.cz>,
            Damien Raude-Morvan <drazzib at debian.org>,
            Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: cdbs,
+               debhelper (>= 9),
                default-jdk,
                javahelper,
                maven-debian-helper
diff --git a/debian/libhttpclient-java.poms b/debian/libhttpclient-java.poms
index 479cc62..72973cd 100644
--- a/debian/libhttpclient-java.poms
+++ b/debian/libhttpclient-java.poms
@@ -1,3 +1,7 @@
 pom.xml --no-parent
-httpclient/pom.xml
-fluent-hc/pom.xml
+httpclient/pom.xml --java-lib --has-package-version
+fluent-hc/pom.xml --java-lib --has-package-version
+httpmime/pom.xml --java-lib --has-package-version --package=libhttpmime-java
+httpclient-cache/pom.xml --ignore
+httpclient-osgi/pom.xml --ignore
+httpclient-win/pom.xml --ignore
diff --git a/debian/maven.properties b/debian/maven.properties
index f67b8fc..0a88180 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,2 +1,3 @@
 
+maven.test.skip=true
 project.build.sourceEncoding=ISO-8859-1
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
deleted file mode 100644
index d955e65..0000000
--- a/debian/patches/00-fix_build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Disable build of httpclient-osgi
-Author: David Paleino <dapal at debian.org>
-Forwarded: no
---- a/pom.xml
-+++ b/pom.xml
-@@ -153,9 +153,6 @@
-     <module>httpclient</module>
-     <module>httpmime</module>
-     <module>fluent-hc</module>
--    <module>httpclient-cache</module>
--    <module>httpclient-win</module>
--    <module>httpclient-osgi</module>
-   </modules>
- 
-   <build>
diff --git a/debian/patches/series b/debian/patches/series
index 90e73b0..b59251d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-00-fix_build.patch
 01-generate_osgi_metadata.patch
 02-include-suffix-list.patch
diff --git a/debian/rules b/debian/rules
index 5d606f2..4a061cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,56 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-M2_HOME=/usr/share/maven2
-UPVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d- -f1)
-
-# let's skip tests, they FTBFS.
-#SKIPTEST=false
-SKIPTEST=true
-ifneq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	SKIPTEST=true
-endif
-
-%:
-	dh $@
-
-override_dh_installchangelogs:
-	dh_installchangelogs RELEASE_NOTES.txt
-
-override_dh_auto_build:
-	for pkg in libhttpclient-java libhttpmime-java; do \
-		mh_patchpoms -p$$pkg --debian-build --keep-pom-version ; \
-	done
-	$(M2_HOME)/bin/mvn -o -s /etc/maven2/settings-debian.xml \
-	  -Dmaven.test.skip=$(SKIPTEST) -Dmaven.javadoc.skip=true package
-
-override_dh_auto_install:
-	dh_auto_install
-
-	for pkg in libhttpclient-java libhttpmime-java; do \
-		mh_installpoms -p$$pkg -e$(UPVER); \
-	done
-
-	mh_installjar -plibhttpclient-java -l httpclient/pom.xml -j$(UPVER) -e$(UPVER) \
-	  httpclient/target/httpclient-*.jar
-	mh_installjar -plibhttpmime-java -l httpmime/pom.xml -j$(UPVER) -e$(UPVER)\
-	  httpmime/target/httpmime-*.jar
-	mh_installjar -plibhttpmime-java -l fluent-hc/pom.xml -j$(UPVER) -e$(UPVER)\
-	  fluent-hc/target/fluent-hc-*.jar
-
-	jh_classpath -plibhttpmime-java
-
-override_dh_clean:
-	dh_clean
-
-	for pkg in libhttpclient-java libhttpmime-java; do \
-		mh_unpatchpoms -p$$pkg ; \
-	done
-	mh_clean
-	rm -rf http*/target/ fluent-hc/target/
+JAVA_HOME := /usr/lib/jvm/default-java
 
 get-orig-source:
-	uscan --download-version $(UPVER) --force-download --no-symlink
+	uscan --download-current-version --force-download --no-symlink

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