[pkg-java] r6050 - in trunk/batik/debian: . patches
fourmond at alioth.debian.org
fourmond at alioth.debian.org
Mon Mar 31 21:07:30 UTC 2008
Author: fourmond
Date: 2008-03-31 21:07:30 +0000 (Mon, 31 Mar 2008)
New Revision: 6050
Added:
trunk/batik/debian/new-upstream
Removed:
trunk/batik/debian/patches/02_fix_jar_target.patch
Modified:
trunk/batik/debian/changelog
trunk/batik/debian/control
trunk/batik/debian/copyright
trunk/batik/debian/rules
trunk/batik/debian/watch
Log:
[batik] First steps to package newer version
Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog 2008-03-31 20:45:45 UTC (rev 6049)
+++ trunk/batik/debian/changelog 2008-03-31 21:07:30 UTC (rev 6050)
@@ -1,9 +1,13 @@
-batik (1.6-5) UNRELEASED; urgency=low
+batik (1.7-1) UNRELEASED experimental; urgency=low
+ * DO NOT UPLOAD YET, FAR FROM READY ! (upload to experimental first)
+ * New upstream release
* Switched to using java-wrappers for executables; dropping the
/usr/lib/java/wrappers.sh script
+ * Switched debian/copyright to a machine-readable format
+ * Added ANT_OPTS to fix the compiler out of memory problem
- -- Vincent Fourmond <fourmond at debian.org> Sat, 29 Mar 2008 00:08:34 +0100
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 31 Mar 2008 23:00:48 +0200
batik (1.6-4) unstable; urgency=low
Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control 2008-03-31 20:45:45 UTC (rev 6049)
+++ trunk/batik/debian/control 2008-03-31 21:07:30 UTC (rev 6050)
@@ -6,12 +6,17 @@
Vincent Fourmond <fourmond at debian.org>
Standards-Version: 3.7.3
Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: sun-j2sdk1.4 | java2-compiler, ant, libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java
+Build-Depends-Indep: sun-java5-jdk | sun-java6-jdk | java2-compiler, ant,
+ libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0-1),
+ libcommons-io-java, libcommons-logging-java
+Homepage: http://xml.apache.org/batik/
+
Package: libbatik-java
Section: contrib/libs
Architecture: all
-Depends: sun-j2re1.4 | java2-runtime, libxalan2-java, libbsf-java,
+Depends: sun-java5-jre | sun-java6-jre | sun-j2re1.4 | java2-runtime,
+ libxalan2-java, libbsf-java,
libavalon-framework-java (>= 4.2.0-1), libcommons-io-java,
libcommons-logging-java, java-wrappers (>= 0.1.4)
Suggests: rhino
Modified: trunk/batik/debian/copyright
===================================================================
--- trunk/batik/debian/copyright 2008-03-31 20:45:45 UTC (rev 6049)
+++ trunk/batik/debian/copyright 2008-03-31 21:07:30 UTC (rev 6050)
@@ -3,7 +3,13 @@
It was downloaded from <http://xml.apache.org/batik>.
+Files: debian/*
+Copyright: 2002-2008 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+License: Apache-2.0
+Files: *
+Copyright: Apache Foundation
+License: Apache-2.0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Added: trunk/batik/debian/new-upstream
===================================================================
--- trunk/batik/debian/new-upstream (rev 0)
+++ trunk/batik/debian/new-upstream 2008-03-31 21:07:30 UTC (rev 6050)
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# new-upstream: copyright 2008 by Vincent Fourmond.
+# Repackage a zip into a .tar.gz archive
+#
+# Called by uscan; from uscan(1):
+#
+# Finally, if a third parameter (an action) is given in the watchfile
+# line, this is taken as the name of a command, and the command
+# command --upstream-version version filename
+#
+# is executed, using either the original file or the symlink name.
+#
+# Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
+#
+
+version=$2
+filename=$3
+
+dir=`mktemp -d`
+
+# We repackage the upstream source zip file:
+unzip $filename -d $dir
+origname=batik_$version.orig.tar.gz
+
+# We repackage excluding the lib/ subdir
+cd $dir
+tar cvz \
+ -f $origname bat*
+cd -
+mv $dir/$origname ..
+rm -rf $dir
\ No newline at end of file
Property changes on: trunk/batik/debian/new-upstream
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/batik/debian/patches/02_fix_jar_target.patch
===================================================================
--- trunk/batik/debian/patches/02_fix_jar_target.patch 2008-03-31 20:45:45 UTC (rev 6049)
+++ trunk/batik/debian/patches/02_fix_jar_target.patch 2008-03-31 21:07:30 UTC (rev 6050)
@@ -1,17 +0,0 @@
---- build.xml.orig 2005-10-16 14:52:19.000000000 +0200
-+++ build.xml 2005-10-20 17:23:27.000000000 +0200
-@@ -488,10 +488,10 @@
- <jar jarfile="${build}/lib/${project}-libs.jar">
- <fileset dir="${dest}" excludes="**/CVS">
- <include name="org/apache/batik/**"/>
-- <include name="org/w3c/css/sac/**"/>
-- <include name="org/w3c/dom/smil/**"/>
-- <include name="org/w3c/dom/svg/**"/>
-- <include name="org/w3c/dom/svg12/**"/>
-+ <exclude name="org/w3c/css/sac/**"/>
-+ <exclude name="org/w3c/dom/smil/**"/>
-+ <exclude name="org/w3c/dom/svg/**"/>
-+ <exclude name="org/w3c/dom/svg12/**"/>
- </fileset>
- <fileset dir="${resources}" excludes="${resources}/**/CVS">
- <include name="**"/>
Modified: trunk/batik/debian/rules
===================================================================
--- trunk/batik/debian/rules 2008-03-31 20:45:45 UTC (rev 6049)
+++ trunk/batik/debian/rules 2008-03-31 21:07:30 UTC (rev 6050)
@@ -12,32 +12,24 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME_DIRS := /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/local/IBMJava2-ppc-142 /usr/lib/jvm/java-6-sun/
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bfs gnujaxp js xalan2
DEB_ANT_COMPILER := modern
-DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder
+DEB_ANT_BUILD_TARGET := all-jar
DEB_BUILDDIR := .
DEB_ANT_BUILDFILE := build.xml
DEB_ANT_CLEAN_TARGET := clean
+# Increasing the
+ANT_OPTS := -Xms256m -Xmx256m
+
LIBRARY=batik
-VERSION=1.6
+VERSION=1.7
-clean::
- rm -Rf pdf-transcoder/build
-
install/libbatik-java::
- install -m 644 batik-1.6/lib/batik-libs.jar debian/libbatik-java/usr/share/java/batik-libs-$(VERSION).jar
- install -m 644 batik-1.6/lib/batik-ext.jar debian/libbatik-java/usr/share/java/batik-ext-$(VERSION).jar
- install -m 644 batik-1.6/lib/batik-all.jar debian/libbatik-java/usr/share/java/batik-all-$(VERSION).jar
- install -m 644 pdf-transcoder/build/fop-transcoder.jar debian/libbatik-java/usr/share/java/fop-transcoder-$(VERSION).jar
- ln -s batik-libs-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-libs.jar
- ln -s batik-ext-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-ext.jar
- ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-all.jar
- ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik.jar
+ install -m 644 batik-1.7/lib/batik-all.jar debian/libbatik-java/usr/share/java/batik-all-$(VERSION).jar
ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-$(VERSION).jar
- ln -s fop-transcoder-$(VERSION).jar debian/libbatik-java/usr/share/java/fop-transcoder.jar
# Install wrapper scripts
install -d debian/libbatik-java/usr/bin
Modified: trunk/batik/debian/watch
===================================================================
--- trunk/batik/debian/watch 2008-03-31 20:45:45 UTC (rev 6049)
+++ trunk/batik/debian/watch 2008-03-31 21:07:30 UTC (rev 6050)
@@ -1,2 +1,2 @@
version=3
-http://archive.apache.org/dist/xmlgraphics/batik/ batik-([0123456789.]*).zip
+http://archive.apache.org/dist/xmlgraphics/batik/ batik-src-([0123456789.]*).zip debian debian/new-upstream
More information about the pkg-java-commits
mailing list