[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0-2-42-gcfdf54c
The following commit has been merged in the debian-experimental-4.2 branch:
commit cfdf54c665ba5dce5130a1044ef105f9e51f77d6
Merge: 18ae4bfc246eb09660df433ddcf545ddbc77403f b335fe78c807921b791fdc4f6d8a05f3a5fb5546
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 29 17:43:24 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.2
Conflicts:
changelog
diff --combined changelog
index a71ea4a,39641e6..93dcea1
--- a/changelog
+++ b/changelog
@@@ -1,19 -1,18 +1,33 @@@
+libreoffice (1:4.2.0~alpha0~git20130726-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got replaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ Run dh_doxygen
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+ - add conditionals for new libs used: opencl, firebird, avahi-client,
+ vlc
+
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+
- libreoffice (1:4.1.0-2) UNRELEASED; urgency=low
+ libreoffice (1:4.1.0-3) unstable; urgency=low
+
+ * debian/rules:
+ - use system-clucene again now that it's in sid
+ - move liblpsolve55.so into -core if used internally, as otherwise
+ -writer doesn't start without -calc installed..?!
+ * debian/libreoffice-common.postrm.in:
+ - add missed || true and use rm -f for javasettinsgunopkginstall.xml...
+ * debian/control.librelogo.in:
+ - apparently librelogo also needs -script-provider-python. Depend on
+ that instead of ${pyuno-depends}, thanks Bjoern Michaelsen
+
+ -- Rene Engelhard <rene@debian.org> Mon, 29 Jul 2013 13:28:36 +0200
+
+ libreoffice (1:4.1.0-2) unstable; urgency=low
* debian/rules:
- fix uno.py, actually add starting / in LOs path (closes: #717930)
@@@ -25,7 -24,7 +39,7 @@@
remove it (and javaunopkginstall.xml if exists) on purge
(closes: #707933)
- -- Rene Engelhard <rene@debian.org> Thu, 25 Jul 2013 18:33:02 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 26 Jul 2013 20:25:16 +0200
libreoffice (1:4.1.0-1) unstable; urgency=low
diff --combined control
index 0c041e0,8b98b45..b728ba7
--- a/control
+++ b/control
@@@ -15,9 -15,7 +15,9 @@@ Build-Depends: ant (>= 1.7.0)
debhelper (>= 7.2.3~),
dpkg-dev (>= 1.16.1),
fastjar,
+ firebird-dev (>= 2.5.2.26540.ds4-2),
flex | flex-old,
+ fonts-liberation,
g++-mingw-w64-i686 [i386 amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
@@@ -28,7 -26,6 +28,7 @@@
junit4 (>= 4.8.2-2),
kdelibs5-dev (>= 4:4.3.4),
libarchive-zip-perl,
+ libavahi-client-dev,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
libboost-date-time1.53-dev,
libboost1.53-dev,
@@@ -36,6 -33,7 +36,7 @@@
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcppunit-dev (>= 1.12),
libcups2-dev,
@@@ -66,7 -64,7 +67,7 @@@
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -90,8 -88,7 +91,8 @@@
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
- libwpd-dev (>= 0.9.0),
+ libvlc-dev,
+ libwpd-dev (>= 0.9.5),
libwpg-dev (>= 0.2.0),
libwps-dev (>= 0.2.0),
libx11-dev,
@@@ -109,7 -106,6 +110,7 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc],
pkg-config,
@@@ -125,7 -121,7 +126,7 @@@
zip,
zlib1g-dev
Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+ doxygen (>= 1.8.4),
fdupes,
fontforge,
imagemagick,
@@@ -146,8 -142,7 +147,8 @@@
libservlet3.0-java,
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
xml-core
-Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
+Build-Conflicts: amd-libopencl1,
+ ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
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],
@@@ -166,7 -161,6 +167,7 @@@
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
+ nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
XS-Python-Version: current
@@@ -174,7 -168,7 +175,7 @@@ XS-Python3-Version: 3.
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
- Bugs: mailto:debian-openoffice@lists.debian.org
+ Bugs:
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -4445,13 -4439,11 +4446,13 @@@ Depends: ant (>= 1.7.0)
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- doxygen,
+ doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
+ firebird-dev (>= 2.5.2.26540.ds4-2),
flex | flex-old,
fontforge,
+ fonts-liberation,
g++-mingw-w64-i686,
gcj-jdk,
gcj-native-helper,
@@@ -4462,13 -4454,13 +4463,14 @@@
junit4 (>= 4.8.2-2),
kdelibs5-dev (>= 4:4.3.4),
libarchive-zip-perl,
+ libavahi-client-dev,
libbase-java,
libbluetooth-dev,
libboost-date-time1.53-dev,
libboost1.53-dev,
libcairo2-dev,
libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcommons-codec-java,
libcommons-httpclient-java,
@@@ -4508,7 -4500,7 +4510,7 @@@
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -4538,8 -4530,7 +4540,8 @@@
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
- libwpd-dev (>= 0.9.0),
+ libvlc-dev,
+ libwpd-dev (>= 0.9.5),
libwpg-dev (>= 0.2.0),
libwps-dev (>= 0.2.0),
libx11-dev,
@@@ -4558,7 -4549,6 +4560,7 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2),
pkg-config,
python (>= 2.6.6-3+squeeze4),
@@@ -4580,9 -4570,9 +4582,9 @@@ Package: libreoffice-librelog
Section: misc
Architecture: all
Depends: libreoffice-core (>= 1:3.4~),
+ libreoffice-script-provider-python,
libreoffice-writer,
- ${misc:Depends},
- ${pyuno-depends}
+ ${misc:Depends}
Description: Logo-like progamming language for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --combined rules
index 1e32dd7,f5073c6..50511ca
--- 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)
@@@ -245,14 -245,12 +245,14 @@@ ifeq "$(USE_DBUS)" "y
SYSTEM_STUFF += bluez
endif
endif
+ENABLE_AVAHI=y
USE_GSTREAMER=y
ifneq "$(WHEEZY_BACKPORT)" "y"
GSTREAMER_VERSION=1.0
else
GSTREAMER_VERSION=0.10
endif
+USE_VLC=y
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@@ -355,7 -353,7 +355,7 @@@ SYSTEM_STUFF += mesa-header
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
- #SYSTEM_STUFF += clucene
+ SYSTEM_STUFF += clucene
ENABLE_HELP=y
SYSTEM_STUFF += lcms2
SYSTEM_STUFF += openldap
@@@ -376,11 -374,6 +376,11 @@@ ifeq "$(USE_UCPP)" "y
endif
ENABLE_MERGELIBS=n
PACKAGE_LIBLIBREOFFICE=n
+USE_OPENCL=y
+SYSTEM_STUFF += firebird
+ifeq (,$(filter firebird, $(SYSTEM_STUFF)))
+SYSTEM_STUFF += libatomic-ops
+endif
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -546,8 -539,7 +546,8 @@@ endi
# Debian WHeezy
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))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz libatomic-ops libwpd,$(SYSTEM_STUFF))
+ PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@@ -593,7 -585,7 +593,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
@@@ -651,10 -643,6 +651,10 @@@ ifneq (,$(filter openssl, $(SYSTEM_STUF
BUILD_DEPS += , libssl-dev
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
endif
+ifeq "$(USE_OPENCL)" "y"
+ BUILD_DEPS += , ocl-icd-opencl-dev
+ CONFIGURE_FLAGS += --with-opencl-sdk=/usr
+endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
@@@ -745,11 -733,6 +745,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
@@@ -995,7 -978,7 +995,7 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.8.0)
+ BUILD_DEPS += , libmdds-dev (>= 0.9.0)
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
@@@ -1012,7 -995,7 +1012,7 @@@ endi
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libwpd, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libwpd-dev (>= 0.9.0)
+ BUILD_DEPS += , libwpd-dev (>= 0.9.5)
endif
ifneq (,$(filter mythes, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmythes-dev (>= 2:1.2)
@@@ -1118,23 -1101,6 +1118,23 @@@ ifeq "$(ENABLE_MYSQLNATIVE)" "y
endif
endif
+ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libatomic-ops-dev (>= 7.3~alpha1+git20110913-1)
+endif
+ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
+ ifneq "$(WHEEZY_BACKPORT)" "y"
+ BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)
+ # no FIREBIRD_CFLAGS here. Have no effect as fb_config is there
+ # and configure prefers that over our values...
+ else
+ BUILD_DEPS += , firebird-dev
+ # firebird-dev only _Suggests_ libfbembed2.5...
+ BUILD_DEPS += , libfbembed2.5
+ FIREBIRD_CFLAGS := " "
+ FIREBIRD_LIBS := "-L/usr/lib/$(DEB_HOST_MULTIARCH) -lfbembed"
+ endif
+endif
+
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
DEBHELPER_OPTIONS+= -Nlibreoffice-gtk -Nlibreoffice-gnome
@@@ -1257,11 -1223,6 +1257,11 @@@ ifeq "$(USE_DBUS)" "y
endif
endif
+ifeq "$(ENABLE_AVAHI)" "y"
+ BUILD_DEPS += , libavahi-client-dev
+ CONFIGURE_FLAGS += --enable-avahi
+endif
+
ifeq "$(USE_GSTREAMER)" "y"
ifeq "$(GSTREAMER_VERSION)" "1.0"
BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
@@@ -1274,11 -1235,6 +1274,11 @@@ els
CONFIGURE_FLAGS += --disable-gstreamer-0-10
endif
+ifeq "$(USE_VLC)" "y"
+ BUILD_DEPS += , libvlc-dev
+ CONFIGURE_FLAGS += --enable-vlc
+endif
+
ifneq (,$(filter neon, $(SYSTEM_STUFF)))
ifneq "$(NEON_SECTYPE)" "openssl"
BUILD_DEPS += , libneon$(NEONSONR)-$(NEON_SECTYPE)-dev
@@@ -1753,7 -1709,6 +1753,7 @@@ $(STAMP_DIR)/build-arch
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PYMAJOR).$(PYMINOR))" \
MARIADBCONFIG=$(MARIADBCONFIG) \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) \
--without-doxygen --disable-ext-wiki-publisher \
--disable-report-builder --disable-scripting-javascript \
@@@ -1808,7 -1763,6 +1808,7 @@@ $(STAMP_DIR)/build-indep
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PYMAJOR).$(PYMINOR))" \
MARIADBCONFIG=$(MARIADBCONFIG) \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
ifneq "$(WHEEZY_BACKPORT)" "y"
@@@ -2573,6 -2527,13 +2573,13 @@@ els
rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
endif
+ # see https://bugs.freedesktop.org/show_bug.cgi?id=67349
+ # writer doesn't start without it.
+ ifeq (,$(filter lpsolve, $(SYSTEM_STUFF)))
+ mv $(PKGDIR)-calc/$(OODIR)/program/liblpsolve55.so \
+ $(PKGDIR)-core/$(OODIR)/program
+ endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
@@@ -3204,9 -3165,6 +3211,9 @@@ endi
ifeq "$(PACKAGE_LIBRELOGO)" "y"
dh_installchangelogs -plibreoffice-librelogo -k librelogo/source/ChangeLog
endif
+ifeq "$(PACKAGE_SDK_DOCS)" "y"
+ dh_doxygen -plibreoffice-dev-doc
+endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
--
LibreOffice packaging repository
Reply to: