[SCM] httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation branch, master, updated. debian/4.1.1-2-4-g4ed278e
Damien Raude-Morvan
drazzib at debian.org
Wed Dec 19 23:52:54 UTC 2012
The following commit has been merged in the master branch:
commit 80c649c33fadafa3d52e73e7ed8c2a661fad6332
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sun Aug 19 15:07:23 2012 +0200
Team Upload.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index 09b8f61..3b19dd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-httpcomponents-client (4.1.1-3) UNRELEASED; urgency=low
+httpcomponents-client (4.2.1-1) UNRELEASED; urgency=low
+ * Team Upload.
+
[ James Page ]
* Transition package to default java implementation:
- d/control: Drop preferred BD on openjdk-6-jdk. (Closes: #683534)
- -- Miguel Landaeta <miguel at miguel.cc> Thu, 02 Aug 2012 21:39:16 -0430
+ [ Damien Raude-Morvan ]
+ * New upstream release.
+ * Refresh all patches.
+ * Depends and B-D on libhttpcore-java (>= 4.2.1).
+ * Also install fluent-hc API.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 19 Aug 2012 15:39:42 +0200
httpcomponents-client (4.1.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 19cc0e9..b7b87ef 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,20 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Miguel Landaeta <miguel at miguel.cc>, Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends:
- debhelper (>= 7.0.50~)
- , default-jdk
- , maven-debian-helper
- , maven-repo-helper
- , javahelper
-Build-Depends-Indep:
- libmaven-antrun-plugin-java
- , libmaven-javadoc-plugin-java
- , libmaven-assembly-plugin-java
- , libmaven-bundle-plugin-java
- , libhttpcore-java
- , libapache-mime4j-java
- , junit
- , libcommons-codec-java
- , libmockito-java
+Build-Depends: debhelper (>= 7.0.50~),
+ default-jdk,
+ javahelper,
+ maven-debian-helper,
+ maven-repo-helper
+Build-Depends-Indep: junit,
+ libapache-mime4j-java,
+ libcommons-codec-java,
+ libhttpcore-java (>= 4.2.1),
+ libmaven-antrun-plugin-java,
+ libmaven-assembly-plugin-java,
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmockito-java
Standards-Version: 3.9.3
Homepage: http://hc.apache.org/httpcomponents-client/index.html
Vcs-Git: git://git.debian.org/pkg-java/httpcomponents-client.git
@@ -26,11 +24,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/httpcomponents-client.git
Package: libhttpclient-java
Architecture: all
-Depends:
- ${misc:Depends}
- , libcommons-codec-java
- , libcommons-logging-java
- , libhttpcore-java
+Depends: libcommons-codec-java,
+ libcommons-logging-java,
+ libhttpcore-java (>= 4.2.1),
+ ${misc:Depends}
Description: HTTP/1.1 compliant HTTP agent implementation
HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on
HttpCore. It also provides reusable components for client-side
@@ -42,10 +39,9 @@ Description: HTTP/1.1 compliant HTTP agent implementation
Package: libhttpmime-java
Architecture: all
-Depends:
- ${misc:Depends}
- , libhttpclient-java (= ${source:Version})
- , libapache-mime4j-java
+Depends: libapache-mime4j-java,
+ libhttpclient-java (= ${source:Version}),
+ ${misc:Depends}
Description: HTTP/1.1 compliant HTTP agent implementation - mime4j extension
HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on
HttpCore. It also provides reusable components for client-side
diff --git a/debian/libhttpclient-java.poms b/debian/libhttpclient-java.poms
index 64ec420..479cc62 100644
--- a/debian/libhttpclient-java.poms
+++ b/debian/libhttpclient-java.poms
@@ -1,2 +1,3 @@
-#pom.xml --no-parent
-httpclient/pom.xml --no-parent
+pom.xml --no-parent
+httpclient/pom.xml
+fluent-hc/pom.xml
diff --git a/debian/libhttpmime-java.poms b/debian/libhttpmime-java.poms
index fedd882..64a87c7 100644
--- a/debian/libhttpmime-java.poms
+++ b/debian/libhttpmime-java.poms
@@ -1 +1 @@
-httpmime/pom.xml --no-parent
+httpmime/pom.xml
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 8a736ea..568486e 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,20 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\..*/3.x/
+
+org.apache.httpcomponents httpclient jar * tests *
* maven-clover2-plugin
* maven-source-plugin
* maven-release-plugin
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index 2c0e8b4..f3d146f 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -6,16 +6,17 @@ Forwarded: no
pom.xml | 2 ++
1 file changed, 2 insertions(+)
---- httpcomponents-client-4.1.1.orig/pom.xml
-+++ httpcomponents-client-4.1.1/pom.xml
-@@ -82,8 +82,10 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -153,9 +153,9 @@
<modules>
<module>httpclient</module>
<module>httpmime</module>
-+ <!--
- <module>httpclient-cache</module>
- <module>httpclient-osgi</module>
-+ -->
+- <module>httpclient-cache</module>
++<!-- <module>httpclient-cache</module> -->
+ <module>fluent-hc</module>
+- <module>httpclient-osgi</module>
++<!-- <module>httpclient-osgi</module> -->
</modules>
<build>
diff --git a/debian/patches/01-generate_osgi_metadata.patch b/debian/patches/01-generate_osgi_metadata.patch
index 44dfabe..0f1e29e 100644
--- a/debian/patches/01-generate_osgi_metadata.patch
+++ b/debian/patches/01-generate_osgi_metadata.patch
@@ -6,11 +6,9 @@ Subject: generate-osgi-metadata
httpclient/pom.xml | 67 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 7 deletions(-)
-diff --git a/httpclient/pom.xml b/httpclient/pom.xml
-index 4ce1cab..ffaaa0d 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
-@@ -108,13 +108,11 @@
+@@ -103,13 +103,11 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -29,7 +27,7 @@ index 4ce1cab..ffaaa0d 100644
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
-@@ -134,6 +132,61 @@
+@@ -129,6 +127,61 @@
</execution>
</executions>
</plugin>
diff --git a/debian/rules b/debian/rules
index d87d542..2948194 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+M2_HOME=/usr/share/maven2
UPVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d- -f1)
# let's skip tests, they FTBFS.
@@ -20,11 +21,10 @@ override_dh_installchangelogs:
dh_installchangelogs RELEASE_NOTES.txt
override_dh_auto_build:
- mh_patchpom -plibhttpclient-java --no-parent pom.xml
for pkg in libhttpclient-java libhttpmime-java; do \
- mh_patchpoms -p$$pkg ; \
+ mh_patchpoms -p$$pkg --debian-build --keep-pom-version ; \
done
- mvn -o -s /etc/maven2/settings-debian.xml \
+ $(M2_HOME)/bin/mvn -o -s /etc/maven2/settings-debian.xml \
-Dmaven.test.skip=$(SKIPTEST) package
override_dh_auto_install:
@@ -34,10 +34,12 @@ override_dh_auto_install:
mh_installpoms -p$$pkg -e$(UPVER); \
done
- mh_installjar -plibhttpclient-java -l httpclient/pom.xml -i$(UPVER) -e$(UPVER) \
- httpclient/target/httpclient-debian.jar
- mh_installjar -plibhttpmime-java -l httpmime/pom.xml -i$(UPVER) -e$(UPVER)\
- httpmime/target/httpmime-debian.jar
+ 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
@@ -47,5 +49,5 @@ override_dh_clean:
for pkg in libhttpclient-java libhttpmime-java; do \
mh_unpatchpoms -p$$pkg ; \
done
- [ ! -e pom.xml.save ] || mv pom.xml.save pom.xml
- -rm -rf http*/target/ debian/.mh/
+ mh_clean
+ -rm -rf http*/target/
--
httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation
More information about the pkg-java-commits
mailing list