This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mondrian.
commit e6686f1ce46af6d2d0c8b3e23ee411d386b0dc64 Author: Damien Raude-Morvan <draz...@debian.org> Date: Sun Sep 11 00:14:03 2011 +0000 * 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. --- debian/changelog | 10 +++++++++ debian/control | 6 ++--- debian/patches/03_classpath.diff | 4 +++- debian/patches/commons-vfs2.diff | 48 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 - debian/source/format | 1 + 7 files changed, 66 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 836a969..76f84d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <draz...@debian.org> Sun, 11 Sep 2011 01:55:25 +0200 + mondrian (4.0.0~svn13109-1) unstable; urgency=low * Initial release. (Closes: #560235) diff --git a/debian/control b/debian/control index c0766ff..aa969a3 100644 --- a/debian/control +++ b/debian/control @@ -4,20 +4,20 @@ Priority: optional Maintainer: Damien Raude-Morvan <draz...@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. diff --git a/debian/patches/03_classpath.diff b/debian/patches/03_classpath.diff index 4afad9e..c8a7445 100644 --- a/debian/patches/03_classpath.diff +++ b/debian/patches/03_classpath.diff @@ -2,6 +2,8 @@ Description: build.xml: use homemade classpath Author: Damien Raude-Morvan <draz...@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 @@ Forwarded: not-needed + <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"/> diff --git a/debian/patches/commons-vfs2.diff b/debian/patches/commons-vfs2.diff new file mode 100644 index 0000000..70ae468 --- /dev/null +++ b/debian/patches/commons-vfs2.diff @@ -0,0 +1,48 @@ +Description: Fix build with commons vfs 2.0 +Author: Damien Raude-Morvan <draz...@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; diff --git a/debian/patches/series b/debian/patches/series index dd26059..cd30839 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 05_servlet_api_25.diff 06_build_with_openjdk.diff 07_javadoc_links.diff +commons-vfs2.diff diff --git a/debian/rules b/debian/rules index 9dbcbf7..1bcd9db 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mondrian.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits