[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.3_rc2-1-16-g6cdfb6a
The following commit has been merged in the debian-experimental-3.5 branch:
commit 39335599f7c4401c5db4443f6d16073f5d77c688
Merge: f2cf5278789b4d1ee7b3886a432bd730de7e9f90 496346c9e692b7ba8ec0aa78c78cac7b71d830a5
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 27 09:26:39 2012 +0200
Merge remote-tracking branch 'origin/master' into HEAD
diff --combined changelog
index e6cf008,fc50fee..cebb0bd
--- a/changelog
+++ b/changelog
@@@ -1,45 -1,31 +1,49 @@@
-libreoffice (1:3.5.2-6) UNRELEASED; urgency=low
+libreoffice (1:3.5.3~rc2-2) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
+ * debian/rules:
+ - guard libdbalo.so mv with feq PACKAGE_BASE=y...
+
[ Björn Michaelsen ]
* add missing mimetypes to impress.desktop (LP: #904212)
- -- Rene Engelhard <rene@debian.org> Thu, 26 Apr 2012 12:07:01 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 26 Apr 2012 20:57:53 +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 <rene@debian.org> Wed, 25 Apr 2012 03:35:18 +0200
+ -- Rene Engelhard <rene@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 <rene@debian.org> Sat, 21 Apr 2012 15:54:28 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --combined control
index 2a9e412,2fb8411..1212909
--- a/control
+++ b/control
@@@ -166,6 -166,7 +166,7 @@@ 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.
@@@ -193,7 -194,7 +194,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 rules
index 8417cce,3facd55..e339ae8
--- 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
@@@ -2104,9 -2098,11 +2104,11 @@@ ifeq "$(PACKAGE_NSPLUGIN)" "y
usr/lib/mozilla/plugins/libnpsoplugin.so
endif
+ ifeq "$(PACKAGE_BASE)" "y"
mkdir -p $(PKGDIR)-base-core/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/libdbalo.so \
$(PKGDIR)-base-core/$(OODIR)/program
+ endif
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: