[Pkg-octave-commit] [SCM] Debian packaging for octave-java branch, master, updated. debian/1.2.8-6-9-g9b6cf84

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 80594d30ce2aa1c9139105f8d61cb3ad63c7b31b
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Apr 17 12:15:11 2013 +0200

    Remove patches applied upstream
    
     + enable_preset_java_arch_value
     + restore-locale.patch

diff --git a/debian/patches/enable_preset_java_arch_value b/debian/patches/enable_preset_java_arch_value
deleted file mode 100644
index aaf10fa..0000000
--- a/debian/patches/enable_preset_java_arch_value
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Use a previously set value of JAVA_ARCH
- The patch looks larger than it is due to indenting. It just closes an "if" earlier.
-Author: Thomas Weber <tweber at debian.org>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/681355
-Forwarded: http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/extra/java/src/configure.base?revision=10762&view=markup
-Applied-Upstream: rev 10762
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/configure
-+++ b/src/configure
-@@ -3302,18 +3302,18 @@
-           elif test -d "${JAVA_HOME}/jre/lib/solarisv9"; then
-             JAVA_ARCH="solarisv9"
-           fi
--          if test -n "$JAVA_ARCH"; then
--            HAVE_JAVA=yes
--            case "$canonical_host_type" in
--              *-mingw* | *-cygwin*)
--                JAVA_LIBS=-ladvapi32
--                JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
--                ;;
--              *)
--                JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
--                ;;
--            esac
--          fi
-+        fi
-+	if test -n "$JAVA_ARCH"; then
-+          HAVE_JAVA=yes
-+          case "$canonical_host_type" in
-+            *-mingw* | *-cygwin*)
-+              JAVA_LIBS=-ladvapi32
-+              JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
-+              ;;
-+            *)
-+              JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
-+              ;;
-+          esac
-         fi
-         ;;
-     esac
diff --git a/debian/patches/restore-locale.patch b/debian/patches/restore-locale.patch
deleted file mode 100644
index eb0dc3d..0000000
--- a/debian/patches/restore-locale.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Restore the locale after initializing the JVM
- OpenJDK 7 messes up the locale settings (and LC_NUMERIC in particular), so
- Octave is no longer able to read a decimal number in locales for which the
- decimal separator is a comma instead of a point.
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676800
-Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29511969
-Last-Update: 2012-07-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/__java__.cc
-+++ b/src/__java__.cc
-@@ -34,6 +34,8 @@
- #include <iostream>
- #include <fstream>
- 
-+#include <clocale>
-+
- typedef jint (JNICALL *JNI_CreateJavaVM_t) (JavaVM **pvm, JNIEnv **penv, void *args);
- typedef jint (JNICALL *JNI_GetCreatedJavaVMs_t) (JavaVM **pvm, jsize bufLen, jsize *nVMs);
- 
-@@ -385,6 +387,9 @@
- 
-   if (jvm) return;
- 
-+  const char *static_locale = setlocale(LC_ALL, NULL);
-+  const std::string locale(static_locale);
-+
- #if defined (__WIN32__)
- 
-   HMODULE hMod = GetModuleHandle("jvm.dll");
-@@ -534,6 +539,8 @@
-   }
- 
- #endif
-+
-+  setlocale(LC_ALL, locale.c_str());
- }
- 
- static void terminate_jvm(void)
diff --git a/debian/patches/series b/debian/patches/series
index 0b37f54..53487d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-enable_preset_java_arch_value
 libjvm.patch
-restore-locale.patch

-- 
Debian packaging for octave-java