[pkg-java] r15162 - trunk/jzlib/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Oct 6 21:56:31 UTC 2011
Author: drazzib
Date: 2011-10-06 21:56:30 +0000 (Thu, 06 Oct 2011)
New Revision: 15162
Added:
trunk/jzlib/debian/javabuild
trunk/jzlib/debian/libjzlib-java.jlibs
Removed:
trunk/jzlib/debian/build.xml
trunk/jzlib/debian/pom.xml
Modified:
trunk/jzlib/debian/changelog
trunk/jzlib/debian/control
trunk/jzlib/debian/copyright
trunk/jzlib/debian/libjzlib-java.poms
trunk/jzlib/debian/rules
Log:
* 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.
Deleted: trunk/jzlib/debian/build.xml
===================================================================
--- trunk/jzlib/debian/build.xml 2011-10-06 21:11:21 UTC (rev 15161)
+++ trunk/jzlib/debian/build.xml 2011-10-06 21:56:30 UTC (rev 15162)
@@ -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>
Modified: trunk/jzlib/debian/changelog
===================================================================
--- trunk/jzlib/debian/changelog 2011-10-06 21:11:21 UTC (rev 15161)
+++ trunk/jzlib/debian/changelog 2011-10-06 21:56:30 UTC (rev 15162)
@@ -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 <drazzib at debian.org> Thu, 06 Oct 2011 23:51:14 +0200
+
jzlib (1.0.7-4) unstable; urgency=low
[ Damien Raude-Morvan ]
Modified: trunk/jzlib/debian/control
===================================================================
--- trunk/jzlib/debian/control 2011-10-06 21:11:21 UTC (rev 15161)
+++ trunk/jzlib/debian/control 2011-10-06 21:56:30 UTC (rev 15162)
@@ -1,11 +1,10 @@
Source: jzlib
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-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/
Modified: trunk/jzlib/debian/copyright
===================================================================
--- trunk/jzlib/debian/copyright 2011-10-06 21:11:21 UTC (rev 15161)
+++ trunk/jzlib/debian/copyright 2011-10-06 21:56:30 UTC (rev 15162)
@@ -1,35 +1,66 @@
-This is JZlib. It was initially made into a Debian package by Adam Heath
-<doogie at debian.org>. 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 <ymnk at jcraft.com>
+Source: https://github.com/ymnk/jzlib
+Comment:
+ JZlib has been developed by ymnk at jcraft.com,
+ 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
+ |jloup at gzip.org madler at alumni.caltech.edu
-Authors: Atsuhiko Yamanaka <ymnk at jcraft.com>
- Lapo Luchini <lapo at lapo.it>
+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 <doogie at debian.org>
+Copyright: Copyright 2008-2011, Damien Raude-Morvan <drazzib at debian.org>
+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.
Added: trunk/jzlib/debian/javabuild
===================================================================
--- trunk/jzlib/debian/javabuild (rev 0)
+++ trunk/jzlib/debian/javabuild 2011-10-06 21:56:30 UTC (rev 15162)
@@ -0,0 +1 @@
+jzlib.jar src/main/java
Added: trunk/jzlib/debian/libjzlib-java.jlibs
===================================================================
--- trunk/jzlib/debian/libjzlib-java.jlibs (rev 0)
+++ trunk/jzlib/debian/libjzlib-java.jlibs 2011-10-06 21:56:30 UTC (rev 15162)
@@ -0,0 +1 @@
+jzlib.jar
\ No newline at end of file
Modified: trunk/jzlib/debian/libjzlib-java.poms
===================================================================
--- trunk/jzlib/debian/libjzlib-java.poms 2011-10-06 21:11:21 UTC (rev 15161)
+++ trunk/jzlib/debian/libjzlib-java.poms 2011-10-06 21:56:30 UTC (rev 15162)
@@ -1 +1 @@
-debian/pom.xml
+pom.xml --usj-name=jzlib
Deleted: trunk/jzlib/debian/pom.xml
===================================================================
--- trunk/jzlib/debian/pom.xml 2011-10-06 21:11:21 UTC (rev 15161)
+++ trunk/jzlib/debian/pom.xml 2011-10-06 21:56:30 UTC (rev 15162)
@@ -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
Modified: trunk/jzlib/debian/rules
===================================================================
--- trunk/jzlib/debian/rules 2011-10-06 21:11:21 UTC (rev 15161)
+++ trunk/jzlib/debian/rules 2011-10-06 21:56:30 UTC (rev 15162)
@@ -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
+%:
+ dh $@ --with javahelper --with jh_maven_repo_helper
-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
-
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
-
More information about the pkg-java-commits
mailing list