[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_beta2-2-50-gf0f21ba
The following commit has been merged in the debian-experimental-4.2 branch:
commit f0f21ba4c00dea3b542d7c62b2459c3f7beab180
Merge: 2373697f6ca95e992e2ec4dfb3394b2875511964 8ef521cb7ba22bec2978bbfa5e7c8e61f2791452
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 18 20:54:51 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.1' into debian-experimental-4.2
Conflicts:
changelog
diff --combined changelog
index c4ef492,410d94e..909897d
--- a/changelog
+++ b/changelog
@@@ -1,18 -1,6 +1,18 @@@
+libreoffice (1:4.2.0~alpha0~git20130604-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got deplaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+
- libreoffice (1:4.1.0~rc1~git20130710-1) UNRELEASED; urgency=low
+ libreoffice (1:4.1.0~rc1-1) UNRELEASED; urgency=low
- * new upstream snapshot
+ * new upstream release candidate
* debian/control.sdk.in:
- also replace libreoffice-common (<< 4.1.0~beta1) (closes: #710767)
@@@ -23,10 -11,10 +23,10 @@@
- temporarily force gcc-4.6(!) (instead of build-conflicting
against gcc (>< 4:4.7~) on all archs except *i386/*amd64 until
all bridges are ported to the new gcc 4.7+ behaviour
- - remove last buildd special-caing: build --enable-verbose everyhwere,
+ - remove last buildd special-casing: build --enable-verbose everyhwere,
also on the buildds
- -- Rene Engelhard <rene@debian.org> Thu, 13 Jun 2013 21:19:31 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 17 Jun 2013 19:31:11 +0200
libreoffice (1:4.1.0~beta2-2) experimental; urgency=low
diff --combined control
index 401d63b,416f08f..160b634
--- a/control
+++ b/control
@@@ -16,7 -16,6 +16,7 @@@ Build-Depends: ant (>= 1.7.0)
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ fonts-liberation,
g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64],
@@@ -123,7 -122,7 +123,7 @@@
zip,
zlib1g-dev
Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+ doxygen (>= 1.8.4),
fdupes,
fontforge,
imagemagick,
@@@ -148,7 -147,6 +148,6 @@@ Build-Conflicts: ant (= 1.8.0-1) [hppa
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
flex (= 2.5.34-1) [amd64],
- g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
@@@ -2021,12 -2019,12 +2020,12 @@@ Suggests: hunspell-dictionary-kk | mysp
libreoffice-grammarcheck-kk,
libreoffice-help-kk,
mythes-kk
- Description: office productivity suite -- Kazakh language package
+ Description: office productivity suite -- Kazahk language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
- Kazakh.
+ Kazahk.
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -4331,7 -4329,8 +4330,8 @@@ Depends: libreoffice-core (= ${binary:V
${shlibs:Depends}
Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: libmythes-dev, libreoffice-dev-doc
- Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1)
+ Replaces: libreoffice-common (<< 1:4.1.0~beta1),
+ libreoffice-core (<< 1:4.1.0~beta1)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -4444,12 -4443,11 +4444,12 @@@ Depends: ant (>= 1.7.0)
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- doxygen,
+ doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
fontforge,
+ fonts-liberation,
g++-4.6,
g++-mingw-w64-i686,
gcc-4.6,
diff --combined rules
index d19f555,1d73eec..0a3eb84
--- a/rules
+++ b/rules
@@@ -23,7 -23,7 +23,7 @@@ BASE_VERSION:=$(shell echo $(DEB_VERSIO
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
HELP_L10N_VIRTUAL_VERSION:=4.1
-OOVER:=4.1
+OOVER:=4.2
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -325,8 -325,6 +325,6 @@@ SYSTEM_STUFF += harfbuz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
- ENABLE_LIBRSVG=y
- SYSTEM_LIBRSVG=y
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with libreoffice2), we need to set this. Don't touch
# otherwise
@@@ -528,8 -526,6 +526,6 @@@ OOO_NSPLUGIN_ARCHS
endif
$(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
- # see uno-executables-link-to-xmlreader.diff. That workaround is not needed
- # with said binutils. Thanks Aurelien Jarno for the hint.
ifneq "$(WHEEZY_BACKPORT)" "y"
ifneq (,$(findstring mips, $(OOO_ARCHS)))
BUILD_DEPS += , binutils (>= 2.23) [mips mipsel]
@@@ -543,7 -539,6 +539,7 @@@ endi
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
+ PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@@ -589,7 -584,7 +585,7 @@@ ifneq "$(PACKAGE_SDK)" "y
endif
else
ifeq "$(PACKAGE_SDK_DOCS)" "y"
- BUILD_DEPS_INDEP += , doxygen
+ BUILD_DEPS_INDEP += , doxygen (>= 1.8.4)
endif
endif
@@@ -737,11 -732,6 +733,11 @@@ ifneq (,$(filter cppunit, $(SYSTEM_STUF
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , gdb
+ ifeq "$(WHEEZY_BACKPORT)" "y"
+ BUILD_DEPS += , ttf-liberation
+ else
+ BUILD_DEPS += , fonts-liberation
+ endif
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
--
LibreOffice packaging repository
Reply to: