The following commit has been merged in the debian-experimental-3.5 branch:
commit a097c1af19e93d4aa6b94557a5272a2851df2b00
Merge: 4027a5a00f6f6110aa4b39e8904edfbdb2e79b68
155d4275199ef38d96e82a9c2c9e394c21d7c487
Author: Rene Engelhard <r...@debian.org>
Date: Sat Apr 21 15:53:28 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index ae54cd8,10cee99..99b3fbc
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,9 +1,15 @@@
+libreoffice (1:3.5.3~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <r...@debian.org> Mon, 16 Apr 2012 09:59:51 +0200
+
libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
[ Rene Engelhard ]
* debian/rules:
- build-depend on new g++-mingw-w64-i686 instead of the whole thing
+ - use gcc 4.4 on mipsel
* debian/libreoffice-common.links: move ...
* debian/libreoffice-common.links.in: ... here again as we need to
subsitute @OODIR@ (closes: #669138)
@@@ -16,7 -11,7 +17,7 @@@
[ Björn Michaelsen ]
* add visio mimetype to libreoffice draw desktop file
- -- Rene Engelhard <r...@debian.org> Fri, 20 Apr 2012 00:57:45 +0200
+ -- Rene Engelhard <r...@debian.org> Sat, 21 Apr 2012 10:52:56 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --combined rules
index eb3bd2e,978fdc1..d2fc2e2
--- a/rules
+++ b/rules
@@@ -63,9 -63,9 +63,9 @@@ export QUILT_OPTIONS="-p1 -F0
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.2.2 libreoffice-3.5.2.2
-GIT_TAG=libreoffice-3.5.2.2
-GIT_BRANCH=tag-libreoffice-3.5.2.2
+# use ./g checkout -b tag-libreoffice-3.5.3.1 libreoffice-3.5.3.1
+GIT_TAG=libreoffice-3.5.3.1
+GIT_BRANCH=tag-libreoffice-3.5.3.1
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
@@@ -334,6 -334,13 +334,13 @@@ ifeq "$(DEB_HOST_ARCH)" "i386
LINK_TO_STLPORT=y
endif
+ ifeq (mipsel,$(findstring mipsel,$(OOO_ARCHS)))
+ BUILD_DEPS += , gcc-4.4 [mipsel], g++-4.4 [mipsel]
+ ifeq "$(DEB_HOST_ARCH)" "mipsel"
+ GCC_VERSION := 4.4
+ endif
+ endif
+
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on armel and mips(el), does it? :)
OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))
--
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/e1slu3e-00028j...@vasks.debian.org
