[pkg-java] r14807 - in trunk/mondrian/debian: . patches source

Damien Raude-Morvan drazzib at alioth.debian.org
Sun Sep 11 00:14:03 UTC 2011 

Author: drazzib
Date: 2011-09-11 00:14:03 +0000 (Sun, 11 Sep 2011)
New Revision: 14807

Added:
   trunk/mondrian/debian/patches/commons-vfs2.diff
   trunk/mondrian/debian/source/
   trunk/mondrian/debian/source/format
Modified:
   trunk/mondrian/debian/changelog
   trunk/mondrian/debian/control
   trunk/mondrian/debian/patches/03_classpath.diff
   trunk/mondrian/debian/patches/series
   trunk/mondrian/debian/rules
Log:
* d/control: Drop Depends on default-jre per Debian Java Policy as its
  a library package.
* Fix for commons-vfs2.
* Switch to 3.0 (quilt) format.
* Bump to Standards-Version to 3.9.2.

Modified: trunk/mondrian/debian/changelog
===================================================================
--- trunk/mondrian/debian/changelog	2011-09-11 00:11:39 UTC (rev 14806)
+++ trunk/mondrian/debian/changelog	2011-09-11 00:14:03 UTC (rev 14807)
@@ -1,3 +1,13 @@
+mondrian (4.0.0~svn13109-2) unstable; urgency=low
+
+  * d/control: Drop Depends on default-jre per Debian Java Policy as its
+    a library package.
+  * Fix for commons-vfs2.
+  * Switch to 3.0 (quilt) format.
+  * Bump to Standards-Version to 3.9.2.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 11 Sep 2011 01:55:25 +0200
+
 mondrian (4.0.0~svn13109-1) unstable; urgency=low
 
   * Initial release. (Closes: #560235)

Modified: trunk/mondrian/debian/control
===================================================================
--- trunk/mondrian/debian/control	2011-09-11 00:11:39 UTC (rev 14806)
+++ trunk/mondrian/debian/control	2011-09-11 00:14:03 UTC (rev 14807)
@@ -4,20 +4,20 @@
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt
 Build-Depends-Indep: cup (>= 0.11a+20060608), libeigenbase-resgen-java,
- liblog4j1.2-java, libcommons-vfs-java, libcommons-dbcp-java,
+ liblog4j1.2-java, libcommons-vfs-java (>= 2.0), libcommons-dbcp-java,
  libcommons-math-java, libcommons-collections3-java, libcommons-logging-java,
  libolap4j-java, libxerces2-java, libservlet2.5-java, libeigenbase-farrago-java,
  libjaxp1.3-java, libxalan2-java, junit, libxmlunit-java, default-jdk-doc,
  junit-doc, libolap4j-java-doc, libeigenbase-resgen-java-doc,
  libservlet2.5-java-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mondrian
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mondrian
 Homepage: http://mondrian.pentaho.org/
 
 Package: libmondrian-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless
+Depends: ${misc:Depends}
 Description: OLAP server written in Java
  Mondrian is an OLAP server written in Java. It enables to interactively
  analyze very large datasets stored in SQL databases without writing SQL.

Modified: trunk/mondrian/debian/patches/03_classpath.diff
===================================================================
--- trunk/mondrian/debian/patches/03_classpath.diff	2011-09-11 00:11:39 UTC (rev 14806)
+++ trunk/mondrian/debian/patches/03_classpath.diff	2011-09-11 00:14:03 UTC (rev 14807)
@@ -2,6 +2,8 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2009-12-13
 Forwarded: not-needed
+Index: b/build.xml
+===================================================================
 --- a/build.xml
 +++ b/build.xml
 @@ -152,25 +152,22 @@
@@ -34,7 +36,7 @@
 +    <pathelement location="/usr/share/java/commons-logging.jar"/>
 +    <pathelement location="/usr/share/java/commons-math.jar"/>
 +    <pathelement location="/usr/share/java/commons-pool.jar"/>
-+    <pathelement location="/usr/share/java/commons-vfs.jar"/>
++    <pathelement location="/usr/share/java/commons-vfs2.jar"/>
 +    <pathelement location="/usr/share/java/eigenbase-properties.jar"/>
 +    <pathelement location="/usr/share/java/eigenbase-resgen.jar"/>
 +    <pathelement location="/usr/share/java/eigenbase-xom.jar"/>

Added: trunk/mondrian/debian/patches/commons-vfs2.diff
===================================================================
--- trunk/mondrian/debian/patches/commons-vfs2.diff	                        (rev 0)
+++ trunk/mondrian/debian/patches/commons-vfs2.diff	2011-09-11 00:14:03 UTC (rev 14807)
@@ -0,0 +1,48 @@
+Description: Fix build with commons vfs 2.0
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-11
+Forwarded: no
+
+Index: b/src/main/mondrian/olap/Util.java
+===================================================================
+--- a/src/main/mondrian/olap/Util.java
++++ b/src/main/mondrian/olap/Util.java
+@@ -13,8 +13,8 @@
+ 
+ package mondrian.olap;
+ 
+-import org.apache.commons.vfs.*;
+-import org.apache.commons.vfs.provider.http.HttpFileObject;
++import org.apache.commons.vfs2.*;
++import org.apache.commons.vfs2.provider.http.HttpFileObject;
+ import org.apache.log4j.Logger;
+ import org.eigenbase.xom.XOMUtil;
+ 
+Index: b/src/main/mondrian/rolap/RolapSchema.java
+===================================================================
+--- a/src/main/mondrian/rolap/RolapSchema.java
++++ b/src/main/mondrian/rolap/RolapSchema.java
+@@ -55,7 +55,7 @@
+ import mondrian.spi.*;
+ 
+ import org.apache.log4j.Logger;
+-import org.apache.commons.vfs.*;
++import org.apache.commons.vfs2.*;
+ 
+ import org.eigenbase.xom.*;
+ 
+Index: b/src/main/mondrian/spi/impl/FilterDynamicSchemaProcessor.java
+===================================================================
+--- a/src/main/mondrian/spi/impl/FilterDynamicSchemaProcessor.java
++++ b/src/main/mondrian/spi/impl/FilterDynamicSchemaProcessor.java
+@@ -11,8 +11,8 @@
+ 
+ import mondrian.spi.DynamicSchemaProcessor;
+ import mondrian.olap.Util;
+-import org.apache.commons.vfs.FileObject;
+-import org.apache.commons.vfs.FileContent;
++import org.apache.commons.vfs2.FileObject;
++import org.apache.commons.vfs2.FileContent;
+ 
+ import java.io.File;
+ import java.io.InputStream;

Modified: trunk/mondrian/debian/patches/series
===================================================================
--- trunk/mondrian/debian/patches/series	2011-09-11 00:11:39 UTC (rev 14806)
+++ trunk/mondrian/debian/patches/series	2011-09-11 00:14:03 UTC (rev 14807)
@@ -5,3 +5,4 @@
 05_servlet_api_25.diff
 06_build_with_openjdk.diff
 07_javadoc_links.diff
+commons-vfs2.diff

Modified: trunk/mondrian/debian/rules
===================================================================
--- trunk/mondrian/debian/rules	2011-09-11 00:11:39 UTC (rev 14806)
+++ trunk/mondrian/debian/rules	2011-09-11 00:14:03 UTC (rev 14807)
@@ -1,7 +1,6 @@
 #!/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
 
 JAVA_HOME            := /usr/lib/jvm/default-java

Added: trunk/mondrian/debian/source/format
===================================================================
--- trunk/mondrian/debian/source/format	                        (rev 0)
+++ trunk/mondrian/debian/source/format	2011-09-11 00:14:03 UTC (rev 14807)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list