[olap4j] 06/19: * Team upload. * Compatible with java7: unmappable character for encoding ASCII (Closes: #717258) * Change the maintainer for the Java team. * Standards-Version updated to 3.9.4

[Emmanuel Bourg]

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

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

commit 936d29b04a23fb42c89709e2064d3c56bc171eca
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Tue Jul 30 08:03:47 2013 +0000

    * Team upload.
    * Compatible with java7: unmappable character for encoding ASCII
      (Closes: #717258)
    * Change the maintainer for the Java team.
    * Standards-Version updated to 3.9.4
---
 debian/changelog                                      | 12 ++++++++++++
 debian/control                                        |  5 +++--
 debian/patches/06_compatible_with_java7_encoding.diff | 12 ++++++++++++
 debian/patches/series                                 |  1 +
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3a9fbd..71509fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+olap4j (1.0.1.500-2) unstable; urgency=low
+
+  * Team upload.
+  * Compatible with java7: unmappable character for encoding ASCII
+    (Closes: #717258)
+
+  [ Sylvestre Ledru ]
+  * Change the maintainer for the Java team.
+  * Standards-Version updated to 3.9.4
+
+ -- ShuxiongYe <yeshuxiong at gmail.com>  Fri, 19 Jul 2013 03:39:47 +0800
+
 olap4j (1.0.1.500-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 59ef745..fb05e25 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: olap4j
 Section: java
 Priority: optional
-Maintainer: Damien Raude-Morvan <drazzib at debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk
 Build-Depends-Indep: ant-contrib,
                      ant-optional,
@@ -12,7 +13,7 @@ Build-Depends-Indep: ant-contrib,
                      libcommons-dbcp-java,
                      liblog4j1.2-java,
                      libxerces2-java
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/olap4j
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/olap4j
 Homepage: http://www.olap4j.org/
diff --git a/debian/patches/06_compatible_with_java7_encoding.diff b/debian/patches/06_compatible_with_java7_encoding.diff
new file mode 100644
index 0000000..c0e17f5
--- /dev/null
+++ b/debian/patches/06_compatible_with_java7_encoding.diff
@@ -0,0 +1,12 @@
+Index: olap4j-1.0.1.500/build.properties
+===================================================================
+--- olap4j-1.0.1.500.orig/build.properties	2012-02-06 22:05:46.000000000 +0800
++++ olap4j-1.0.1.500/build.properties	2013-07-19 03:44:29.274316512 +0800
+@@ -46,3 +46,7 @@
+ #ydoc.home=/usr/local/ydoc-3.0-jdk1.5
+ 
+ # End build.properties
++
++# Compatible with java7 encoding
++ant.build.javac.source=1.5
++ant.build.javac.target=1.5
diff --git a/debian/patches/series b/debian/patches/series
index 8203946..9db7f2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_use_debian_cup11a.diff
 04_disable_hsql_test_data.diff
 javadoc_links.diff
+06_compatible_with_java7_encoding.diff

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