[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-141-gf64b3e8
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit f04121561847a109e2fe1b534809301fe4d69d72
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jun 26 17:03:20 2012 +0200
new upstream rc2
updating patches
diff --git a/changelog b/changelog
index 897704b..be284f6 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
-libreoffice (1:3.5.4-0ubuntu1) UNRELEASED; urgency=low
+libreoffice (1:3.5.5~rc2-0ubuntu1~ppa1) precise; urgency=low
* cherry-pick Rene Engelhards fix against an empty libreoffice-report-builder
+ * new upstream release
+ * updating patches
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 11 Jun 2012 16:28:07 +0200
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 65435cd..7e1af68 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -53,18 +53,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/rules b/rules
index a2077a0..d7f6bb8 100755
--- a/rules
+++ b/rules
@@ -62,8 +62,8 @@ export QUILT_PATCHES=debian/patches
export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-GIT_TAG=libreoffice-3.5.4.2
-GIT_BRANCH=libreoffice-3.5.4.2
+GIT_TAG=libreoffice-3.5.5.2
+GIT_BRANCH=libreoffice-3.5.5.2
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
--
LibreOffice packaging repository
Reply to: