[pkg-java] r11282 - in trunk/olap4j/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Dec 13 16:52:44 UTC 2009
Author: drazzib
Date: 2009-12-13 16:52:43 +0000 (Sun, 13 Dec 2009)
New Revision: 11282
Added:
trunk/olap4j/debian/libolap4j-java-doc.doc-base.api
trunk/olap4j/debian/libolap4j-java-doc.doc-base.spec
trunk/olap4j/debian/patches/javadoc_links.diff
Removed:
trunk/olap4j/debian/libolap4j-java-doc.doc-base
Modified:
trunk/olap4j/debian/changelog
trunk/olap4j/debian/control
trunk/olap4j/debian/copyright
trunk/olap4j/debian/libolap4j-java-doc.install
trunk/olap4j/debian/orig-tar.exclude
trunk/olap4j/debian/patches/01_disable_ivy.diff
trunk/olap4j/debian/patches/02_build_with_openjdk.diff
trunk/olap4j/debian/patches/03_use_debian_cup11a.diff
trunk/olap4j/debian/patches/04_disable_hsql_test_data.diff
trunk/olap4j/debian/patches/series
trunk/olap4j/debian/rules
Log:
Add: Javadoc links, reference documentation, copyright years
Modified: trunk/olap4j/debian/changelog
===================================================================
--- trunk/olap4j/debian/changelog 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/changelog 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1,5 +1,5 @@
-olap4j (0.9.8~svn293-1) UNRELEASED; urgency=low
+olap4j (0.9.8~svn293-1) unstable; urgency=low
* Initial release. (Closes: #560236)
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 10 Dec 2009 00:42:45 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 13 Dec 2009 17:51:53 +0100
Modified: trunk/olap4j/debian/control
===================================================================
--- trunk/olap4j/debian/control 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/control 2009-12-13 16:52:43 UTC (rev 11282)
@@ -5,7 +5,7 @@
Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt
Build-Depends-Indep: cup (>= 0.11a+20060608), liblog4j1.2-java,
libcommons-dbcp-java, libxerces2-java, junit, ant-optional,
- ant-contrib
+ ant-contrib, default-jdk-doc, junit-doc
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/olap4j
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/olap4j
@@ -30,6 +30,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends}
+Recommends: default-jdk-doc, junit-doc
Suggests: libolap4j-java
Description: unified Java API to access an OLAP server - documentation
olap4j is a Java library to access a OLAP server with an unified API :
Modified: trunk/olap4j/debian/copyright
===================================================================
--- trunk/olap4j/debian/copyright 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/copyright 2009-12-13 16:52:43 UTC (rev 11282)
@@ -5,7 +5,7 @@
Files: *
Copyright: Copyright (C) 1999-2002 Kana Software, Inc.
-Copyright: Copyright (C) 2002-2008 Julian Hyde and others
+Copyright: Copyright (C) 2002-2009 Julian Hyde and others
License: other
Eclipse Public License - v 1.0
Deleted: trunk/olap4j/debian/libolap4j-java-doc.doc-base
===================================================================
--- trunk/olap4j/debian/libolap4j-java-doc.doc-base 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/libolap4j-java-doc.doc-base 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1,9 +0,0 @@
-Document: libolap4j-java-doc
-Title: API Javadoc for olap4j
-Author: olap4j developers
-Abstract: This is the API Javadoc provided by the olap4j library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libolap4j-java/api/index.html
-Files: /usr/share/doc/libolap4j-java/api/*
Copied: trunk/olap4j/debian/libolap4j-java-doc.doc-base.api (from rev 11277, trunk/olap4j/debian/libolap4j-java-doc.doc-base)
===================================================================
--- trunk/olap4j/debian/libolap4j-java-doc.doc-base.api (rev 0)
+++ trunk/olap4j/debian/libolap4j-java-doc.doc-base.api 2009-12-13 16:52:43 UTC (rev 11282)
@@ -0,0 +1,9 @@
+Document: libolap4j-java-doc
+Title: API Javadoc for olap4j
+Author: olap4j developers
+Abstract: This is the API Javadoc provided by the olap4j library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libolap4j-java/api/index.html
+Files: /usr/share/doc/libolap4j-java/api/*
Copied: trunk/olap4j/debian/libolap4j-java-doc.doc-base.spec (from rev 11277, trunk/olap4j/debian/libolap4j-java-doc.doc-base)
===================================================================
--- trunk/olap4j/debian/libolap4j-java-doc.doc-base.spec (rev 0)
+++ trunk/olap4j/debian/libolap4j-java-doc.doc-base.spec 2009-12-13 16:52:43 UTC (rev 11282)
@@ -0,0 +1,9 @@
+Document: libolap4j-java-spec
+Title: OLAP4J Specification
+Author: olap4j developers
+Abstract: This is the specifications provided by the olap4j library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libolap4j-java/doc/olap4j_fs.html
+Files: /usr/share/doc/libolap4j-java/doc/*
Modified: trunk/olap4j/debian/libolap4j-java-doc.install
===================================================================
--- trunk/olap4j/debian/libolap4j-java-doc.install 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/libolap4j-java-doc.install 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1 +1,3 @@
bin/javadoc/* /usr/share/doc/libolap4j-java/api/
+doc/olap4j_fs.html /usr/share/doc/libolap4j-java/doc/
+doc/*.png /usr/share/doc/libolap4j-java/doc/
Modified: trunk/olap4j/debian/orig-tar.exclude
===================================================================
--- trunk/olap4j/debian/orig-tar.exclude 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/orig-tar.exclude 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1 +1,4 @@
foodmart/*
+*.pdf
+*.vsd
+*.xls
Modified: trunk/olap4j/debian/patches/01_disable_ivy.diff
===================================================================
--- trunk/olap4j/debian/patches/01_disable_ivy.diff 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/patches/01_disable_ivy.diff 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1,3 +1,7 @@
+Description: Disable ivy (i.e. don't download stuff from net during build)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -149,7 +149,7 @@
Modified: trunk/olap4j/debian/patches/02_build_with_openjdk.diff
===================================================================
--- trunk/olap4j/debian/patches/02_build_with_openjdk.diff 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/patches/02_build_with_openjdk.diff 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_build_with_openjdk.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml: Allow build with OpenJDK.
-
- at DPATCH@
+Description: build.xml: Allow build with OpenJDK.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -23,11 +23,6 @@
Modified: trunk/olap4j/debian/patches/03_use_debian_cup11a.diff
===================================================================
--- trunk/olap4j/debian/patches/03_use_debian_cup11a.diff 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/patches/03_use_debian_cup11a.diff 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_use_debian_cup11a.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build.xml:
-## DP: - CUP ant task had changed from java_cup.JavaCUPTask to java_cup.anttask.CUPTask
-## DP: - CUP ant task need more parameters: destdir, package and srcdir
-
-
- at DPATCH@
+Description: build.xml:
+ - CUP ant task had changed from java_cup.JavaCUPTask to java_cup.anttask.CUPTask
+ - CUP ant task need more parameters: destdir, package and srcdir
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: no
--- a/build.xml
+++ b/build.xml
@@ -140,12 +140,16 @@
Modified: trunk/olap4j/debian/patches/04_disable_hsql_test_data.diff
===================================================================
--- trunk/olap4j/debian/patches/04_disable_hsql_test_data.diff 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/patches/04_disable_hsql_test_data.diff 2009-12-13 16:52:43 UTC (rev 11282)
@@ -1,3 +1,7 @@
+Description: Removed foodmart database from tarball
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -153,7 +153,6 @@
Added: trunk/olap4j/debian/patches/javadoc_links.diff
===================================================================
--- trunk/olap4j/debian/patches/javadoc_links.diff (rev 0)
+++ trunk/olap4j/debian/patches/javadoc_links.diff 2009-12-13 16:52:43 UTC (rev 11282)
@@ -0,0 +1,37 @@
+Description: Fix link of Javadoc HTML documentation
+ to use local API from /usr/share/doc/
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: not-needed
+
+--- a/build.xml
++++ b/build.xml
+@@ -262,7 +262,7 @@
+ <tag name="pre" description="Pre-condition:" scope="constructors,methods" />
+ <tag name="post" description="Post-condition:" scope="constructors,methods" />
+ <tag name="testcase" description="Test-case:" scope="constructors,methods,types" />
+- <link href="http://java.sun.com/javase/6/docs/api/" />
++ <link href="/usr/share/doc/default-jdk-doc/api/" />
+ </javadoc>
+ </target>
+
+@@ -281,7 +281,7 @@
+ <tag name="pre" description="Pre-condition:" scope="constructors,methods" />
+ <tag name="post" description="Post-condition:" scope="constructors,methods" />
+ <tag name="testcase" description="Test-case:" scope="constructors,methods,types" />
+- <link href="http://java.sun.com/javase/6/docs/api/" />
++ <link href="/usr/share/doc/default-jdk-doc/api/" />
+ </javadoc>
+ </target>
+
+@@ -305,8 +305,8 @@
+ <tag name="pre" description="Pre-condition:" scope="constructors,methods" />
+ <tag name="post" description="Post-condition:" scope="constructors,methods" />
+ <tag name="testcase" description="Test-case:" scope="constructors,methods,types" />
+- <link href="http://java.sun.com/javase/6/docs/api/" />
+- <link href="http://www.junit.org/junit/javadoc/3.8/" />
++ <link href="/usr/share/doc/default-jdk-doc/api/" />
++ <link href="/usr/share/doc/junit-doc/doc/api/" />
+ <doclet name="ydoc.doclets.YStandard"
+ path="${ydoc.home}/lib/ydoc.jar${ps}${ydoc.home}/lib/class2svg.jar${ps}${ydoc.home}/resources${ps}${ydoc.home}/doc">
+ <param name="-author" />
Modified: trunk/olap4j/debian/patches/series
===================================================================
--- trunk/olap4j/debian/patches/series 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/patches/series 2009-12-13 16:52:43 UTC (rev 11282)
@@ -2,3 +2,4 @@
02_build_with_openjdk.diff
03_use_debian_cup11a.diff
04_disable_hsql_test_data.diff
+javadoc_links.diff
Modified: trunk/olap4j/debian/rules
===================================================================
--- trunk/olap4j/debian/rules 2009-12-13 16:31:07 UTC (rev 11281)
+++ trunk/olap4j/debian/rules 2009-12-13 16:52:43 UTC (rev 11282)
@@ -20,4 +20,3 @@
get-orig-source:
debian/orig-tar.sh --upstream-version $(DEB_UPSTREAM_VERSION)
- #uscan --force-download
More information about the pkg-java-commits
mailing list