The following commit has been merged in the debian-experimental-3.6 branch:
commit 840a6d12ceaf572c6c2c2939db1cccb72ef50901
Author: Rene Engelhard <r...@debian.org>
Date: Mon Jun 18 23:05:37 2012 +0200
update to beta2
diff --git a/changelog b/changelog
index 0d8fcb3..bd5284e 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.6.0~beta1-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.0~beta2-1) UNRELEASED; urgency=low
* new upstream beta release
- fixes splashscreen location in multi-monitor setups
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 2f51fae..7750eeb 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -51,18 +51,6 @@ index d86aab1..a10adb6 100644
.IF "$(GCCNUMVER)" >= "000400050000"
ARCH_FLAGS*=-mtune=atom
.ELSE
-diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
-index da6ed55..284bfa8 100644
---- libreoffice-3.5.0/solenv/inc/unxlngm68k.mk
-+++ libreoffice-3.5.0/solenv/inc/unxlngm68k.mk
-@@ -27,7 +27,6 @@
-
- # mk file for Unix Linux m68k using GCC, please make generic modifications to
unxlng.mk
-
--CDEFAULTOPT=-Os
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DM68K
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 53c927d..c1b7164 100644
--- libreoffice-3.5.0/solenv/inc/unxlngmips.mk
diff --git a/patches/fix-signed-char-mess.diff
b/patches/fix-signed-char-mess.diff
deleted file mode 100644
index 74ed7a3..0000000
--- a/patches/fix-signed-char-mess.diff
+++ /dev/null
@@ -1,163 +0,0 @@
-From a7bf1ce30cc49928039cd5dba6293267ed9c35c2 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <r...@debian.org>
-Date: Wed, 06 Jun 2012 13:49:12 +0000
-Subject: remove -fsigned-char from s390 to fix smoketest..
-
-Change-Id: I66c468e917513cdb096937f9955eb8a41aabaa37
-
-Signed-off-by: Caolán McNamara <caol...@redhat.com>
----
-diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk
-index 0eac39a..af2518f 100644
---- a/solenv/inc/unxlngs390.mk
-+++ b/solenv/inc/unxlngs390.mk
-@@ -30,6 +30,4 @@
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DS390
--CFLAGS+=-fsigned-char -fno-omit-frame-pointer
--CFLAGSCC+=-fsigned-char
--CFLAGSCXX+=-fsigned-char
-+CFLAGS+=-fno-omit-frame-pointer
---
-cgit v0.9.0.2-2-gbebe
-
-From fb75552a492ab9ff1f2c6c7820a07862d6b88ba6 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <r...@debian.org>
-Date: Wed, 06 Jun 2012 13:50:48 +0000
-Subject: signed char is default on m68k...
-
-Change-Id: I5b57e8e9a9dce3eacc665979844f8cb29f968368
-(cherry picked from commit c6b5b20d0a9506ae35421836940bbd1b0e86a3d4)
-
-Signed-off-by: Caolán McNamara <caol...@redhat.com>
----
-diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
-index b6a018a..7ce4156 100644
---- a/solenv/inc/unxlngm68k.mk
-+++ b/solenv/inc/unxlngm68k.mk
-@@ -31,6 +31,4 @@
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DM68K
--CFLAGS+=-fsigned-char -fno-omit-frame-pointer
--CFLAGSCC+=-fsigned-char
--CFLAGSCXX+=-fsigned-char
-+CFLAGS+=-fno-omit-frame-pointer
-
-From 567147acbc8dcbb6c43652ac6b326759b48df9da Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caol...@redhat.com>
-Date: Fri, 08 Jun 2012 07:50:50 +0000
-Subject: Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64] and
s390[x]
-
-i.e. restore #i81127# to remove -fsigned-char from old-school dmake
-ppc[64] flags, but also remove them from the new-school gbuild ones.
-
-correspondingly remove -fsigned-char from the very similar s390[x]
-arch equivalents and drop them from the very obscure linux ports
-where I just cut and paste them in the first place.
-
-with 6b3bf27cb56d661725ac3fcfb756562e0ad75564 in place this now passes
-smoketestdoc for me on build from scratch on ppc[64] and s390[x]
-
-Change-Id: I3dae70fd7a3d3adc57cf04a02350689ad097e4d3
----
-diff --git a/solenv/gbuild/platform/LINUX_AXP_GCC.mk
b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
-index 2c5082e..25edcd7 100644
---- a/solenv/gbuild/platform/LINUX_AXP_GCC.mk
-+++ b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
-@@ -27,8 +27,8 @@
-
- #please make generic modifications to unxgcc.mk or linux.mk
- gb_COMPILERDEFAULTOPTFLAGS := -Os
--gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
--gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
-+gb_CXXFLAGS += -fno-omit-frame-pointer
-+gb_CFLAGS += -fno-omit-frame-pointer
- gb_LinkTarget_LDFLAGS += -Wl,--no-relax
-
- include $(GBUILDDIR)/platform/linux.mk
-diff --git a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
-index 99d01fd..55f69a4 100644
---- a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
-+++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
-@@ -27,8 +27,8 @@
-
- #please make generic modifications to unxgcc.mk or linux.mk
- gb_COMPILERDEFAULTOPTFLAGS := -Os
--gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
--gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
-+gb_CXXFLAGS += -fno-omit-frame-pointer
-+gb_CFLAGS += -fno-omit-frame-pointer
-
- include $(GBUILDDIR)/platform/linux.mk
-
-diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
-index 33f6bd1..08e7b23 100644
---- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
-+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
-@@ -28,8 +28,7 @@
- #please make generic modifications to unxgcc.mk or linux.mk
- gb_CPUDEFS += -DPPC
- gb_COMPILERDEFAULTOPTFLAGS := -O2
--gb_CXXFLAGS += -mminimal-toc -fsigned-char
--gb_CFLAGS += -fsigned-char
-+gb_CXXFLAGS += -mminimal-toc
-
- include $(GBUILDDIR)/platform/linux.mk
-
-diff --git a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
-index 1c78df0..6fe92ec 100644
---- a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
-+++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
-@@ -28,8 +28,6 @@
- #please make generic modifications to unxgcc.mk or linux.mk
- gb_CPUDEFS += -DPPC
- gb_COMPILERDEFAULTOPTFLAGS := -O2
--gb_CXXFLAGS += -fsigned-char
--gb_CFLAGS += -fsigned-char
-
- include $(GBUILDDIR)/platform/linux.mk
-
-diff --git a/solenv/gbuild/platform/LINUX_S390X_GCC.mk
b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
-index b352572..1d6889e 100644
---- a/solenv/gbuild/platform/LINUX_S390X_GCC.mk
-+++ b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
-@@ -27,8 +27,8 @@
-
- #please make generic modifications to unxgcc.mk or linux.mk
- gb_COMPILERDEFAULTOPTFLAGS := -O2
--gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
--gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
-+gb_CXXFLAGS += -fno-omit-frame-pointer
-+gb_CFLAGS += -fno-omit-frame-pointer
-
- include $(GBUILDDIR)/platform/linux.mk
-
-diff --git a/solenv/gbuild/platform/LINUX_S390_GCC.mk
b/solenv/gbuild/platform/LINUX_S390_GCC.mk
-index b352572..1d6889e 100644
---- a/solenv/gbuild/platform/LINUX_S390_GCC.mk
-+++ b/solenv/gbuild/platform/LINUX_S390_GCC.mk
-@@ -27,8 +27,8 @@
-
- #please make generic modifications to unxgcc.mk or linux.mk
- gb_COMPILERDEFAULTOPTFLAGS := -O2
--gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
--gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
-+gb_CXXFLAGS += -fno-omit-frame-pointer
-+gb_CFLAGS += -fno-omit-frame-pointer
-
- include $(GBUILDDIR)/platform/linux.mk
-
---
-cgit v0.9.0.2-2-gbebe
-
---- a/solenv/inc/unxlngppc.mk-old 2012-06-08 19:19:39.036622583 +0200
-+++ b/solenv/inc/unxlngppc.mk 2012-06-08 19:19:47.596664364 +0200
-@@ -31,6 +31,3 @@
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DPOWERPC -DPPC
--CFLAGS+=-fsigned-char
--CFLAGSCC+=-fsigned-char
--CFLAGSCXX+=-fsigned-char
diff --git a/patches/fix-verbosity.diff b/patches/fix-verbosity.diff
deleted file mode 100644
index 67d9cbc..0000000
--- a/patches/fix-verbosity.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.top-old 2012-06-08 19:59:35.300504771 +0200
-+++ b/Makefile.top 2012-06-08 19:58:43.516247988 +0200
-@@ -18,7 +18,7 @@
- include $(SRCDIR)/config_$(gb_Side).mk
-
- ifeq ($(GMAKE_OPTIONS),)
--ifeq ($(verbose),)
-+ifeq ($(VERBOSE),)
- export GMAKE_OPTIONS:=-rs
- else
- export GMAKE_OPTIONS:=-r
diff --git a/patches/series b/patches/series
index eea86d1..9c000fc 100644
--- a/patches/series
+++ b/patches/series
@@ -27,5 +27,3 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
#lp-904212-add-missing-mimetypes-to-impress.desktop.diff
-fix-verbosity.diff
-fix-signed-char-mess.diff
diff --git a/rules b/rules
index 6730bbc..a1f4569 100755
--- a/rules
+++ b/rules
@@ -69,10 +69,10 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.99.1
+lo_sources_ver=3.6.0.0.beta2
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.5.99.1 libreoffice-3.5.99.1
-#GIT_TAG=libreoffice-$(lo_sources_ver)
+# use ./g checkout -b tag-libreoffice-3.6.0.0.beta2 libreoffice-3.6.0.0.beta2
+GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=libreoffice-3-6
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1shhdg-0002hh...@vasks.debian.org
