[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1_rc1-2-2-g84c4d41
The following commit has been merged in the debian-experimental-3.6 branch:
commit 55f5b7991cafccf34677f2a4f374db011b9329a9
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 20 18:31:45 2012 +0200
fix S390X CPUNAME
diff --git a/changelog b/changelog
index 082cffe..96fa2ee 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.6.1~rc1-3) UNRELEASED; urgency=low
+
+ * debian/patches/fix-S390X-CPUNAME.diff: add, as name says
+
+ -- Rene Engelhard <rene@debian.org> Mon, 20 Aug 2012 18:30:15 +0200
+
libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
* debian/rules:
diff --git a/patches/fix-S390X-CPUNAME.diff b/patches/fix-S390X-CPUNAME.diff
new file mode 100644
index 0000000..aba1521
--- /dev/null
+++ b/patches/fix-S390X-CPUNAME.diff
@@ -0,0 +1,25 @@
+From 8c482683edf6aee17d4718150158293461b88b3b Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl@redhat.com>
+Date: Mon, 20 Aug 2012 10:41:08 +0000
+Subject: configure: fix S390X CPUNAME:
+
+The value was changed to S390x, presumably by accident, breaking the
+build (regression from 480b32d3809830002ecc28508d40af3ecd4ad272).
+
+Change-Id: Icca90818c6363855437a273714a8317becdfd0e5
+---
+diff --git a/configure.in b/configure.in
+index c47a5fe..6f8d115 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3459,7 +3459,7 @@ linux-gnu*)
+ ;;
+ s390x)
+ CPU=3
+- CPUNAME=S390x
++ CPUNAME=S390X
+ RTL_ARCH=S390x
+ LIB64="lib64"
+ OUTPATH=unxlngs390x
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 9c8d497..38ade7b 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+fix-S390X-CPUNAME.diff
--
LibreOffice packaging repository
Reply to: