This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.3 in repository libreoffice.
commit 704b702513be70906e0c2c4eabe1045b9bb645eb Author: Rene Engelhard <r...@debian.org> Date: Sat Aug 20 12:32:06 2016 +0200 remove gcj-* from debian/patches, now not needed anymore --- patches/gcj-no-bitness-check.diff | 18 ------------------ patches/gcj-safe-jni-h-include.diff | 23 ----------------------- patches/series | 2 -- 3 files changed, 43 deletions(-) diff --git a/patches/gcj-no-bitness-check.diff b/patches/gcj-no-bitness-check.diff deleted file mode 100644 index c80cf71..0000000 --- a/patches/gcj-no-bitness-check.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- a/configure.ac-old 2015-02-19 15:32:27.000000000 +0100 -+++ b/configure.ac 2015-02-19 15:38:58.709444812 +0100 -@@ -6670,6 +6670,7 @@ if test "$ENABLE_JAVA" != ""; then - fi - JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"` - elif test "$cross_compiling" != "yes"; then -+ if [ "$JAVAINTERPRETER" != "/usr/lib/jvm/java-gcj/bin/java" ]; then - case $CPUNAME in - AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64|GODSON64) - if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then -@@ -6684,6 +6685,7 @@ if test "$ENABLE_JAVA" != ""; then - fi - ;; - esac -+ fi - fi - fi - diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff deleted file mode 100644 index a875fb7..0000000 --- a/patches/gcj-safe-jni-h-include.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 053fc51..84b323c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7212,12 +7240,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -+ if test "$JDK" = "gcj"; then -+ JAVAINC="$JAVAINC -I`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`" -+ fi - ;; - - linux-gnu*) - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -+ if test "$JDK" = "gcj"; then -+ JAVAINC="$JAVAINC -I`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`" -+ fi - ;; - - mingw*) diff --git a/patches/series b/patches/series index b4b2b00..ea3366b 100644 --- a/patches/series +++ b/patches/series @@ -1,5 +1,4 @@ debian-opt.diff -gcj-safe-jni-h-include.diff jurt-soffice-location.diff split-evoab.diff debian-debug.diff @@ -25,7 +24,6 @@ lo-xlate-lang-update.diff build-connectivitytools.diff odk-no-dot.diff hppa-is-32bit.diff -gcj-no-bitness-check.diff rsc-no-error-about-unknown-switch.diff debian-branding.diff no-packagekit-per-default.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git