[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-4-44-g075ce9f
The following commit has been merged in the debian-experimental-3.6 branch:
commit 075ce9fbddf275196f3aa8e2d56db31bfdb128e1
Merge: 60454de9e0556761ee595e4ab91536b0fc9d014b 426304aaf79667e7befa9559d5f428e028e5d513
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 20 01:05:43 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.6
diff --combined changelog
index fbaa36a,fc7aa4d..5ff7141
--- a/changelog
+++ b/changelog
@@@ -1,27 -1,16 +1,29 @@@
+libreoffice (1:3.6.0~alpha0~git20120416-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ - fixes splashscreen location in multi-monitor setups
+ (closes: #657444, #431473)
+
+ * debian/rules:
+ - new conditionals for: doxygen, libcdr, liblcms2
+ - remove liblucene2-java stuff; now clucene is used
+ - build-depend on libxml2-utils, xmllint now needed
+
+ -- Rene Engelhard <rene@debian.org> Mon, 16 Apr 2012 14:09:29 +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
+ * 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> Mon, 16 Apr 2012 09:02:21 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 20 Apr 2012 00:57:45 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --combined rules
index 3636156,03a6bcc..b568a57
--- a/rules
+++ b/rules
@@@ -70,7 -70,7 +70,7 @@@ SOURCE_TREE=
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
USE_GIT_TARBALLS=n
ifeq "$(DISTREL)" "squeeze"
@@@ -149,7 -149,6 +149,7 @@@ SYSTEM_STUFF += ic
ICU_MINVER= (>= 4.0)
SYSTEM_STUFF += libwpd libwpg libwps
SYSTEM_STUFF += libvisio
+SYSTEM_STUFF += libcdr
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -182,6 -181,7 +182,6 @@@ ifeq "$(ENABLE_JAVA)" "y
# It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
# for UOF, but still for e.g. M$.
#SYSTEM_STUFF += saxon
- SYSTEM_STUFF += lucene
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
@@@ -193,7 -193,6 +193,7 @@@ NEON_SECTYPE=gnutl
NEONSONR=27
SYSTEM_STUFF += redland
PACKAGE_SDK=y
+PACKAGE_SDK_DOCS=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
RUN_MAKE_CHECK=y
@@@ -292,8 -291,6 +292,8 @@@ SYSTEM_STUFF += libpn
SYSTEM_STUFF += nss
SYSTEM_STUFF += mozilla-headers
SYSTEM_STUFF += sampleicc
+#SYSTEM_STUFF += clucene
+SYSTEM_STUFF += lcms2
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -469,7 -466,7 +469,7 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler libcmis, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler libcmis libcdr, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
PARALLEL_BUILD=n
ENABLE_PDFIMPORT=n
@@@ -498,13 -495,6 +498,13 @@@ endi
ifneq "$(PACKAGE_SDK)" "y"
CONFIGURE_FLAGS += --disable-odk
+ ifneq "$(PACKAGE_SDK_DOCS)" "y"
+ CONFIGURE_FLAGS += --without-doxygen
+ endif
+else
+ ifeq "$(PACKAGE_SDK_DOCS)" "y"
+ BUILD_DEPS += , doxygen
+ endif
endif
ifneq "$(ENABLE_MINIMIZER)" "y"
@@@ -551,7 -541,7 +551,7 @@@ ifneq (,$(filter jpeg, $(SYSTEM_STUFF))
BUILD_DEPS += , libjpeg-dev
endif
ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libxml2-dev
+ BUILD_DEPS += , libxml2-dev, libxml2-utils
BUILD_DEPS += , libxslt1-dev
DBG_DBG_SUGGESTS+= , libxslt1-dbg
endif
@@@ -921,10 -911,6 +921,10 @@@ ifneq (,$(filter sampleicc, $(SYSTEM_ST
BUILD_DEPS += , libsampleicc-dev, libicc-utils-dev
endif
+ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libclucene-dev
+endif
+
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libwpd, $(SYSTEM_STUFF)))
BUILD_DEPS += , libwpd-dev (>= 0.9.0)
@@@ -944,19 -930,12 +944,19 @@@
ifneq (,$(filter libvisio, $(SYSTEM_STUFF)))
BUILD_DEPS += , libvisio-dev
endif
+ ifneq (,$(filter libcdr, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libcdr-dev
+ endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev
endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
+ifneq (,$(filter lcms2, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , liblcms2-dev
+endif
+
ifneq (,$(filter icu, $(SYSTEM_STUFF)))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
@@@ -1049,6 -1028,13 +1049,6 @@@ ifneq "$(BUILD_PYUNO)" "y
endif
ifeq "$(ENABLE_JAVA)" "y"
- ifneq (,$(filter lucene, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liblucene2-java (>= 2.3.2)$(OOO_NO_JAVA_ARCHS)
- LUCENE_DEPENDS = liblucene2-java (>= 2.3.2)
- # safety measure; e.g. lucene 2.9 index cannot be handled by lucene 2.4
- LUCENE_CONFLICTS = liblucene2-java (<< $(shell dpkg -l liblucene2-java | grep ^ii | awk '{ print $$3 }' | cut -d. -f1,2)~)
- CONFIGURE_FLAGS += --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
- endif
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
@@@ -1237,7 -1223,7 +1237,7 @@@ endi
# Files created in debian directory
$(MAKE) -f debian/rules clean-debdir
- find debian -name "*.links" ! -name "libreoffice-common*.links" -exec rm {} \;
+ find debian -name "*.links" -exec rm {} \;
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
rm -f debian/*.bug-script
@@@ -1586,7 -1572,11 +1586,7 @@@ ifeq "$(BUILD_PYUNO)" "y
# then...
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
- cd $(SOURCE_TREE)/pyuno-py3; \
- rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
- PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \
- ../solenv/bin/build.pl # NO DELIVER!
+ $(MAKE) pyuno-py3
endif
endif
@@@ -1644,6 -1634,7 +1644,6 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
# install LibreOffice.
cd $(SOURCE_TREE)/; \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) \
DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) distro-pack-install
@@@ -2153,7 -2144,7 +2153,7 @@@ ifeq "$(BUILD_PYUNO)" "y
| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
> debian/python3-uno/$(OODIR)/program/pythonloader.unorc
for i in pyuno.so pythonloader.uno.so libpyuno.so; do \
- install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
+ install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell $(MAKE) -s cmd cmd="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/lib/$$i \
debian/python3-uno/$(OODIR)/program/$$i; \
done
cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@@ -2228,7 -2219,7 +2228,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# install gsicheck into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
+ install -m755 $(SOURCE_TREE)/solver/$(shell $(MAKE) -s cmd cmd="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@@ -2851,6 -2842,7 +2851,6 @@@ endi
-V'java-common-depends=$(JAVA_COMMON_DEPENDS) $(JAVA_COMMON_DEPENDS_VERSION)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
- -V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
@@@ -2881,7 -2873,7 +2881,7 @@@ endi
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell $(MAKE) -s cmd cmd="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
endif
endif
@@@ -2963,7 -2955,9 +2963,7 @@@ endi
dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
dh_installdeb -i
ifeq "$(ENABLE_JAVA)" "y"
- # the help recommends lucene. this is enough. no need for a hard depend in
- # -common, IMHO
- jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xliblucene2-java
+ jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
@@@ -2978,6 -2972,8 +2978,6 @@@
-V'bsh-depends=$(BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
- -V'lucene-depends=$(LUCENE_DEPENDS)' \
- -V'lucene-conflicts=$(LUCENE_CONFLICTS)' \
-V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
@@@ -2990,6 -2986,7 +2990,6 @@@ endi
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -plibreoffice$(VER)-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
- -V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
@@@ -2998,7 -2995,7 +2998,7 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell $(MAKE) -s cmd cmd="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
--
LibreOffice packaging repository
Reply to: