Wed Mar 28 12:08:09 BST 2018

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jexcelapi.

commit a879f225616af9413c9dc05d66252566c8294745
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Nov 12 23:42:06 2009 +0000

    * 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
---
 debian/README.source             |  9 +++++++++
 debian/changelog                 | 26 ++++++++++++++++++++++++--
 debian/compat                    |  2 +-
 debian/control                   | 12 ++++++------
 debian/copyright                 |  5 ++++-
 debian/install                   |  2 --
 debian/libjexcelapi-java.poms    |  1 +
 debian/orig-tar.sh               |  2 +-
 debian/patches/series            |  1 +
 debian/patches/system_jflex.diff | 15 +++++++++++++++
 debian/pom.xml                   | 17 +++++++++++++++++
 debian/rules                     | 21 ++++++++++++++++++---
 12 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..f846ea2
--- /dev/null
+++ b/debian/README.source
@@ -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.
+
diff --git a/debian/changelog b/debian/changelog
index de37612..f960b84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,31 @@
-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 <thierry.carrez at ubuntu.com>  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 <drazzib at debian.org>  Fri, 13 Nov 2009 00:38:13 +0100
 
 jexcelapi (2.6.10-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 7c38b44..cf56043 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,17 @@ Source: jexcelapi
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk
+Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+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
diff --git a/debian/copyright b/debian/copyright
index d33795f..9ee725d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,10 @@ Name: A Java library for reading/writing Excel
 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/*
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 548727e..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-jxl.jar /usr/share/java/
-
diff --git a/debian/libjexcelapi-java.poms b/debian/libjexcelapi-java.poms
new file mode 100644
index 0000000..1a7e280
--- /dev/null
+++ b/debian/libjexcelapi-java.poms
@@ -0,0 +1 @@
+debian/pom.xml
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 1fc8040..6c46b96 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -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
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9720615
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+system_jflex.diff
diff --git a/debian/patches/system_jflex.diff b/debian/patches/system_jflex.diff
new file mode 100644
index 0000000..24cf7fb
--- /dev/null
+++ b/debian/patches/system_jflex.diff
@@ -0,0 +1,15 @@
+Description: Use system JFlex in /usr/share/java/JFlex.jar
+Author: Damien Raude-Morvan <drazzib at debian.org>
+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>
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..1512764
--- /dev/null
+++ b/debian/pom.xml
@@ -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>
diff --git a/debian/rules b/debian/rules
index 6e02d67..98fb28e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jexcelapi.git

