[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-20-g3b85e7f
The following commit has been merged in the debian-experimental-3.6 branch:
commit 3b85e7f69eebbcfd7e4301f91f27e60ac48b0dee
Merge: d089c5203361c919e279436706c3739bce2699b6 5e762affd45ba1a009b40c73fd43eec1369f7cc7
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 6 17:14:18 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.6
diff --combined changelog
index 5ee765d,36cae8c..59b0b3a
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,24 +1,34 @@@
+libreoffice (1:3.6.0~git20120406-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - new conditionals for: doxygen, libcdr, liblcms2
+ - remove liblucene2-java stuff; now clucene is used
+
+ -- Rene Engelhard <rene@debian.org> Fri, 06 Apr 2012 13:52:11 +0200
+
+ libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
+
+ * debian/patches/gcc-4.7{,-i386.-amd64}.diff: backport gcc 4.7 build and
+ runtime(!) fixes for i386/amd64 from master
+
+ * debian/shell-lib-extensions.sh, debian/*bug-script.in:
+ use --bundled instead of --shared; that's what we do and without bundled
+ we don't get the info with unopkg list
+ * debian/rules:
+ - strip ure from uno-libs3.substvars again after the .symbols change
+ (closes: #667465)
+ * debian/libreoffice-core.preinst.in: silence rmdir
+ * debian/rules, debian/control.in, debian/*.triggers.in,
+ debian/scripts/gid2pkgdirs.sh: split script-provider-for-python out of
+ python(3)-uno out to libreoffice-script-provider-python where it belongs
+ * debian/control.in:
+ - build-conflict against
+ gcc (>= 4.7~) [!i386 !amd64], g++ (>= 4.7~) [!i386 !amd64]
+
+ -- Rene Engelhard <rene@debian.org> Fri, 06 Apr 2012 16:02:58 +0200
+
libreoffice (1:3.5.2-1) unstable; urgency=low
* LibreOffice 3.5.2 final (same as rc2)
diff --combined control
index 5d0a1a9,8a1c14d..4e8d077
--- a/control
+++ b/control
@@@ -3,9 -3,9 +3,9 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.7 [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.7 [hppa kfreebsd-i386 kfreebsd-amd64], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6
.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfree
bsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev [!s390x], dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5
-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.7 [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.7 [hppa kfreebsd-i386 kfreebsd-amd64], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, pytho
n (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc
64 !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev [!s390x], dmake (>= 1:4.11), libhunspell-dev
(>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev, liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
- Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, 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], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
+ Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, 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], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4.7~) [!i386 !amd64], g++ (>= 4.7~) [!i386 !amd64], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -354,13 -354,13 +354,13 @@@ Description: office productivity suite
to E-Mail.
Package: python-uno
- Provides: ${python:Provides}, libreoffice-script-provider-python
+ Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
- Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+ Conflicts: python3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -370,7 -370,6 +370,6 @@@
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: python3-uno
- Provides: libreoffice-script-provider-python
Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
@@@ -423,6 -422,23 +422,23 @@@ Description: office productivity suite
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
+ Package: libreoffice-script-provider-python
+ Architecture: all
+ Section: python
+ Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3-uno, ${misc:Depends}
+ Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
+ Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+ Description: Python script support provider for LibreOffice scripting framework
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Scripting Framework allows LibreOffice users to write and run macros
+ in multiple languages including LibreOffice Basic, Python, Java, BeanShell
+ and JavaScript. These macros can then be assigned to menus, toolbars,
+ keyboard shortcuts, events and embedded objects.
+ .
+ This package contains the script provider to support Python.
+
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
diff --combined rules
index c89493f,4f16f49..6184b02
--- 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
@@@ -177,6 -176,7 +177,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
@@@ -188,7 -188,6 +188,7 @@@ NEON_SECTYPE=openss
NEONSONR=27
SYSTEM_STUFF += redland
PACKAGE_SDK=y
+PACKAGE_SDK_DOCS=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
RUN_MAKE_CHECK=y
@@@ -287,8 -286,6 +287,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= \
@@@ -397,7 -394,7 +397,7 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
ENABLE_MEDIAWIKI=n
ENABLE_REPORTDESIGN=n
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher -Nlibreoffice$(VER)-script-provider-python
endif
ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
@@@ -464,7 -461,7 +464,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
@@@ -509,13 -506,6 +509,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"
@@@ -931,10 -921,6 +931,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)
@@@ -954,19 -940,12 +954,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
@@@ -1054,11 -1033,18 +1054,11 @@@ ifeq "$(BUILD_BINFILTERS)" "y
endif
ifneq "$(BUILD_PYUNO)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-python
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)~)
@@@ -1604,7 -1590,11 +1604,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
@@@ -1661,6 -1651,7 +1661,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
@@@ -2164,7 -2155,7 +2164,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 \
@@@ -2175,12 -2166,7 +2175,7 @@@
debian/python3-uno/$(OODIR)/share/Scripts
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
- rm -f debian/python-uno/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
- ifeq "$(ENABLE_PYTHON3)" "y"
- mkdir -p debian/python3-uno/$(OODIR)/share/extensions
- cp -ra debian/python-uno/$(OODIR)/share/extensions/* \
- debian/python3-uno/$(OODIR)/share/extensions
- endif
+ rm -f debian/libreoffice$(VER)-script-provider-python/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
mkdir -p debian/python-uno/usr/share/doc/python-uno
@@@ -2244,7 -2230,7 +2239,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'; \
@@@ -2823,7 -2809,7 +2818,7 @@@ ifeq "$(ENABLE_LIBRSVG)" "y
endif
endif
# don't make uno-libs3 depend on ure...
- perl -pi -e 's/, ure \(.*\)$$//' debian/uno-libs3.substvars
+ perl -pi -e 's/, ure$$//' debian/uno-libs3.substvars
# .. and prevent ure to depend on itself..
perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2867,6 -2853,7 +2862,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)' \
@@@ -2897,7 -2884,7 +2892,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
@@@ -2980,7 -2967,9 +2975,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 \
@@@ -2995,6 -2984,8 +2990,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)' \
@@@ -3007,6 -2998,7 +3002,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
@@@ -3015,7 -3007,7 +3010,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: