[not-yet-commons-ssl] 02/08: Imported Debian patch 0.3.9-4
Tony Mancill
tmancill at moszumanska.debian.org
Thu Aug 28 21:03:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository not-yet-commons-ssl.
commit c21bafa4f0d3f46fb3bc5d32776c22fde98cbe96
Author: Matthew Vernon <matthew at debian.org>
Date: Wed Mar 19 17:10:38 2014 +0000
Imported Debian patch 0.3.9-4
---
debian/README.source | 9 +++
debian/changelog | 32 +++++++++++
debian/compat | 1 +
debian/control | 45 +++++++++++++++
debian/copyright | 64 ++++++++++++++++++++++
.../libnot-yet-commons-ssl-java-doc.doc-base.api | 10 ++++
debian/libnot-yet-commons-ssl-java-doc.install | 2 +
debian/libnot-yet-commons-ssl-java.poms | 27 +++++++++
debian/maven.cleanIgnoreRules | 1 +
debian/maven.ignoreRules | 1 +
debian/maven.properties | 5 ++
debian/maven.publishedRules | 1 +
debian/maven.rules | 2 +
debian/patches/debianise-build-xml | 55 +++++++++++++++++++
debian/patches/series | 1 +
debian/pom.xml | 16 ++++++
debian/pom.xml.save | 6 ++
debian/rules | 20 +++++++
debian/source/format | 1 +
debian/watch | 3 +
20 files changed, 302 insertions(+)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..60cb68a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about not-yet-commons-ssl
+------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e3fc76b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,32 @@
+not-yet-commons-ssl (0.3.9-4) experimental; urgency=low
+
+ * Remove dependency jars from source package
+ * Fix build.xml to use installed jars
+ * Build javadocs, register with doc-base
+ * Create a -doc package
+ * Actually upload this package to Debian (Closes: #656453)
+
+ -- Matthew Vernon <matthew at debian.org> Wed, 19 Mar 2014 17:10:38 +0000
+
+not-yet-commons-ssl (0.3.9-3) unstable; urgency=low
+
+ * Take this package, make it belong to the java team
+ * change groupId to ca.juliusdavies
+
+ -- Matthew Vernon <matthew at debian.org> Fri, 14 Feb 2014 12:59:33 +0000
+
+not-yet-commons-ssl (0.3.9-2) unstable; urgency=low
+
+ * extended copyright details after contacting upstream author
+ * removed duplicate cdbs build dependency
+ * updated copyright header
+ * updated to Debian policy 3.9.3
+ * added version control reference fields
+
+ -- Dennis van Dok (Software Engineer) <dennisvd at nikhef.nl> Thu, 15 Mar 2012 23:45:36 +0100
+
+not-yet-commons-ssl (0.3.9-1) unstable; urgency=low
+
+ * Initial release (Closes: #656453)
+
+ -- Dennis van Dok (Software Engineer) <dennisvd at nikhef.nl> Wed, 11 Jan 2012 17:02:41 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d512590
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,45 @@
+Source: not-yet-commons-ssl
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Matthew Vernon <matthew at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4),
+ liblog4j1.2-java, libcommons-httpclient-java
+Standards-Version: 3.9.3
+Homepage: http://juliusdavies.ca/commons-ssl/
+
+Package: libnot-yet-commons-ssl-java
+Architecture: all
+Depends: ${misc:Depends}, liblog4j1.2-java, libcommons-httpclient-java
+Suggests: libnot-yet-commons-ssl-java-doc
+Description: Not-yet-commons-SSL is a library to make SSL in Java easier
+ This library implements SSL functionality in a way that is easy and
+ flexible. It improves security by checking CRLs by default. It allows
+ options to be set or unset for each SSLSocketFactory. It supports
+ many different formats of PKCS8 and OpenSSL Encrypted Private Keys,
+ and it automatically detects the type of KeyMaterial or
+ TrustMaterial.
+ .
+ It's called "Not-Yet-Commons-SSL" because of the intention of one day
+ making it an official Apache project. It currently has no affiliation
+ with the Apache Software Foundation.
+
+Package: libnot-yet-commons-ssl-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, liblog4j1.2-java-doc, libcommons-httpclient-java-doc
+Suggests: libnot-yet-commons-ssl-java
+Description: Documentation for Not-yet-commons-SSL
+ Not-yet-commons-SSL implements SSL functionality in a way that is
+ easy and flexible. It improves security by checking CRLs by
+ default. It allows options to be set or unset for each
+ SSLSocketFactory. It supports many different formats of PKCS8 and
+ OpenSSL Encrypted Private Keys, and it automatically detects the type
+ of KeyMaterial or TrustMaterial.
+ .
+ It's called "Not-Yet-Commons-SSL" because of the intention of one day
+ making it an official Apache project. It currently has no affiliation
+ with the Apache Software Foundation.
+ .
+ This package contains the API documentation of
+ libnot-yet-commons-ssl-java.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..a630a58
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,64 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: not-yet-commons-ssl
+Upstream-Contact: Julius Davies <juliusdavies at gmail.com>
+Source: http://juliusdavies.ca/commons-ssl/
+License: Apache-2.0
+Copyright: Credit Union Central of British Columbia
+
+Files: *
+Copyright: 2006-2012, Julius Davies <juliusdavies at gmail.com>
+ 2006 Central 1 Credit Union (http://central1.com/)
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2012, Dennis van Dok (Software Engineer) <dennisvd at nikhef.nl>
+License: Apache-2.0
+
+Files: src/java/org/apache/commons/httpclient/contrib/ssl/*
+ src/java/org/apache/commons/ssl/Base64.java
+Copyright: 1999-2006 The Apache Software Foundation
+License: Apache-2.0
+
+Files: src/java/org/apache/commons/ssl/util/PublicKeyDeriver.java
+Copyright: 2007 Chad La Joie
+License: Apache-2.0
+
+Files: src/java/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
+ src/java/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java
+Copyright: 2006 Oleg Kalnichevski
+License: Apache-2.0
+
+Files: src/java/org/apache/commons/ssl/HostnameVerifier.java
+Copyright: 2006 Julius Davies
+ 2006 Sebastian Hauer
+License: Apache-2.0
+
+Files: src/java/org/apache/commons/ssl/asn1/*
+ src/java/org/apache/commons/ssl/PKCS8Key.java
+Copyright: 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+License: adaptation of the MIT X11 License
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+
diff --git a/debian/libnot-yet-commons-ssl-java-doc.doc-base.api b/debian/libnot-yet-commons-ssl-java-doc.doc-base.api
new file mode 100644
index 0000000..9075d93
--- /dev/null
+++ b/debian/libnot-yet-commons-ssl-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libnot-yet-commons-ssl-java
+Title: API Javadoc for not-yet-commons-SSL
+Author: Julius Davies
+Abstract: This is the API Javadoc provided for the
+ libnot-yet-commons-ssl-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libnot-yet-commons-ssl-java/api/index.html
+Files: /usr/share/doc/libnot-yet-commons-ssl-java/api/*
diff --git a/debian/libnot-yet-commons-ssl-java-doc.install b/debian/libnot-yet-commons-ssl-java-doc.install
new file mode 100644
index 0000000..152a185
--- /dev/null
+++ b/debian/libnot-yet-commons-ssl-java-doc.install
@@ -0,0 +1,2 @@
+build/javadocs/* /usr/share/doc/libnot-yet-commons-ssl-java/api
+
diff --git a/debian/libnot-yet-commons-ssl-java.poms b/debian/libnot-yet-commons-ssl-java.poms
new file mode 100644
index 0000000..c95ed3d
--- /dev/null
+++ b/debian/libnot-yet-commons-ssl-java.poms
@@ -0,0 +1,27 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..2e46c28
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+
+org.apache.commons.ssl not-yet-commons-ssl jar s/.*/debian/ * *
diff --git a/debian/patches/debianise-build-xml b/debian/patches/debianise-build-xml
new file mode 100644
index 0000000..4751c25
--- /dev/null
+++ b/debian/patches/debianise-build-xml
@@ -0,0 +1,55 @@
+Description: Debianise build.xml
+Author: Matthew Vernon <matthew at debian.org>
+
+Modify build.xml to refer to the system-provided jars.
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- not-yet-commons-ssl-0.3.9.orig/build.xml
++++ not-yet-commons-ssl-0.3.9/build.xml
+@@ -13,8 +13,8 @@
+ -->
+ <project name="commons-ssl" default="jar" basedir=".">
+
+- <property name="httpclient-jar" value="commons-httpclient-3.0.jar"/>
+- <property name="log4j-jar" value="log4j-1.2.13.jar"/>
++ <property name="httpclient-jar" value="commons-httpclient.jar"/>
++ <property name="log4j-jar" value="log4j-1.2.jar"/>
+ <property name="src" location="./src/java"/>
+ <property name="build" location="./build"/>
+ <property name="lib" location="./lib"/>
+@@ -22,11 +22,12 @@
+ <property name="jar-file" value="${ant.project.name}.jar"/>
+ <property name="javadocs" value="${build}/javadocs"/>
+ <property name="rmic.includes" value="**/*RMI.class"/>
++ <property name="debian.java.dir" value="/usr/share/java" />
+
+ <path id="compile-classpath">
+ <pathelement location="${classes}"/>
+- <pathelement location="${lib}/${httpclient-jar}"/>
+- <pathelement location="${lib}/${log4j-jar}"/>
++ <pathelement location="${debian.java.dir}/${httpclient-jar}"/>
++ <pathelement location="${debian.java.dir}/${log4j-jar}"/>
+ </path>
+
+ <target name="init">
+@@ -100,7 +101,7 @@
+ <delete dir="${build}"/>
+ </target>
+
+- <target name="all" depends="clean,jar"/>
++ <target name="all" depends="jar,javadocs"/>
+
+
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..29c48b3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debianise-build-xml
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..7cd3939
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>ca.juliusdavies</groupId>
+ <artifactId>not-yet-commons-ssl</artifactId>
+ <version>0.3.9</version>
+ <packaging>jar</packaging><properties>
+
+ <debian.hasPackageVersion/>
+
+ <debian.originalVersion>0.3.9</debian.originalVersion>
+
+ <debian.package>libnot-yet-commons-ssl-java</debian.package>
+ </properties>
+
+</project>
\ No newline at end of file
diff --git a/debian/pom.xml.save b/debian/pom.xml.save
new file mode 100644
index 0000000..be2f2e8
--- /dev/null
+++ b/debian/pom.xml.save
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>ca.juliusdavies</groupId>
+ <artifactId>not-yet-commons-ssl</artifactId>
+ <version>0.3.9</version>
+</project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..2390d17
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := all
+DEB_JARS := \
+ commons-codec \
+ commons-logging \
+ commons-httpclient \
+ log4j-1.2
+
+clean::
+ mh_clean
+
+binary-post-install/libnot-yet-commons-ssl-java::
+ mh_installpoms -plibnot-yet-commons-ssl-java
+ mh_installjar -plibnot-yet-commons-ssl-java -l debian/pom.xml build/commons-ssl.jar
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..c5953c6
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://juliusdavies.ca/commons-ssl/download.html \
+/commons-ssl/not-yet-commons-ssl-(.+).zip
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/not-yet-commons-ssl.git
More information about the pkg-java-commits
mailing list