The following commit has been merged in the debian-experimental-3.5 branch:
commit 6cdfb6aa5bfa408826698cf46161696be44e1f35
Merge: 39335599f7c4401c5db4443f6d16073f5d77c688
aa2df9bdb19235f12cb9c63eae0ba238745ba624
Author: Rene Engelhard <r...@debian.org>
Date: Sat Apr 28 17:32:49 2012 +0200
Merge remote-tracking branch 'origin/master' into HEAD
diff --combined changelog
index cebb0bd,50abc60..4bdaef6
--- a/changelog
+++ b/changelog
@@@ -1,49 -1,38 +1,56 @@@
-libreoffice (1:3.5.2-6) unstable; urgency=low
+libreoffice (1:3.5.3~rc2-2) UNRELEASED; urgency=low
[ Rene Engelhard ]
+ * debian/patches/ignore-sc_cellrangesbase-fails.diff: as it says; gives
+ OK but (sometimes!) segfaults after it.
+ * debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff: move
...
+ * debian/patches/disable-db-tests.diff: ... here and also disable dbaccess
complex
+ patch if Base disabled
+
* debian/rules:
- guard libdbalo.so mv with feq PACKAGE_BASE=y...
+ - use make -k check
[ Björn Michaelsen ]
* add missing mimetypes to impress.desktop (LP: #904212)
- -- Rene Engelhard <r...@debian.org> Thu, 26 Apr 2012 20:57:53 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 27 Apr 2012 23:38:14 +0200
-libreoffice (1:3.5.2-5) unstable; urgency=low
+libreoffice (1:3.5.3~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
* debian/patches/gcc-4.4.dif: fix gtk3 build with gcc 4.4
* debian/rules:
- - build-depend on new g++-mingw-w64-i686 instead of the whole thing
- - use gcc 4.4 on mips(el)
- only ship (and build) unowinreg.dll for i386/amd64. Probably not used
on other archs and it saves us the g++-mingw-w64-i686 build-dep there
+ - use gcc 4.4 on mips a) for consistency b) as 3.5.3~rc1-1 bus errord on
+ ball, too
- readd move of libdbalo.so to -base-core (closes: #670350)
* debian/shell-lib-extension.sh: also set HOME to $INSTDIR for unopkg
(as -env=UserInstallation doesn't work (anymore) - closes: #669271
* debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
/var/lib/libreoffice/share/prereg
- -- Rene Engelhard <r...@debian.org> Wed, 25 Apr 2012 03:35:18 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 25 Apr 2012 03:09:29 +0200
+
+libreoffice (1:3.5.3~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ [ 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)
+
+ [ Björn Michaelsen ]
+ * add visio mimetype to libreoffice draw desktop file
+
+ -- Rene Engelhard <r...@debian.org> Sat, 21 Apr 2012 15:54:28 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --combined control
index 1212909,f4a5abc..2a9e412
--- a/control
+++ b/control
@@@ -166,7 -166,6 +166,6 @@@ Description: office productivity suite
Package: libreoffice-impress
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-draw (=
${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
- Conflicts: libcairo2 (= 1.12.0-1), libcairo2 (= 1.12.0-2)
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -194,7 -193,7 +193,7 @@@ Description: office productivity suite
Package: libreoffice-base-core
Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 s390x sparc
kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
-Replaces: libreoffice-base (<< 1:3.5.2-5)
+Replaces: libreoffice-base (<< 1:3.5.3~rc2-1)
Suggests: libreoffice-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
diff --combined patches/series
index 70407c2,d465167..0e5eee9
--- a/patches/series
+++ b/patches/series
@@@ -20,17 -20,23 +20,18 @@@ make-pyuno-work-with-system-wide-module
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
fix-ARM-detection-in-set-soenv.diff
propagate-gb_FULLDEPS.diff
disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
-armhf-bridges.diff
-armhf-bridges-fix-armv4t-armel.diff
move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
-armhf-bridges-doubles.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
gcc-4.7.diff
gcc-4.7-i386.diff
gcc-4.7-amd64.diff
-icu-4.9.diff
tests-fix-build-with-jdk7.diff
lp-926940-visio-mime-for-draw.diff
gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
+ ignore-sc_cellrangesbase-fails.diff
diff --combined rules
index e339ae8,c38f674..00c3d0f
--- a/rules
+++ b/rules
@@@ -61,23 -61,17 +61,23 @@@ export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr:
export QUILT_PATCHES=debian/patches
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
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
export TARFILE_LOCATION
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.3.2
+# NOT in proper libreoffice-3-5 branch
+# use ./g checkout -b tag-libreoffice-3.5.3.2 libreoffice-3.5.3.2
+GIT_TAG=libreoffice-$(lo_sources_ver)
+GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
+endif
+ifeq "$(USE_SOURCE_TARBALLS)" "y"
+lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
+endif
ifeq "$(DISTREL)" "squeeze"
SQUEEZE_BACKPORT=y
@@@ -1621,8 -1615,7 +1621,7 @@@ endi
check:
ifeq "$(RUN_MAKE_CHECK)" "y"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
- cd $(SOURCE_TREE)/smoketest && \
- patch -p1 <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
+ patch -p1 < $(CURDIR)/debian/patches/disable-db-tests.diff
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
@@@ -1636,12 -1629,11 +1635,11 @@@ endi
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
+ $(MAKE) -k check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
- cd $(SOURCE_TREE)/smoketest && \
- patch -p1 -R <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
+ patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
--
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/e1so9el-0001pc...@vasks.debian.org
