The following commit has been merged in the debian-experimental-3.5 branch:
commit 18565db7cb7452c596960b40fff62768439d8cb5
Merge: 0dfb816a77cf7d8284fda8fa22cb047b0c1bd902
f4e4652b39186f7af9ac5cae2f32bd6ea757543f
Author: Rene Engelhard <r...@debian.org>
Date: Fri Apr 20 00:18:46 2012 +0200
Merge branch master into debian-experimental-3.5
diff --combined changelog
index b1e0b5d,f8cda67..068c7ef
--- a/changelog
+++ b/changelog
@@@ -1,13 -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/patches/db5.3.diff: add 5.3 to checked db versions
+ * debian/rules:
+ - build-depend on new g++-mingw-w64-i686 instead of the whole thing
[ Björn Michaelsen ]
* add visio mimetype to libreoffice draw desktop file
diff --combined rules
index 7e1b102,e7aea35..11c17dd
--- 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
@@@ -789,7 -789,7 +789,7 @@@ export JAVA_HOM
BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS),
mingw32-runtime$(OOO_NO_JAVA_ARCHS)
CONFIGURE_FLAGS += --with-mingw-cross-compiler=i586-mingw32msvc-g++
else
- BUILD_DEPS += , mingw-w64 (>= 1.0)$(OOO_NO_JAVA_ARCHS)
+ BUILD_DEPS += , g++-mingw-w64-i686 $(OOO_NO_JAVA_ARCHS)
CONFIGURE_FLAGS += --with-mingw-cross-compiler=i686-w64-mingw32-g++
endif
endif
--
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/e1sl0dt-0005xz...@vasks.debian.org
