This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jzlib.
commit 754b9120983af95897a5bbeb39a698140ef6bde0 Author: Damien Raude-Morvan <[email protected]> Date: Thu Oct 6 21:56:30 2011 +0000 * New upstream release (since 2008)! - d/copyright: Update source location to github and copyright's years. - d/copyright: Use DEP-5 format. * d/libjzlib-java.poms: Drop debian/pom.xml and use upstream pom.xml. * d/{control,rules}: Use javahelper to build jzlib instead of ant. - d/build.xml: Dropped. - d/javabuild and d/libjzlib-java.jlibs: Added for javahelper. --- debian/build.xml | 32 ------------------- debian/changelog | 12 +++++++ debian/control | 5 ++- debian/copyright | 79 ++++++++++++++++++++++++++++++++-------------- debian/javabuild | 1 + debian/libjzlib-java.jlibs | 1 + debian/libjzlib-java.poms | 2 +- debian/pom.xml | 30 ------------------ debian/rules | 27 ++-------------- 9 files changed, 75 insertions(+), 114 deletions(-) diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index e823850..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<project name="jzlib" default="jar" basedir=".."> - -<target name="init"> - <property name="src.dir" value="."/> - <property name="build.dir" value="build"/> - <property name="jar" value="${build.dir}/${deb.package}-${deb.version}.jar"/> -</target> - -<target name="compile" depends="init"> - <mkdir dir="${build.dir}"/> - <javac srcdir="${src.dir}" - includes="com/**/*" - source="1.4" target="1.4" - destdir="${build.dir}" - debug="on"> - </javac> -</target> - -<target name="jar" depends="compile"> - <delete file="${jar}"/> - - <jar jarfile="${jar}" - basedir="${build.dir}" /> - -</target> - -<target name="clean" depends="init"> - <delete dir="${build.dir}"/> -</target> - -</project> diff --git a/debian/changelog b/debian/changelog index 9628bcc..c9a90c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +jzlib (1.1.0-1) unstable; urgency=low + + * New upstream release (since 2008)! + - d/copyright: Update source location to github and copyright's years. + - d/copyright: Use DEP-5 format. + * d/libjzlib-java.poms: Drop debian/pom.xml and use upstream pom.xml. + * d/{control,rules}: Use javahelper to build jzlib instead of ant. + - d/build.xml: Dropped. + - d/javabuild and d/libjzlib-java.jlibs: Added for javahelper. + + -- Damien Raude-Morvan <[email protected]> Thu, 06 Oct 2011 23:51:14 +0200 + jzlib (1.0.7-4) unstable; urgency=low [ Damien Raude-Morvan ] diff --git a/debian/control b/debian/control index c57380e..0e4c056 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ Source: jzlib Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Section: java Priority: optional -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant -Build-Depends-Indep: maven-repo-helper +Build-Depends: debhelper (>= 7), default-jdk, javahelper, maven-repo-helper Homepage: http://www.jcraft.com/jzlib/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jzlib/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jzlib/ diff --git a/debian/copyright b/debian/copyright index 3b85979..b481fc4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,35 +1,66 @@ -This is JZlib. It was initially made into a Debian package by Adam Heath -<[email protected]>. The homepage is http://www.jcraft.com/jzlib/. No -modifications were done to the upstream source in making this package. +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Upstream-Name: JZlib +Upstream-Contact: Atsuhiko Yamanaka <[email protected]> +Source: https://github.com/ymnk/jzlib +Comment: + JZlib has been developed by [email protected], + but he has just re-implemented zlib in pure Java. + So, all credit should go to authors Jean-loup Gailly and Mark Adler + and contributors of zlib. Here is the copyright notice of zlib version 1.1.3, + |Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler + | + |This software is provided 'as-is', without any express or implied + |warranty. In no event will the authors be held liable for any damages + |arising from the use of this software. + | + |Permission is granted to anyone to use this software for any purpose, + |including commercial applications, and to alter it and redistribute it + |freely, subject to the following restrictions: + | + |1. The origin of this software must not be misrepresented; you must not + | claim that you wrote the original software. If you use this software + | in a product, an acknowledgment in the product documentation would be + | appreciated but is not required. + |2. Altered source versions must be plainly marked as such, and must not be + | misrepresented as being the original software. + |3. This notice may not be removed or altered from any source distribution. + | + |Jean-loup Gailly Mark Adler + |[email protected] [email protected] -Authors: Atsuhiko Yamanaka <[email protected]> - Lapo Luchini <[email protected]> +Files: * Copyright: Copyright (c) 2000,2001,2002,2003 ymnk JCraft, Inc. - Copyright (c) 2001 Lapo Luchini - -License: - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - +Copyright: Copyright (c) 2001 Lapo Luchini +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + . 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + . 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, + INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Files: debian/* +Copyright: Copyright 2002-2008, Adam Heath <[email protected]> +Copyright: Copyright 2008-2011, Damien Raude-Morvan <[email protected]> +License: Apache-2.0 + On Debian systems, the complete text of the Apache License Version 2.0, + can be found in /usr/share/common-licenses/Apache-2.0. diff --git a/debian/javabuild b/debian/javabuild new file mode 100644 index 0000000..b82fe99 --- /dev/null +++ b/debian/javabuild @@ -0,0 +1 @@ +jzlib.jar src/main/java diff --git a/debian/libjzlib-java.jlibs b/debian/libjzlib-java.jlibs new file mode 100644 index 0000000..c40cee2 --- /dev/null +++ b/debian/libjzlib-java.jlibs @@ -0,0 +1 @@ +jzlib.jar \ No newline at end of file diff --git a/debian/libjzlib-java.poms b/debian/libjzlib-java.poms index 1a7e280..170a017 100644 --- a/debian/libjzlib-java.poms +++ b/debian/libjzlib-java.poms @@ -1 +1 @@ -debian/pom.xml +pom.xml --usj-name=jzlib diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index eb67eef..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - <groupId>com.jcraft</groupId> - <artifactId>jzlib</artifactId> - <version>1.0.7</version> - <name>JZlib</name> - <description>JZlib is a re-implementation of zlib in pure Java</description> - <url>http://www.jcraft.com/jzlib/</url> - - <organization> - <name>jcraft</name> - <url>http://www.jcraft.com/jsch</url> - </organization> - - <licenses> - <license> - <name>BSD</name> - <url>http://www.jcraft.com/jzlib/LICENSE.txt</url> - </license> - </licenses> - - <distributionManagement> - <status>deployed</status> - </distributionManagement> - -</project> \ No newline at end of file diff --git a/debian/rules b/debian/rules index a08d159..93dc43d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +export JAVA_HOME := /usr/lib/jvm/default-java -POM_VERSION := 1.0.7 -MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content - -JAVA_HOME := /usr/lib/jvm/default-java -ANT_HOME := /usr/share/ant - -DEB_ANT_BUILD_TARGET := jar -DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Ddeb.package=$(DEB_SOURCE_PACKAGE) -Ddeb.version=$(DEB_UPSTREAM_VERSION) - -install/libjzlib-java:: - mh_installpoms -plibjzlib-java - mh_installjar -plibjzlib-java -l debian/pom.xml build/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar - -clean:: - -rm -rf debian/tmp +%: + dh $@ --with javahelper --with jh_maven_repo_helper get-orig-source: uscan --force-download --rename - -get-orig-pom: - wget -O debian/pom.xml $(MAVEN_REPO)/com/jcraft/jzlib/$(POM_VERSION)/jzlib-$(POM_VERSION).pom - perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(DEB_UPSTREAM_VERSION)/' debian/pom.xml - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jzlib.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
