[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-6-123-gbd863f9
The following commit has been merged in the debian-experimental-3.6 branch:
commit bd863f954847158bd3acf7cf4b99b19a18f94805
Merge: 06efd0daa8d6d596792324e36cf7ad86dd18dceb cc5326462f648b9adddc353a062f71455872d6e8
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 20 21:35:23 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.6
diff --combined changelog
index 38943fe,5b0e865..def3151
--- a/changelog
+++ b/changelog
@@@ -1,41 -1,18 +1,56 @@@
+libreoffice (1:3.6.0~rc2-1) UNRELEASED; urgency=low
+
+ [ Rene Engelhard ]
+ * new upstream release candidate
+ - fixes splashscreen location in multi-monitor setups
+ (closes: #657444, #431473)
+ - caches fontconfig font substitutions (closes: #631308)
+
+ * debian/patches/build-dont-run-checks.diff: as name says
+
+ * debian/rules:
+ - new conditionals for: doxygen, libcdr, liblcms2
+ - remove liblucene2-java stuff; now clucene is used
+ - build-depend on libxml2-utils, xmllint now needed
+ - build-depend on liboost-date-time-date, we now link to boost...
+ - disable binfilter for now (checkdll segfaults...)
+ - build-depend against libpng-dev instead of libpng12-dev
+ (closes: #662411)
+ - remove squeeze-backports stuff, add wheezy-backports
+ - install upstreams README(_en-US) (closes: #676340)
+ - clean up some warnings:
+ + readd /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+ to LD_LIBRARY_PATH for dh_shlibdeps
+ + don't run jh_depends -i/-a, use -p for each package, otherwise it
+ gets confused by help.jar/s*.jar which is just zips, no "real" jar
+ - switch to default-jdk, b-d on default-jdk (>= 1:1.7-48) on ia64 and
+ check for "OpenJDK" in tests yes/no clause for JDK=default
+ - add ENABLE_HELP conditional now that we have --without-help; also
+ add the new --disable-extensions and --disable-database-connectivity to
+ their respective places
+ - split build into build-{arch,indep}
+ * debian/uno-libs3.symbols: update
+
+ [Björn Michaelsen]
+ * force disable HAVE_CXX0X for ABI incompatibilty
+
+ -- Rene Engelhard <rene@debian.org> Thu, 03 May 2012 13:44:05 +0200
+
+ libreoffice (1:3.5.4-6) unstable; urgency=medium
+
+ * debian/patches/CVE-2012-2334-clip-max-entries.diff: add additional
+ fix for CVE-2012-2334 from Florian Weimer which we missed to apply
+ so far..
+
+ * debian/templates/soffice-template.desktop.in: fix Icon= (remove
+ obsolete 3), thanks Miros◈aw Zalewski (closes: #678313)
+ * debian/control.in: make -filter-mobiledev Break libreoffice-core
+ (<< 1:3.5~) (closes: #633929)
+ * debian/control.mediawiki.in: add missing epoch to -core dependency
+ * debian/rules: re-enable -gcj
+
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Jul 2012 20:21:31 +0200
+
libreoffice (1:3.5.4-5) unstable; urgency=low
* debian/patches/evolution-3.4.diff: as name says,
diff --combined control
index e9364f1,bf6a5a6..0ab4a90
--- 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.4 [mips mipsel], g++-4.4 [mips mipsel], 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), gdb, 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), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-j
ava (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), 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:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, 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-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), 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), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
+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.4 [mips mipsel], g++-4.4 [mips mipsel], 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, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng-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), gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [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), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), 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), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-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 (>= 0.2.1), liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~)
, libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), 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-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh (>= 2.0
b4), 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), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], base-files (= 7.0), 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
@@@ -400,6 -400,7 +400,7 @@@ Package: libreoffice-filter-mobilede
Section: misc
Architecture: all
Depends: ${java-runtime-depends}, ${java-common-depends}, ${java:Depends}, ${misc:Depends}
+ Breaks: libreoffice-core (<< 1:3.5~)
Description: office productivity suite -- mobile devices filters
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -3113,6 -3114,20 +3114,20 @@@ Description: LibreOffice UNO runtime en
.
This package contains the (detached) debug symbols for the URE.
+ Package: libreoffice-gcj
+ Architecture: hppa kfreebsd-amd64 kfreebsd-i386
+ Section: java
+ Depends: ${shlibs:Depends}, gcj-jre, libreoffice-core (= ${binary:Version}), libreoffice-java-common (= ${source:Version}), ${java:Depends}, ${java-gcj-depends}, ${misc:Depends}
+ Enhances: libreoffice-writer, libreoffice-base
+ Description: office productivity suite -- Java libraries for GIJ
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the .jars from libreoffice-java-common compiled to
+ native to make the Java features of LibreOffice faster when using gij.
+ .
+ This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
+
Package: libreoffice-ogltrans
Section: graphics
Priority: extra
@@@ -3131,7 -3146,7 +3146,7 @@@ Package: libreoffice-wiki-publishe
Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
- Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends}
+ Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 1:3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends}
Enhances: libreoffice-writer
Recommends: ${lucene-depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
@@@ -3361,3 -3376,20 +3376,3 @@@ Description: office productivity suite
This package allows LibreOffice to access Evolution address books.
You need to install evolution separately.
-Package: libreoffice-filter-binfilter
-Section: misc
-Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the "binfilters", legacy filters for
- - the old StarOffice 5.2 formats
- - StarWriter 1.0/2.0
- - StarWriter/DOS
- - *Writer* filters for
- + Excel
- + Lotus
-
diff --combined rules
index 2205639,939fef0..e53f9f4
--- a/rules
+++ b/rules
@@@ -21,9 -21,9 +21,9 @@@ CURDIR ?= $(realpath $(dir $(firstword
BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d: -f1):$(DEB_VERSION_UPSTREAM)
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
-HELP_L10N_VIRTUAL_VERSION:=3.5
+HELP_L10N_VIRTUAL_VERSION:=3.6
#VER:=3
-OOVER:=3.5
+OOVER:=3.6
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -69,18 -69,18 +69,18 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.4.2
-# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.4.2 libreoffice-3.5.4.2
+lo_sources_ver=3.6.0.2
+# NOT in proper libreoffice-3-6 branch
+# use ./g checkout -b tag-libreoffice-3.6.0.2 libreoffice-3.6.0.2
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
+GIT_BRANCH=libreoffice-3-6-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
endif
-ifeq "$(DISTREL)" "squeeze"
- SQUEEZE_BACKPORT=y
+ifeq "$(DISTREL)" "wheezy"
+ WHEEZY_BACKPORT=y
endif
#########
@@@ -121,12 -121,11 +121,12 @@@ ifeq "$(ENABLE_PYTHON3)" "y
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
-BUILD_BINFILTERS=y
+BUILD_BINFILTERS=n
BUILD_ONLY_EN_US=n
+ENABLE_HELP=y
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
- JDK=openjdk
+ JDK=default
JAVA_MAINVER=6
ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
JDK=gcj-jdk
@@@ -156,7 -155,6 +156,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
@@@ -189,6 -187,7 +189,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
@@@ -200,21 -199,10 +200,21 @@@ 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
- ENABLE_JUNIT4=y
+ ifeq "$(JDK)" "default"
+ ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
+ RUN_MAKE_CHECK=y
+ ENABLE_JUNIT4=y
+ endif
+ else
+ ifeq "$(JDK)" "openjdk"
+ RUN_MAKE_CHECK=y
+ ENABLE_JUNIT4=y
+ else
+ RUN_MAKE_CHECK=n
+ ENABLE_JUNIT4=n
+ endif
endif
else
RUN_MAKE_CHECK=n
@@@ -301,14 -289,11 +301,14 @@@ SYSTEM_STUFF += d
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
-SYSTEM_STUFF += sampleicc
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661703
+#SYSTEM_STUFF += clucene
+SYSTEM_STUFF += lcms2
PACKAGE_UNOWINREG_DLL=y
ifeq "$(DEB_VENDOR)" "Debian"
BUILD_UNOWINREG_DLL=y
endif
+FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -316,9 -301,11 +316,9 @@@
--with-install-dirname=$(OODIRNAME) \
--prefix=/usr --mandir=/usr/share/man \
--docdir=/usr/share/doc/libreoffice \
--enable-lockdown \
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --enable-extension-integration \
--disable-online-update \
--disable-fetch-external \
--enable-release-build \
@@@ -410,7 -397,6 +410,7 @@@ ifneq (,$(findstring $(DEB_HOST_ARCH),$
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-evolution -Nlibreoffice$(VER)-kab
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-sdbc-postgresql -Nlibreoffice$(VER)-mysql-connector
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ CONFIGURE_FLAGS += --disable-database-connectivity
endif
endif
@@@ -429,9 -415,6 +429,9 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
ENABLE_REPORTDESIGN=n
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher -Nlibreoffice$(VER)-script-provider-python
+ CONFIGURE_FLAGS += --disable-extension-integration --disable-extensions
+else
+ CONFIGURE_FLAGS += --enable-extension-integration
endif
ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
@@@ -460,7 -443,7 +460,7 @@@ ifeq (ia64,$(findstring ia64,$(OOO_OPEN
endif
endif
ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=n
+ BUILD_JARS_NATIVE=y
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
@@@ -490,9 -473,12 +490,9 @@@ ifeq "$(DEB_VENDOR)" "Debian
endif
# Debian Squeeze
-ifeq "$(SQUEEZE_BACKPORT)" "y"
+ifeq "$(WHEEZY_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))
- JUNIT_MIN_VER=
- PARALLEL_BUILD=n
- ENABLE_PDFIMPORT=n
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene, $(SYSTEM_STUFF))
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@@ -501,10 -487,7 +501,10 @@@ CC_PREFIX:=$(shell gcc -dumpmachine)
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
- BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
+ BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
+ CONFIGURE_FLAGS+= \
+ CC=$(CC_PREFIX)gcc-$(GCC_VERSION) \
+ CXX=$(CC_PREFIX)g++-$(GCC_VERSION)
endif
endif
@@@ -521,13 -504,6 +521,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_INDEP += , doxygen
+ endif
endif
ifneq "$(ENABLE_MINIMIZER)" "y"
@@@ -574,7 -550,7 +574,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
@@@ -591,7 -567,7 +591,7 @@@ ifneq (,$(filter xextensions-headers, $
BUILD_DEPS += , libxrender-dev
endif
ifneq (,$(filter libpng, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libpng12-dev
+ BUILD_DEPS += , libpng-dev
endif
ifeq (,$(filter curl, $(SYSTEM_STUFF)))
@@@ -600,7 -576,11 +600,7 @@@ endi
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
BUILD_DEPS += , libssl-dev
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut -d"." -f3,4,5)-dbg
- else
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libssl.so | cut -d"." -f3,4,5)-dbg
- endif
endif
ifneq "$(ENABLE_RSVG)" "y"
@@@ -698,11 -678,7 +698,11 @@@ endi
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ ifeq "$(ENABLE_HELP)" "n"
+ HELPISOS=
+ else
HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ endif
LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
else
# Note that the first one here *has to be* en-US. the first one gets
@@@ -716,13 -692,9 +716,13 @@@
ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
+ ifeq "$(ENABLE_HELP)" "n"
+ HELPISOS:=
+ else
#HELPISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
HELPISOS:=en-US ca ca-XV cs da de dz el en-GB es et eu fi fr gl hi hu it \
ja km ko nl om pl pt pt-BR ru sk sl sv zh-CN zh-TW
+ endif
#LANGPACKISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
@@@ -732,11 -704,7 +732,11 @@@
endif
else
ISOS=en-US
+ ifeq "$(ENABLE_HELP)" "n"
+ HELPISOS=
+ else
HELPISOS=en-US
+ endif
LANGPACKISOS=en-US
endif
BUILD_ISOS = $(ISOS)
@@@ -748,13 -716,9 +748,13 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
endif
ifeq "$(ENABLE_JAVA)" "y"
+ CONFIGURE_FLAGS += --with-java-target-version=1.5
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
- BUILD_DEPS += , default-jdk$(OOO_NO_JAVA_ARCHS)
+ BUILD_DEPS += , default-jdk$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))
+ ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
+ BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64]
+ endif
endif
ifeq "$(JDK)" "java-gcj-compat"
JAVA_HOME=/usr/lib/jvm/java-gcj
@@@ -767,19 -731,22 +767,19 @@@
BUILD_DEPS += , gcj-jdk$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(JDK)" "openjdk"
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
- JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk
- else
- ifeq "$(JAVA_MAINVER)" "6"
+ ifeq "$(JAVA_MAINVER)" "6"
BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2) [$(filter-out ia64,$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))])
+ # except on ia64, which doesn't build with 6...
+ ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
BUILD_DEPS += , openjdk-7-jdk [ia64]
ifeq "$(DEB_HOST_ARCH)" "ia64"
- JAVA_MAINVER=7
+ JAVA_MAINVER=7
endif
- else
- BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
endif
- JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
+ else
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
endif
- CONFIGURE_FLAGS += --with-java-target-version=1.5
+ JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
endif
TEST_JAVA_HOME=$(JAVA_HOME)
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@@ -792,7 -759,11 +792,7 @@@
BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
-ifeq "$(SQUEEZE_BACKPORT)" "y"
- GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
-else
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_JDK_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
-endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
# ifneq (,$(GCJ_JAWT_DEPENDS))
@@@ -824,8 -795,13 +824,8 @@@ export JAVA_HOM
ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
ifeq "$(BUILD_UNOWINREG_DLL)" "y"
CONFIGURE_FLAGS += --enable-build-unowinreg
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += , gcc-mingw32 [$(OOO_UNOWINREG_DLL_ARCHS)], mingw32-runtime[$(OOO_UNOWINREG_DLL_ARCHS)]
- CONFIGURE_FLAGS += --with-mingw-cross-compiler=i586-mingw32msvc-g++
- else
BUILD_DEPS += , g++-mingw-w64-i686 [$(OOO_UNOWINREG_DLL_ARCHS)]
CONFIGURE_FLAGS += --with-mingw-cross-compiler=i686-w64-mingw32-g++
- endif
endif
endif
endif
@@@ -834,11 -810,16 +834,11 @@@
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java$(OOO_NO_JAVA_ARCHS), libcommons-httpclient-java$(OOO_NO_JAVA_ARCHS), libcommons-lang-java$(OOO_NO_JAVA_ARCHS), libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
- BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
+ BUILD_DEPS_INDEP += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-commons-codec-jar=/usr/share/java/commons-codec.jar --with-commons-lang-jar=/usr/share/java/commons-lang.jar --with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar --with-commons-logging-jar=/usr/share/java/commons-logging.jar
CONFIGURE_FLAGS += --with-system-servlet-api
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += (<< 1.1.1-9), $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
- CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
- else
- BUILD_DEPS += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
+ BUILD_DEPS_INDEP += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
- endif
endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
@@@ -846,15 -827,20 +846,15 @@@
ifneq (,$(filter jfreereport, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += , libbase-java$(OOO_NO_REPORTDESIGN_ARCHS), libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java (>= 0.9.4)$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java (>= 0.2.10)$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java (>= 1.1.7)$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libfonts-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libserializer-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS)
REPORT_BUILDER_JAR_DEPENDS := , libbase-java, libsac-java, libxml-java (>= 1.1.6), libflute-java (>= 1.1.6), libpentaho-reporting-flow-engine-java (>= 0.9.4), liblayout-java (>= 0.2.10), libloader-java (>= 1.1.6), libformula-java (>= 1.1.7), librepository-java (>= 1.1.6), libfonts-java (>= 1.1.6), libserializer-java (>= 1.1.6)
- BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
+ BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/libbase.jar --with-libxml-jar=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute.jar --with-jfreereport-jar=/usr/share/java/flow-engine.jar --with-liblayout-jar=/usr/share/java/liblayout.jar --with-libloader-jar=/usr/share/java/libloader.jar --with-libformula-jar=/usr/share/java/libformula.jar --with-librepository-jar=/usr/share/java/librepository.jar --with-libfonts-jar=/usr/share/java/libfonts.jar --with-libserializer-jar=/usr/share/java/libserializer.jar
endif
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += (<< 1.1.1-9), $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
- CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
- else
- BUILD_DEPS += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
+ BUILD_DEPS_INDEP += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
- endif
endif
else
CONFIGURE_FLAGS += --disable-ext-report-builder
@@@ -906,19 -892,19 +906,19 @@@ endi
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
ifeq "$(BOOST_VERSION)" "1.34"
ifeq "$(SYSTEM_GCC_VERSION)" "4.4"
- BUILD_DEPS += , libboost-dev (>= 1.34.1-15)
+ BUILD_DEPS += , libboost-dev (>= 1.34.1-15), libboost-date-time-dev (>= 1.34.1-15)
else
- BUILD_DEPS += , libboost-dev
+ BUILD_DEPS += , libboost-dev, libboost-date-time-dev
endif
ifeq "$(SYSTEM_GCC_VERSION)" "4.6"
BUILD_DEPS += , g++-4.6 (>= 4.6.2-12)
endif
else
ifneq "$(BOOST_VERSION)" "default"
- BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER)
+ BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost$(BOOST_VERSION)-date-time-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
else
- BUILD_DEPS += , libboost-dev $(BOOST_MINVER)
+ BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
endif
endif
@@@ -932,8 -918,8 +932,8 @@@ ifneq (,$(filter vigra, $(SYSTEM_STUFF)
BUILD_DEPS += , libvigraimpex-dev
endif
-ifneq (,$(filter sampleicc, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libsampleicc-dev, libicc-utils-dev
+ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libclucene-dev
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
@@@ -955,19 -941,12 +955,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
+ BUILD_DEPS += , libcmis-dev (>= 0.2.1)
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
@@@ -1065,6 -1044,13 +1065,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)~)
@@@ -1077,7 -1063,7 +1077,7 @@@
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
- BUILD_DEPS += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
+ BUILD_DEPS_INDEP += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
BSH_DEPENDS = bsh (>= 2.0b4)
JAVA_GCJ_DEPENDS += , bsh-gcj [$(OOO_GCJ_ARCHS)]
endif
@@@ -1131,8 -1117,8 +1131,8 @@@ ifneq (,$(filter neon, $(SYSTEM_STUFF))
endif
endif
-ifeq "$(HELPISOS)" ""
- CONFIGURE_FLAGS += --without-helppack-integration
+ifeq "$(ENABLE_HELP)" "n"
+ CONFIGURE_FLAGS += --without-helppack-integration --without-help
endif
ifneq (,$(filter redland, $(SYSTEM_STUFF)))
@@@ -1334,7 -1320,9 +1334,7 @@@ endi
FONT_SUGGESTS=", ttf-dzongkha"; \
;; \
th) \
- if [ "$(SQUEEZE_BACKPORT)" != "y" ]; then \
- FONT_SUGGESTS=", fonts-thai-tlwg"; else \
- FONT_SUGGESTS=", ttf-thai-tlwg"; fi; \
+ FONT_SUGGESTS=", fonts-thai-tlwg"; \
;; \
*) \
FONT_SUGGESTS= ;; \
@@@ -1368,7 -1356,7 +1368,7 @@@
>> debian/control < debian/control.lang.in; \
done
-ifneq "$(HELPISOS)" ""
+ifneq "$(ENABLE_HELP)" "n"
for LNUM in $(HELPISOS) ; do \
LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
@@@ -1389,10 -1377,10 +1389,10 @@@ endi
>> debian/control < debian/control.ure.in
ifeq "$(ENABLE_JAVA)" "y"
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
- ifeq "$(BUILD_JARS_NATIVE)" "y"
+ # ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.gcj.in
- endif
+ # endif
endif
endif
ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
@@@ -1493,8 -1481,8 +1493,8 @@@ ifeq "$(ENABLE_GIO)" "y
perl -pi -e 's/GNOME GIO/GIO/' debian/control
endif
-ifneq "$(SQUEEZE_BACKPORT)" "y"
- perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 6.0), base-files (= 6.0squeeze1)/" debian/control
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 7.0)/" debian/control
endif
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
@@@ -1534,6 -1522,10 +1534,6 @@@ endi
.DELETE_ON_ERROR: debian/control
-build: build-arch build-indep
-build-arch: $(STAMP_DIR)/build
-build-indep: $(STAMP_DIR)/build
-
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
# indirection is needed so that the 'stamp' files that signify when a rule is
@@@ -1544,8 -1536,7 +1544,8 @@@
# so that the target will not be run again. Removing the file will make
# make run the target over.
-config.status:
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare:
dh_testdir
# Make sure needed scripts are executable
@@@ -1560,6 -1551,29 +1560,6 @@@
mkdir -p $(STAMP_DIR)
-ifneq ($(GCC_VERSION),)
- ifneq ($(GCC_VERSION),snapshot)
- # create links for gcc and g++ (and gij and gcj), ooo-build does not
- # honour overriding CC and CXX and we need to use gcc/g++ 4.0 or /
- # ant.mk wants gcj at the moment...
- mkdir -p $(CURDIR)/debian/usr/bin
- ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc
- ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++
- ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)gcc
- ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)g++
- #ln -sf /usr/bin/$(CC_PREFIX)gcj-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcj
- #ln -sf /usr/bin/gij-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gij
- else
- ifneq "$(CC_PREFIX)" ""
- mkdir -p $(CURDIR)/debian/usr/bin
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcc $(CURDIR)/debian/usr/bin/gcc
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)g++ $(CURDIR)/debian/usr/bin/g++
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcj $(CURDIR)/debian/usr/bin/gcj
- ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gij $(CURDIR)/debian/usr/bin/gij
- endif
- endif
-endif
-
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
@@@ -1571,26 -1585,18 +1571,26 @@@ ifneq "$(PACKAGE_UNOWINREG_DLL)" "y
fi
endif
endif
- # FIXME: Theoretically this should call ./configure instead of
- # it exists but that causes the configure flags NOT to be hnoured
- # somehow...
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS)
-
touch $@
-build: $(STAMP_DIR)/build
-#$(STAMP_DIR)/build: config.status | src/fetch.log
-$(STAMP_DIR)/build: config.status
+build:
+ $(CURDIR)/debian/rules build-arch
+ $(CURDIR)/debian/rules build-indep
+ touch $(STAMP_DIR)/$@
+
+build-arch: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/build-arch:
+#build-arch: ENABLE_HELP = n PACKAGE_SDK_DOCS = n ENABLE_MEDIAWIKI = n ENABLE_REPORTDESIGN = n ENABLE_SCRIPT_PROVIDER_BSH = n ENABLE_SCRIPT_PROVIDER_JS = n
dh_testdir
+ # FIXME: Theoretically this should call ./configure instead of
+ # it exists but that causes the configure flags NOT to be hnoured
+ # somehow...
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) \
+ --without-help --without-doxygen --disable-ext-wiki-publisher \
+ --disable-ext-report-builder --disable-ext-scripting-javascript \
+ --disable-ext-scripting-beanshell
+
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS= gb_Deliver_HARDLINK=T
ifeq "$(BUILD_PYUNO)" "y"
@@@ -1599,10 -1605,11 +1599,10 @@@
# 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!
+ . $(SOURCE_TREE)/config_host.mk.source; \
+ cd pyuno-py3 && \
+ rm -rf $$OUTPATH$$PROEXT; \
+ 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
endif
endif
@@@ -1612,21 -1619,6 +1612,21 @@@ endi
touch $@
+build-indep: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch $(STAMP_DIR)/build-indep
+$(STAMP_DIR)/build-indep:
+ dh_testdir
+
+ $(MAKE) scripting.clean
+ $(MAKE) odk.clean
+ $(MAKE) scp2.clean
+ rm -f config.status autogen.lastrun
+
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS)
+
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS= gb_Deliver_HARDLINK=T
+
+ touch $@
+
check:
ifeq "$(RUN_MAKE_CHECK)" "y"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@@ -1673,6 -1665,7 +1673,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
@@@ -1736,7 -1729,7 +1736,7 @@@ endi
perl -pi -e 's,\./,,' debian/libreoffice$(VER)-common.install
perl -pi -e 's,\./,,' debian/ure.install
-ifneq "$(HELPISOS)" ""
+ifneq "$(ENABLE_HELP)" "n"
# remove non-packaged localized help. This a) saves space
# and b) we need this for the following dh_install as there will be
# no .install files created and dh_install will warn/fail due
@@@ -1890,7 -1883,7 +1890,7 @@@ $(STAMP_DIR)/maintscripts: $(wildcard d
# Install files generated by setup into package directories
langpacks: $(STAMP_DIR)/langpacks
-$(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep $(SOURCE_TREE)/bin/lo-xlate-lang
+$(STAMP_DIR)/langpacks: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install $(STAMP_DIR)/install-indep $(SOURCE_TREE)/bin/lo-xlate-lang
# remove empty uno_packages dirs somehow in the langpacks(?)
for iso in `echo $(LANGPACKISOS) | tr A-Z a-z`; do \
@@@ -2188,7 -2181,7 +2188,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 . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/lib/$$i \
debian/python3-uno/$(OODIR)/program/$$i; \
done
cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@@ -2267,7 -2260,7 +2267,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 . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@@ -2303,7 -2296,7 +2303,7 @@@ ifeq "$(PACKAGE_SDK)" "y
ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java
- cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin && \
+ cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/pck && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@@ -2356,9 -2349,9 +2356,9 @@@ endi
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal \
+# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal \
# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
#endif
@@@ -2396,7 -2389,7 +2396,7 @@@ install-indep: $(STAMP_DIR)/install-ind
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).install
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER)-mimelnk.install
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).dirs
-$(STAMP_DIR)/install-indep: $(STAMP_DIR)/install
+$(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install
dh_testdir
dh_testroot
@@@ -2420,15 -2413,15 +2420,15 @@@ endi
install -m755 $(SOURCE_TREE)/bin/lo-xlate-lang \
$(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
-ifeq "$(HELPISOS)" ""
+ifeq "$(ENABLE_HELP)" "n"
# when we don't build helpcontent2 here we are missing helpxsl.zip so
# this file doesn't get installed either. Do it manually..
mkdir -p -m755 $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/help && \
- cp $(SOURCE_TREE)/helpcontent2/source/auxiliary/main_transform.xsl \
+ cp $(SOURCE_TREE)/xmlhelp/util/main_transform.xsl \
$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/help
- cp $(SOURCE_TREE)/helpcontent2/source/auxiliary/idxcaption.xsl \
+ cp $(SOURCE_TREE)/xmlhelp/util/idxcaption.xsl \
$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/help
- cp $(SOURCE_TREE)/helpcontent2/source/auxiliary/idxcontent.xsl \
+ cp $(SOURCE_TREE)/xmlhelp/util/idxcontent.xsl \
$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/help
endif
@@@ -2573,7 -2566,7 +2573,7 @@@ endi
install -m 644 debian/soffice.sh \
$(PKGDIR)-common/etc/$(OODIRNAME)/soffice.sh
-ifeq "$(HELPISOS)" ""
+ifeq "$(ENABLE_HELP)" "n"
# the helpimgs are not included when we don't build with help here.
# Add them now because libreoffice-help-* packaged in contrib or so
# will need them
@@@ -2600,9 -2593,6 +2600,9 @@@ endi
mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
$(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/; \
+ mkdir -p $(PKGDIR)-style-$$p/$(OODIR)/share/config; \
+ ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
+ $(PKGDIR)-style-$$p/$(OODIR)/share/config/$$z; \
done
rm -rf debian/openoffice.org-dtd-officedocument1.0
@@@ -2708,12 -2698,10 +2708,12 @@@ endi
install -D -m644 debian/shell-lib-extensions.sh \
$(PKGDIR)-common/usr/share/$(OODIRNAME)/shell-lib-extensions.sh
+ifneq "$(ENABLE_HELP)" "n"
# those are needed in /usr/share, too
mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)
mv $(PKGDIR)-common/$(OODIR)/help \
$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)
+endif
# help is in /usr/share
sed -i 's,$$(instpath)/help,/$(shell echo $(OODIR) | sed -e s/lib/share/)/help,' \
$(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
@@@ -2748,13 -2736,13 +2748,13 @@@
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+# install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/maintscripts
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/build-arch $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/maintscripts
dh_testdir
dh_testroot
@@@ -2763,13 -2751,7 +2763,13 @@@
rm -rf debian/$$pkg/DEBIAN;\
done
- dh_installdocs -s -A debian/README.Debian
+ dh_installdocs -s -A
+ for p in $(ARCH_DEP_PACKAGES); do \
+ cat readlicense_oo/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
+ | sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
+ | sed -e 's/$${PRODUCTVERSION}/3.6/g' \
+ > debian/$$p/usr/share/doc/$$p/README; \
+ done
dh_installdebconf -s
dh_installman -s
for i in writer calc draw base math impress; do \
@@@ -2815,8 -2797,8 +2815,8 @@@ els
endif
dh_icons -s
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')~), ure" -- -c0 -v`echo $(BINARY_VERSION) | cut -d: -f2`
- dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')~)" -- -v`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~), ure" -- -c0 -v`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -v`echo $(BINARY_VERSION) | cut -d: -f2`
# ugly hack, but why does that happen? It's not in .symbols...
TMP=`mktemp -q`; \
grep -v PRIVATE debian/uno-libs3/DEBIAN/symbols > $$TMP && \
@@@ -2836,7 -2818,7 +2836,7 @@@ endi
# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
- LD_LIBRARY_PATH="debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program" \
+ LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program" \
dh_shlibdeps -s -Nlibreoffice$(VER)-officebean \
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(shell dirname $(shell dpkg -L `echo $(GCJ_JAWT_DEPENDS) | sed -e s/-awt//` | grep _bc)) \
@@@ -2860,7 -2842,7 +2860,7 @@@ endi
# .. and prevent ure to depend on itself..
perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
ifeq "$(ENABLE_JAVA)" "y"
- LD_LIBRARY_PATH="debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+ LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -plibreoffice$(VER)-officebean \
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
@@@ -2870,10 -2852,7 +2870,10 @@@ ifeq "$(LINK_TO_STLPORT)" "y
perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/libstlport4.6*.shlibs | awk '{ print $$3,$$4,$$5 }')/' debian/ure.substvars
endif
ifeq "$(ENABLE_JAVA)" "y"
- jh_depends -s -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure
+ for p in $(ARCH_DEP_PACKAGES); do \
+ if [ "$$p" = "libreoffice$(VER)-presentation-console" ]; then continue; fi; \
+ jh_depends -p$$p -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure; \
+ done
ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice$(VER)-base.substvars
@@@ -2903,6 -2882,7 +2903,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)' \
@@@ -2933,7 -2913,7 +2933,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 . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
endif
endif
@@@ -2996,13 -2976,7 +2996,13 @@@ ifeq "$(PACKAGE_SDK)" "y
# But fix it..
perl -pi -e 's,html/,html /,g' debian/libreoffice-dev-doc.doc-base.udk-common-ref
endif
- dh_installdocs -i -A debian/README.Debian
+ dh_installdocs -i -A
+ for p in $(ARCH_DEP_PACKAGES); do \
+ cat readlicense_oo/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
+ | sed -e "s/$${PRODUCTNAME}/LibreOffice/g" \
+ | sed -s "s/$${PRODUCTVERSION}/3.6/g" \
+ > debian/$$p/usr/share/doc/$$p/README; \
+ done
dh_installman -i
for i in `find $(PKGDIR)-common -type l -name "lo*.1"`; do \
mv $$i $$i.gz; \
@@@ -3021,10 -2995,9 +3021,10 @@@
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
+ for p in $(ARCH_INDEP_PACKAGES); do \
+ if echo "$$p" | grep -q help; then continue; fi; \
+ jh_depends -p$$p -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg; \
+ done
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
@@@ -3039,6 -3012,8 +3039,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)' \
@@@ -3051,6 -3026,7 +3051,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
@@@ -3059,7 -3035,7 +3059,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/util/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`
@@@ -3152,8 -3128,8 +3152,8 @@@ endi
.PHONY: control
-.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure
-.PHONY: build build-indep build-arch install-arch install-indep
+.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default
+.PHONY: prepare build build-indep build-arch install-arch install-indep
.PHONY: get-orig-source unpack patched
.PHONY: $(stampdir_targets)
--
LibreOffice packaging repository
Reply to: