[olap4j] 04/19: Add: Javadoc links, reference documentation, copyright years
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 21 09:19:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository olap4j.
commit ef6da1cd7111e5382d3603652c04b563a9d3953e
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sun Dec 13 16:52:43 2009 +0000
Add: Javadoc links, reference documentation, copyright years
---
debian/changelog | 4 +--
debian/control | 3 +-
debian/copyright | 2 +-
...oc.doc-base => libolap4j-java-doc.doc-base.api} | 0
debian/libolap4j-java-doc.doc-base.spec | 9 ++++++
debian/libolap4j-java-doc.install | 2 ++
debian/orig-tar.exclude | 3 ++
debian/patches/01_disable_ivy.diff | 4 +++
debian/patches/02_build_with_openjdk.diff | 11 +++----
debian/patches/03_use_debian_cup11a.diff | 16 ++++------
debian/patches/04_disable_hsql_test_data.diff | 4 +++
debian/patches/javadoc_links.diff | 37 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 -
14 files changed, 75 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 812ab59..4ee79a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 51284f3..e887d64 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Damien Raude-Morvan <drazzib at debian.org>
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 @@ Package: libolap4j-java-doc
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 :
diff --git a/debian/copyright b/debian/copyright
index 61c0e5a..20b167e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://www.olap4j.org/
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
diff --git a/debian/libolap4j-java-doc.doc-base b/debian/libolap4j-java-doc.doc-base.api
similarity index 100%
rename from debian/libolap4j-java-doc.doc-base
rename to debian/libolap4j-java-doc.doc-base.api
diff --git a/debian/libolap4j-java-doc.doc-base.spec b/debian/libolap4j-java-doc.doc-base.spec
new file mode 100644
index 0000000..7ad6545
--- /dev/null
+++ b/debian/libolap4j-java-doc.doc-base.spec
@@ -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/*
diff --git a/debian/libolap4j-java-doc.install b/debian/libolap4j-java-doc.install
index 41a555b..eceb32d 100644
--- a/debian/libolap4j-java-doc.install
+++ b/debian/libolap4j-java-doc.install
@@ -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/
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
index e1801bb..e36987c 100644
--- a/debian/orig-tar.exclude
+++ b/debian/orig-tar.exclude
@@ -1 +1,4 @@
foodmart/*
+*.pdf
+*.vsd
+*.xls
diff --git a/debian/patches/01_disable_ivy.diff b/debian/patches/01_disable_ivy.diff
index c1968c6..b48b34e 100644
--- a/debian/patches/01_disable_ivy.diff
+++ b/debian/patches/01_disable_ivy.diff
@@ -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 @@
diff --git a/debian/patches/02_build_with_openjdk.diff b/debian/patches/02_build_with_openjdk.diff
index f7f097b..d90ad76 100644
--- a/debian/patches/02_build_with_openjdk.diff
+++ b/debian/patches/02_build_with_openjdk.diff
@@ -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 @@
diff --git a/debian/patches/03_use_debian_cup11a.diff b/debian/patches/03_use_debian_cup11a.diff
index 6704a09..5b9d80f 100644
--- a/debian/patches/03_use_debian_cup11a.diff
+++ b/debian/patches/03_use_debian_cup11a.diff
@@ -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 @@
diff --git a/debian/patches/04_disable_hsql_test_data.diff b/debian/patches/04_disable_hsql_test_data.diff
index 7ebb5e3..7cddfff 100644
--- a/debian/patches/04_disable_hsql_test_data.diff
+++ b/debian/patches/04_disable_hsql_test_data.diff
@@ -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 @@
diff --git a/debian/patches/javadoc_links.diff b/debian/patches/javadoc_links.diff
new file mode 100644
index 0000000..abea196
--- /dev/null
+++ b/debian/patches/javadoc_links.diff
@@ -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" />
diff --git a/debian/patches/series b/debian/patches/series
index 043466e..8203946 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02_build_with_openjdk.diff
03_use_debian_cup11a.diff
04_disable_hsql_test_data.diff
+javadoc_links.diff
diff --git a/debian/rules b/debian/rules
index d9a4be9..2af50d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,4 +20,3 @@ install/libolap4j-java::
get-orig-source:
debian/orig-tar.sh --upstream-version $(DEB_UPSTREAM_VERSION)
- #uscan --force-download
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/olap4j.git
More information about the pkg-java-commits
mailing list