Author: drazzib
Date: 2009-11-12 23:42:06 +0000 (Thu, 12 Nov 2009)
New Revision: 11057
Added:
trunk/jexcelapi/debian/README.source
trunk/jexcelapi/debian/libjexcelapi-java.poms
trunk/jexcelapi/debian/patches/
trunk/jexcelapi/debian/patches/series
trunk/jexcelapi/debian/patches/system_jflex.diff
trunk/jexcelapi/debian/pom.xml
Removed:
trunk/jexcelapi/debian/install
Modified:
trunk/jexcelapi/debian/changelog
trunk/jexcelapi/debian/compat
trunk/jexcelapi/debian/control
trunk/jexcelapi/debian/copyright
trunk/jexcelapi/debian/orig-tar.sh
trunk/jexcelapi/debian/rules
Log:
* New upstream release.
* debian/control:
- Add myself as Uploaders
- Bump debhelper version to >= 7
- Remove unneeded ${shlibs:Depends} from Depends
* debian/copyright:
- Update Copyright years
* Maven POMs:
- debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
- debian/rules: use mh_installpoms and mh_installjar
to install the POM and the jar to the Maven repository
- debian/pom.xml: Debian pom.xml file as upstream doesn't provide one
- debian/rules: new get-orig-pom to update debian/pom.xml at new upstream
release.
* Use JFlex to rebuild lexer:
- Add Build-Depends-Indep on jflex
- Add new patch to use system installed flex
- Add Build-Depends on quilt
- Describe patch system in debian/README.source
Added: trunk/jexcelapi/debian/README.source
===================================================================
--- trunk/jexcelapi/debian/README.source (rev 0)
+++ trunk/jexcelapi/debian/README.source 2009-11-12 23:42:06 UTC (rev
11057)
@@ -0,0 +1,9 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
Modified: trunk/jexcelapi/debian/changelog
===================================================================
--- trunk/jexcelapi/debian/changelog 2009-11-12 11:14:45 UTC (rev 11056)
+++ trunk/jexcelapi/debian/changelog 2009-11-12 23:42:06 UTC (rev 11057)
@@ -1,10 +1,32 @@
-jexcelapi (2.6.10-3) UNRELEASED; urgency=low
+jexcelapi (2.6.12-1) UNRELEASED; urgency=low
+ [ Thierry Carrez ]
* debian/control: Minimal dependency on java2-runtime-headless
* debian/ant.properties: Build java2 code to match minimal dependency
- -- Thierry Carrez <[email protected]> Wed, 11 Nov 2009 11:29:47 +0100
+ [ Damien Raude-Morvan ]
+ * New upstream release.
+ * debian/control:
+ - Add myself as Uploaders
+ - Bump debhelper version to >= 7
+ - Remove unneeded ${shlibs:Depends} from Depends
+ * debian/copyright:
+ - Update Copyright years
+ * Maven POMs:
+ - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
+ - debian/rules: use mh_installpoms and mh_installjar
+ to install the POM and the jar to the Maven repository
+ - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one
+ - debian/rules: new get-orig-pom to update debian/pom.xml at new upstream
+ release.
+ * Use JFlex to rebuild lexer:
+ - Add Build-Depends-Indep on jflex
+ - Add new patch to use system installed flex
+ - Add Build-Depends on quilt
+ - Describe patch system in debian/README.source
+ -- Damien Raude-Morvan <[email protected]> Fri, 13 Nov 2009 00:38:13 +0100
+
jexcelapi (2.6.10-2) unstable; urgency=low
* Switch to default-java.
Modified: trunk/jexcelapi/debian/compat
===================================================================
--- trunk/jexcelapi/debian/compat 2009-11-12 11:14:45 UTC (rev 11056)
+++ trunk/jexcelapi/debian/compat 2009-11-12 23:42:06 UTC (rev 11057)
@@ -1 +1 @@
-5
+7
Modified: trunk/jexcelapi/debian/control
===================================================================
--- trunk/jexcelapi/debian/control 2009-11-12 11:14:45 UTC (rev 11056)
+++ trunk/jexcelapi/debian/control 2009-11-12 23:42:06 UTC (rev 11057)
@@ -2,17 +2,17 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Torsten Werner <[email protected]>
-Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk
+Uploaders: Torsten Werner <[email protected]>, Damien Raude-Morvan
<[email protected]>
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, quilt
+Build-Depends-Indep: jflex, maven-repo-helper
Standards-Version: 3.8.3
-Homepage: http://jexcelapi.sourceforge.net
+Homepage: http://jexcelapi.sourceforge.net/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jexcelapi/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jexcelapi
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jexcelapi/
Package: libjexcelapi-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless |
java2-runtime-headless
-Suggests: java-virtual-machine
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
Description: Java API to read, write and modify Excel spreadsheets
The Java Excel API is an open source Java API which allows Java developers to
read Excel spreadsheets and to generate Excel spreadsheets dynamically. In
Modified: trunk/jexcelapi/debian/copyright
===================================================================
--- trunk/jexcelapi/debian/copyright 2009-11-12 11:14:45 UTC (rev 11056)
+++ trunk/jexcelapi/debian/copyright 2009-11-12 23:42:06 UTC (rev 11057)
@@ -3,7 +3,10 @@
Maintainer: Eric H. Jung
Source: http://sourceforge.net/projects/jexcelapi/
-Copyright: 2002-2007, Andy Khan
+Copyright: 2002-2009, Andy Khan
+Copyright: 2002 Eric Jung
+Copyright: 2003 Adam Caldwell
+Copyright: 2004 Al Mantei
License: LGPL-2.1+
Files: debian/*
Deleted: trunk/jexcelapi/debian/install
===================================================================
--- trunk/jexcelapi/debian/install 2009-11-12 11:14:45 UTC (rev 11056)
+++ trunk/jexcelapi/debian/install 2009-11-12 23:42:06 UTC (rev 11057)
@@ -1,2 +0,0 @@
-jxl.jar /usr/share/java/
-
Added: trunk/jexcelapi/debian/libjexcelapi-java.poms
===================================================================
--- trunk/jexcelapi/debian/libjexcelapi-java.poms
(rev 0)
+++ trunk/jexcelapi/debian/libjexcelapi-java.poms 2009-11-12 23:42:06 UTC
(rev 11057)
@@ -0,0 +1 @@
+debian/pom.xml
Modified: trunk/jexcelapi/debian/orig-tar.sh
===================================================================
--- trunk/jexcelapi/debian/orig-tar.sh 2009-11-12 11:14:45 UTC (rev 11056)
+++ trunk/jexcelapi/debian/orig-tar.sh 2009-11-12 23:42:06 UTC (rev 11057)
@@ -3,7 +3,7 @@
# called by uscan with '--upstream-version' <version> <file>
# clean up the upstream tarball
-tar -x -z -f $3 --exclude '*.jar' --exclude '*/jlex/*'
+tar -x -z -f $3 --exclude '*.jar' --exclude '*/jlex/*' --exclude '*/docs/*'
tar -c -z -f $3 jexcelapi
rm -rf jexcelapi
Added: trunk/jexcelapi/debian/patches/series
===================================================================
--- trunk/jexcelapi/debian/patches/series (rev 0)
+++ trunk/jexcelapi/debian/patches/series 2009-11-12 23:42:06 UTC (rev
11057)
@@ -0,0 +1 @@
+system_jflex.diff
Added: trunk/jexcelapi/debian/patches/system_jflex.diff
===================================================================
--- trunk/jexcelapi/debian/patches/system_jflex.diff
(rev 0)
+++ trunk/jexcelapi/debian/patches/system_jflex.diff 2009-11-12 23:42:06 UTC
(rev 11057)
@@ -0,0 +1,15 @@
+Description: Use system JFlex in /usr/share/java/JFlex.jar
+Author: Damien Raude-Morvan <[email protected]>
+Last-Update: 2009-11-13
+Forwarded: not-needed
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -39,7 +39,7 @@
+ <arg value="--jlex" />
+ <arg value="--nobak" />
+ <arg value="${jflexfile}" />
+- <classpath path="JFlex.jar" />
++ <classpath path="/usr/share/java/JFlex.jar" />
+ </java>
+ <copy file="Yylex.java" tofile="${genlextargetfile}" />
+ </target>
Added: trunk/jexcelapi/debian/pom.xml
===================================================================
--- trunk/jexcelapi/debian/pom.xml (rev 0)
+++ trunk/jexcelapi/debian/pom.xml 2009-11-12 23:42:06 UTC (rev 11057)
@@ -0,0 +1,17 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.6.12</version>
+ <packaging>jar</packaging>
+ <name>Java Excel API</name>
+ <url>http://jexcelapi.sourceforge.net/</url>
+ <description>Java Excel API - A Java API to read, write, and modify Excel
spreadsheets</description>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/copyleft/lesser.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
Modified: trunk/jexcelapi/debian/rules
===================================================================
--- trunk/jexcelapi/debian/rules 2009-11-12 11:14:45 UTC (rev 11056)
+++ trunk/jexcelapi/debian/rules 2009-11-12 23:42:06 UTC (rev 11057)
@@ -1,13 +1,28 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
+POM_VERSION := 2.6
+MAVEN_REPO :=
http://repository.sonatype.org/service/local/repositories/central/content
+
DEB_BUILDDIR := build
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jxl docs
-DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := jxlall
+DEB_ANT_CLEAN_TARGET := init clean
+
+binary-post-install/libjexcelapi-java::
+ mh_installpoms -plibjexcelapi-java
+ mh_installjar -plibjexcelapi-java -l debian/pom.xml jxl.jar
+
+clean::
+ -rm -rf debian/tmp
+
get-orig-source:
- uscan --upstream-version 0
+ uscan --upstream-version 0 --rename
+get-orig-pom:
+ wget -O debian/pom.xml
$(MAVEN_REPO)/net/sourceforge/jexcelapi/jxl/$(POM_VERSION)/jxl-$(POM_VERSION).pom
+ perl -p -i -e
's/<version>$(POM_VERSION)/<version>$(DEB_UPSTREAM_VERSION)/' debian/pom.xml
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
