[pkg-java] r17097 - in trunk/olap4j/debian: . patches

[Sylvestre Ledru]

Author: sylvestre
Date: 2013-07-30 08:03:47 +0000 (Tue, 30 Jul 2013)
New Revision: 17097

Added:
   trunk/olap4j/debian/patches/06_compatible_with_java7_encoding.diff
Modified:
   trunk/olap4j/debian/changelog
   trunk/olap4j/debian/control
   trunk/olap4j/debian/patches/series
Log:
* 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

Modified: trunk/olap4j/debian/changelog
===================================================================
--- trunk/olap4j/debian/changelog	2013-07-30 04:57:24 UTC (rev 17096)
+++ trunk/olap4j/debian/changelog	2013-07-30 08:03:47 UTC (rev 17097)
@@ -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:

Modified: trunk/olap4j/debian/control
===================================================================
--- trunk/olap4j/debian/control	2013-07-30 04:57:24 UTC (rev 17096)
+++ trunk/olap4j/debian/control	2013-07-30 08:03:47 UTC (rev 17097)
@@ -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 @@
                      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/

Added: trunk/olap4j/debian/patches/06_compatible_with_java7_encoding.diff
===================================================================
--- trunk/olap4j/debian/patches/06_compatible_with_java7_encoding.diff	                        (rev 0)
+++ trunk/olap4j/debian/patches/06_compatible_with_java7_encoding.diff	2013-07-30 08:03:47 UTC (rev 17097)
@@ -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

Modified: trunk/olap4j/debian/patches/series
===================================================================
--- trunk/olap4j/debian/patches/series	2013-07-30 04:57:24 UTC (rev 17096)
+++ trunk/olap4j/debian/patches/series	2013-07-30 08:03:47 UTC (rev 17097)
@@ -3,3 +3,4 @@
 03_use_debian_cup11a.diff
 04_disable_hsql_test_data.diff
 javadoc_links.diff
+06_compatible_with_java7_encoding.diff