[SCM] javatar - java library to access tar files - Debian package. branch, master, updated. debian/2.5+dfsg-3-2-gd57bf99
Niels Thykier
nthykier-guest at alioth.debian.org
Thu Jan 21 13:42:21 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "javatar - java library to access tar files - Debian package.".
The branch, master has been updated
via d57bf9989d7b6205f2c2cec9a602f6d1ea6dc54e (commit)
via 5232d2293b7df6d9d65f0fa77fc07dafdac8e00e (commit)
from 7ff37f315a8bf2f7dc8b6f5d0a78d6bc1a319987 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d57bf9989d7b6205f2c2cec9a602f6d1ea6dc54e
Author: Niels Thykier <niels at thykier.net>
Date: Thu Jan 21 14:41:53 2010 +0100
Updated changelog
commit 5232d2293b7df6d9d65f0fa77fc07dafdac8e00e
Author: Niels Thykier <niels at thykier.net>
Date: Thu Jan 21 14:32:58 2010 +0100
Converted source into 3.0 (quilt)
- Removed simple patchsys from debian/rules
Updated and renamed patch give correct build options to the java compiler.
Added missing java runtimes to libjavatar-java's Depends.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 9 ++++++
debian/control | 11 ++++---
debian/patches/BuildXml.patch | 30 ---------------------
debian/patches/build.patch | 59 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 -
debian/source/format | 1 +
source/com/ice/tar/build.xml | 17 +++++++++--
8 files changed, 90 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c50290..51e8de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+javatar (2.5+dfsg-4) unstable; urgency=low
+
+ * Converted source into 3.0 (quilt)
+ - Removed simple patchsys from debian/rules
+ * Updated and renamed patch give correct build options to the java compiler.
+ * Added missing java runtimes to libjavatar-java's Depends.
+
+ -- Niels Thykier <niels at thykier.net> Thu, 21 Jan 2010 14:41:20 +0100
+
javatar (2.5+dfsg-3) unstable; urgency=low
* Use default-jdk instead of java-gcj-compat. (Closes: #526285, #543088)
diff --git a/debian/control b/debian/control
index 8c26957..d645f10 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,8 @@ Source: javatar
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>,
- Niels Thykier <niels at thykier.net>
-Build-Depends-Indep: default-jdk, libgnujaf-java, tofrodos
-Build-Depends: ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 7)
+Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Niels Thykier <niels at thykier.net>
+Build-Depends: default-jdk, libgnujaf-java, tofrodos, ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 7)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/svn/pkg-java/javatar.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/javatar.git
@@ -13,7 +11,8 @@ Homepage: http://www.trustice.com/java/tar/
Package: libjavatar-java
Architecture: all
-Depends: ${misc:Depends}
+Depends: default-jre-headless | java5-runtime-headless | java6-runtime-headless,
+ ${misc:Depends}
Suggests: libjavatar-java-doc
Description: allows access to TAR files from Java
The package com.ice.tar implements a tar archive io package. This package
@@ -30,3 +29,5 @@ Description: Documentation for JavaTar library
This library allows you to create, and extract tar archives. Since the package
uses InputStream and OutputStream, it is possible to combine this package with
the java.util.zip package to handle .tar.gz files.
+ .
+ This package contains the Java API.
diff --git a/debian/patches/BuildXml.patch b/debian/patches/BuildXml.patch
deleted file mode 100644
index 3cb38d1..0000000
--- a/debian/patches/BuildXml.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Files javatar-2.5.orig/javatar-2.5.tar and javatar-2.5/javatar-2.5.tar differ
-Files javatar-2.5.orig/javatar-2.5.tar.gz and javatar-2.5/javatar-2.5.tar.gz differ
-Files javatar-2.5.orig/javatar-2.5.zip and javatar-2.5/javatar-2.5.zip differ
-diff -Nur javatar-2.5.orig/source/com/ice/tar/build.xml javatar-2.5/source/com/ice/tar/build.xml
---- javatar-2.5.orig/source/com/ice/tar/build.xml 2003-06-30 08:48:36.000000000 +0100
-+++ javatar-2.5/source/com/ice/tar/build.xml 2007-02-06 11:43:10.680452100 +0000
-@@ -128,7 +128,6 @@
- <target name="echo-props">
- <echo message="basedir=${basedir}" />
- <echo message="build=${build}" />
-- <echo message="bindir=${bindir}" />
- <echo message="jardir=${jardir}" />
- <echo message="classdir=${classdir}" />
- <echo message="sourcedir=${sourcedir}" />
-@@ -151,12 +150,13 @@
- <property name="apidocdir" value="${docdir}/api" />
- <property name="sourcedir" value="${build}/source" />
-
-- <property name="srcdir" value="${basedir}/java" />
-+ <property name="srcdir" value="${basedir}/source" />
- <property name="tardir" value="${srcdir}/com/ice/tar" />
-
- <!-- JARS -->
- <property name="activationjar"
-- value="C:/java/jaf-1.0.1/activation.jar" />
-+ value="/usr/share/java/activation.jar" />
-+ <!-- value="C:/java/jaf-1.0.1/activation.jar" /> -->
-
- <!-- GLOBALS -->
- <property name="java.home" value="C:/java/jdk1.3"/>
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..4621585
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,59 @@
+diff --git a/source/com/ice/tar/build.xml b/source/com/ice/tar/build.xml
+index 55fd5a6..7a3e028 100644
+--- a/source/com/ice/tar/build.xml
++++ b/source/com/ice/tar/build.xml
+@@ -49,6 +49,10 @@
+ destdir="${classdir}"
+ verbose="${my.verbose}"
+ deprecation="${my.deprec}"
++ source="${source}"
++ target="${target}"
++ optimize="${optimize}"
++ debug="${debug}"
+ >
+
+ <include name="com/ice/tar/"/>
+@@ -91,6 +95,7 @@
+ use="true"
+ windowtitle="Java Tar by Tim Endres"
+ bottom="${copyright}"
++ source="${source}"
+ >
+
+ <group title="Java Tar" packages="com.ice.tar"/>
+@@ -128,7 +133,6 @@
+ <target name="echo-props">
+ <echo message="basedir=${basedir}" />
+ <echo message="build=${build}" />
+- <echo message="bindir=${bindir}" />
+ <echo message="jardir=${jardir}" />
+ <echo message="classdir=${classdir}" />
+ <echo message="sourcedir=${sourcedir}" />
+@@ -151,18 +155,25 @@
+ <property name="apidocdir" value="${docdir}/api" />
+ <property name="sourcedir" value="${build}/source" />
+
+- <property name="srcdir" value="${basedir}/java" />
++ <property name="srcdir" value="${basedir}/source" />
+ <property name="tardir" value="${srcdir}/com/ice/tar" />
+
+ <!-- JARS -->
+ <property name="activationjar"
+- value="C:/java/jaf-1.0.1/activation.jar" />
++ value="/usr/share/java/activation.jar" />
++ <!-- value="C:/java/jaf-1.0.1/activation.jar" /> -->
+
+ <!-- GLOBALS -->
+ <property name="java.home" value="C:/java/jdk1.3"/>
+ <property name="java.lib" value="${java.home}/jre/lib"/>
+ <property name="build.compiler" value="modern"/>
+
++ <property name="source" value="1.5" />
++ <property name="target" value="1.5" />
++ <property name="debug" value="true" />
++ <property name="optimize" value="true" />
++
++
+ <property name="copyright"
+ value="<i>This software has been placed into the public domain.</i>"
+ />
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5879227
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build.patch
diff --git a/debian/rules b/debian/rules
index 86fdcc8..8d96a94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
# debian/rules file for libjavatar-java (uses cdbs)
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
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/source/com/ice/tar/build.xml b/source/com/ice/tar/build.xml
index 55fd5a6..7a3e028 100644
--- a/source/com/ice/tar/build.xml
+++ b/source/com/ice/tar/build.xml
@@ -49,6 +49,10 @@
destdir="${classdir}"
verbose="${my.verbose}"
deprecation="${my.deprec}"
+ source="${source}"
+ target="${target}"
+ optimize="${optimize}"
+ debug="${debug}"
>
<include name="com/ice/tar/"/>
@@ -91,6 +95,7 @@
use="true"
windowtitle="Java Tar by Tim Endres"
bottom="${copyright}"
+ source="${source}"
>
<group title="Java Tar" packages="com.ice.tar"/>
@@ -128,7 +133,6 @@
<target name="echo-props">
<echo message="basedir=${basedir}" />
<echo message="build=${build}" />
- <echo message="bindir=${bindir}" />
<echo message="jardir=${jardir}" />
<echo message="classdir=${classdir}" />
<echo message="sourcedir=${sourcedir}" />
@@ -151,18 +155,25 @@
<property name="apidocdir" value="${docdir}/api" />
<property name="sourcedir" value="${build}/source" />
- <property name="srcdir" value="${basedir}/java" />
+ <property name="srcdir" value="${basedir}/source" />
<property name="tardir" value="${srcdir}/com/ice/tar" />
<!-- JARS -->
<property name="activationjar"
- value="C:/java/jaf-1.0.1/activation.jar" />
+ value="/usr/share/java/activation.jar" />
+ <!-- value="C:/java/jaf-1.0.1/activation.jar" /> -->
<!-- GLOBALS -->
<property name="java.home" value="C:/java/jdk1.3"/>
<property name="java.lib" value="${java.home}/jre/lib"/>
<property name="build.compiler" value="modern"/>
+ <property name="source" value="1.5" />
+ <property name="target" value="1.5" />
+ <property name="debug" value="true" />
+ <property name="optimize" value="true" />
+
+
<property name="copyright"
value="<i>This software has been placed into the public domain.</i>"
/>
hooks/post-receive
--
javatar - java library to access tar files - Debian package.
More information about the pkg-java-commits
mailing list