[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.4_rc1-1-2-g6045b8f
The following commit has been merged in the debian-experimental-3.6 branch:
commit 6045b8f15da8ca120df50f91eb27ce8357b8c33b
Merge: d1333e1f51ce2a24b394e304baebc25c04d9c45f 069c14834faa1bb379954ceaf33d6125032e9286
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 16 23:43:13 2012 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.5' into debian-experimental-3.6
diff --combined rules
index ec10caf,b41fe49..21f48bc
--- 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.7.2
-# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.7.2 libreoffice-3.5.7.2
+lo_sources_ver=3.6.4.1
+# NOT in proper libreoffice-3-6 branch
+# use ./g checkout -b tag-libreoffice-3.6.4.1 libreoffice-3.6.4.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
+GIT_BRANCH=libreoffice-3-6-4
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
#########
@@@ -123,10 -123,9 +123,10 @@@ endi
PACKAGE_TTF_OPENSYMBOL=y
BUILD_BINFILTERS=y
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
@@@ -261,7 -249,7 +261,7 @@@ ENABLE_GCONF=
ENABLE_GIO=y
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
- PACKAGE_NSPLUGIN=n
+ PACKAGE_NSPLUGIN=y
ifeq "$(PACKAGE_NSPLUGIN)" "y"
SYSTEM_STUFF += mozilla-headers
endif
@@@ -301,13 -289,11 +301,13 @@@ SYSTEM_STUFF += d
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
-SYSTEM_STUFF += sampleicc
+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= \
@@@ -315,9 -301,11 +315,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 \
@@@ -349,6 -337,13 +349,6 @@@ ifeq "$(DEB_HOST_ARCH)" "i386
LINK_TO_STLPORT=y
endif
-ifneq (,$(findstring mips,$(OOO_ARCHS)))
- BUILD_DEPS += , gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel]
- ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
- GCC_VERSION := 4.4
- endif
-endif
-
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on armel and mips(el), does it? :)
OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))
@@@ -402,7 -397,6 +402,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
@@@ -421,9 -415,6 +421,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)))
@@@ -452,7 -443,7 +452,7 @@@ ifeq (ia64,$(findstring ia64,$(OOO_OPEN
endif
endif
ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=y
+ BUILD_JARS_NATIVE=n
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
@@@ -473,13 -464,21 +473,13 @@@ OOO_BINFILTER_ARCHS:=$(filter-out arm%
# Debian
ifeq "$(DEB_VENDOR)" "Debian"
- # we don't need to build all languages and the thesaurus on the buildds;
- # they do binary-only builds anyway
- ifeq ($(ON_BUILDD),y)
- BUILD_ONLY_EN_US=y
- endif
CONFIGURE_FLAGS += --with-intro-progressbar-color=215,7,81
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))
@@@ -488,10 -487,7 +488,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
@@@ -508,13 -504,6 +508,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"
@@@ -557,7 -546,7 +557,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
@@@ -583,7 -572,11 +583,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"
@@@ -631,7 -624,7 +631,7 @@@ endi
PYMAJOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
PYMINOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]")
PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]+1")
- PYTHON_SITE:=debian/python-uno/$(shell $PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+ PYTHON_SITE:=debian/python-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
PY3MAJOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[0])")
PY3MINOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1])")
PY3MINORPLUS1:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1]+1)")
@@@ -677,11 -670,7 +677,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
@@@ -695,13 -684,9 +695,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 \
@@@ -711,29 -696,21 +711,29 @@@
endif
else
ISOS=en-US
+ ifeq "$(ENABLE_HELP)" "n"
+ HELPISOS=
+ else
HELPISOS=en-US
+ endif
LANGPACKISOS=en-US
endif
BUILD_ISOS = $(ISOS)
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifneq "$(BUILD_ISOS)" "en-US"
- CONFIGURE_FLAGS += --with-lang="$(BUILD_ISOS)"
+ CONFIGURE_FLAGS_LANG += --with-lang="$(BUILD_ISOS)"
endif
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
@@@ -746,19 -723,22 +746,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)" ""
@@@ -771,7 -751,11 +771,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_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))
@@@ -803,8 -787,13 +803,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
@@@ -813,11 -802,16 +813,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"
@@@ -825,15 -819,20 +825,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
@@@ -885,19 -884,19 +885,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
@@@ -911,8 -910,8 +911,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 (>= 2.3.3.4-2)
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
@@@ -934,19 -933,12 +934,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
@@@ -1044,6 -1036,13 +1044,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)~)
@@@ -1056,7 -1055,7 +1056,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
@@@ -1110,8 -1109,8 +1110,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)))
@@@ -1191,10 -1190,10 +1191,10 @@@ endi
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
# that match the given targets will be removed automagically.
-stampdir_targets=files.backup icons.scale patch.apply build.prepare.artwork
-stampdir_targets+=build.prepare configure
-stampdir_targets+=setupins setup install install-arch install-indep
-stampdir_targets+=langpacks binary-common binary-arch binary-indep
+stampdir_targets+=prepare
+stampdir_targets+=build build-arch build-indep maintscripts
+stampdir_targets+=install-common install-arch install-indep langpacks
+stampdir_targets+=binary-arch binary-indep
ifdef FORCE
DUMMY:=$(shell rm -f $(patsubst %,$(STAMP_DIR)/%,$(filter $(stampdir_targets),$(MAKECMDGOALS))))
endif
@@@ -1209,56 -1208,53 +1209,56 @@@
# Clean up the package directories (about 830M)
clean-debdir:
dh_testdir
+ # remove generated symlinks / java wrappers
+ rm -rf debian/usr
+
+ 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
+ rm -f debian/scripts/aotcompile.py*
+
+ rm -f l10n.fdupes
+ rm -f debian/shlibs.local
+ rm -f debian/*.templates
+
+ rm -f debian/libreoffice-dev-doc.doc-base.*
+ rm -f debian/*.menu
+ for i in base calc core common draw impress math writer; do \
+ rm -f debian/libreoffice-$$i.lintian-overrides; \
+ done
+ rm -f debian/*.install debian/*.dirs debian/*.changelog
+ rm -f debian/catalog.xml
+ rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/*.triggers
+
dh_clean
clean:
dh_testroot
dh_testdir
- # remove generated symlinks / java wrappers
- rm -rf debian/usr
-
if [ -f config.status ]; then \
$(MAKE) distclean; \
rm -f config.status; \
fi
find $(SOURCE_TREE)/solenv/gdb -name "*.pyc" -exec rm {} \;
rm -rf */*.pro.obsolete
+ rm -f solenv/bin/concat-deps
rm -rf $(SOURCE_TREE)/file-lists
rm -rf $(SOURCE_TREE)/pyuno-py3
- rm -f configure aclocal.m4
+ rm -f configure aclocal.m4 autogen.lastrun
rm -f build_error.log
ifeq "$(HELPISOS)" ""
rm -rf images*
endif
+ rm -f download.list
+
# Files created in debian directory
$(MAKE) -f debian/rules clean-debdir
- 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
- rm -f debian/scripts/aotcompile.py*
-
- rm -f l10n.fdupes
- rm -f debian/shlibs.local
- rm -f debian/*.templates
-
- rm -f debian/libreoffice-dev-doc.doc-base.*
- rm -f debian/*.menu
- for i in base calc core common draw impress math writer; do \
- rm -f debian/libreoffice-$$i.lintian-overrides; \
- done
- rm -f debian/*.install debian/*.dirs debian/*.changelog
- rm -f debian/catalog.xml
- rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
- rm -f download.list
$(MAKE) -f debian/rules control
@@@ -1316,7 -1312,9 +1316,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= ;; \
@@@ -1350,7 -1348,7 +1350,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`; \
@@@ -1371,10 -1369,10 +1371,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)" ""
@@@ -1475,8 -1473,8 +1475,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)))
@@@ -1516,6 -1514,10 +1516,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
@@@ -1526,8 -1528,7 +1526,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
@@@ -1542,6 -1543,29 +1542,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
@@@ -1553,26 -1577,18 +1553,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
+$(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"
@@@ -1582,15 -1598,17 +1582,15 @@@
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
ifeq "$(PYTHON3_VERSION)" "current"
- 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)) PYTHON_LIBS=$(shell pkg-config --libs python$(PY3MAJOR)) \
- ../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))" PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))" ../solenv/bin/build.pl
else
- 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)) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)) \
- ../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))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR))" ../solenv/bin/build.pl
endif
endif
endif
@@@ -1599,32 -1617,6 +1599,32 @@@ ifneq (nocheck,$(findstring nocheck,$(D
$(CURDIR)/debian/rules check
endif
+ifneq "$(BUILD_ISOS)" "en-US"
+ # build some extensions again with all languages; as it contains language-specific help
+ # and/or descriptions...
+ $(MAKE) translations.clean
+ $(MAKE) sdext.clean
+ $(MAKE) mysqlc.clean
+ make cmd cmd="cd translations; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
+ make cmd cmd="cd sdext; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
+ make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; ../solenv/bin/build.pl && ../solenv/bin/deliver.pl"
+endif
+
+ 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) $(CONFIGURE_FLAGS_LANG)
+
+ 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:
@@@ -1656,10 -1648,8 +1656,10 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
endif
endif
-install: $(STAMP_DIR)/install
-$(STAMP_DIR)/install: $(STAMP_DIR)/build
+install: $(STAMP_DIR)/install-common $(STAMP_DIR)/install-arch $(STAMP_DIR)/install-indep
+
+install-common: $(STAMP_DIR)/install-common
+$(STAMP_DIR)/install-common:
dh_testdir
dh_testroot
@@@ -1675,6 -1665,7 +1675,6 @@@
# install LibreOffice.
cd $(SOURCE_TREE)/; \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) \
DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) distro-pack-install
@@@ -1706,18 -1697,14 +1706,18 @@@
# and ca-XV in -ca...
ifeq (ca-XV,$(findstring ca-XV,$(LANGPACKISOS)))
- cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs
- cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install
- rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install
+ if [ -f debian/libreoffice-l10n-ca-XV.dirs -a -f debian/libreoffice-l10n-ca-XV.install ]; then \
+ cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs; \
+ cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install; \
+ rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install; \
+ fi
endif
ifeq (ca-XV,$(findstring ca-XV,$(HELPISOS)))
- cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs
- cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install
- rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install
+ if [ -f debian/libreoffice-help-ca-XV.dirs -a -f debian/libreoffice-help-ca-XV.install ]; then \
+ cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs; \
+ cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install; \
+ rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install; \
+ fi
endif
# fixup case (-l10n-pt-BR -> l10n-pt-br etc.)
@@@ -1747,7 -1734,7 +1747,7 @@@
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
@@@ -1886,7 -1873,7 +1886,7 @@@ $(STAMP_DIR)/maintscripts: $(wildcard d
grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
- if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
+ if egrep -q "validate_extension" $$MAINTSCRIPT.in; then \
cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \
fi; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
@@@ -1901,7 -1888,7 +1901,7 @@@
# 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-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 \
@@@ -1971,7 -1958,7 +1971,7 @@@ endi
touch $@
native-jars: $(STAMP_NATIVE_JARS)
-$(STAMP_NATIVE_JARS): $(STAMP_DIR)/install
+$(STAMP_NATIVE_JARS): $(STAMP_DIR)/install-common
ifeq "$(BUILD_JARS_NATIVE)" "y"
rm -rf debian/tmp/native-jars
mkdir -p debian/tmp/native-jars/gcj
@@@ -2018,7 -2005,7 +2018,7 @@@ endi
# Install files generated by setup into arch-dependent package directories
install-arch: $(STAMP_DIR)/install-arch
-$(STAMP_DIR)/install-arch: $(STAMP_DIR)/install $(STAMP_NATIVE_JARS)
+$(STAMP_DIR)/install-arch: $(STAMP_DIR)/install-common $(STAMP_NATIVE_JARS)
dh_testdir
dh_testroot
umask 022
@@@ -2199,7 -2186,7 +2199,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 \
@@@ -2278,7 -2265,7 +2278,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'; \
@@@ -2314,7 -2301,7 +2314,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; \
@@@ -2367,9 -2354,9 +2367,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
@@@ -2408,7 -2395,7 +2408,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-common
dh_testdir
dh_testroot
@@@ -2432,15 -2419,15 +2432,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
@@@ -2506,6 -2493,12 +2506,6 @@@ endi
# share/uno_packages/cache...
rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
- # move javasettingsunopkginstall.xml to /var/lib
- mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config
- mv $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml \
- $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml
- ln -s /$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml \
- $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
# set PYTHONPATH in unopkg
perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
$(PKGDIR)-common/$(OODIR)/program/unopkg
@@@ -2579,7 -2572,7 +2579,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
@@@ -2606,9 -2599,6 +2606,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
@@@ -2700,7 -2690,7 +2700,7 @@@ endi
done
for PKG in $(ARCH_INDEP_PACKAGES); do \
case $$PKG in \
- ttf-opensymbol|openoffice.org-dtd-officedocument1.0) \
+ openoffice.org-dtd-officedocument1.0) \
;; \
*) \
cat debian/changelog \
@@@ -2714,12 -2704,10 +2714,12 @@@
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
@@@ -2754,7 -2742,7 +2754,7 @@@
#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 $@
@@@ -2769,14 -2757,7 +2769,14 @@@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/
rm -rf debian/$$pkg/DEBIAN;\
done
- dh_installdocs -s -A debian/README.Debian
+ dh_installdocs -s -A
+ for p in $(ARCH_DEP_PACKAGES); do \
+ mkdir -p debian/$$p/usr/share/doc/$$p; \
+ 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 \
@@@ -2822,8 -2803,8 +2822,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 && \
@@@ -2843,7 -2824,7 +2843,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)) \
@@@ -2867,7 -2848,7 +2867,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) \
@@@ -2877,10 -2858,7 +2877,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
@@@ -2910,6 -2888,7 +2910,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)' \
@@@ -2940,7 -2919,7 +2940,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
@@@ -2998,14 -2977,7 +2998,14 @@@ 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_INDEP_PACKAGES); do \
+ mkdir -p debian/$$p/usr/share/doc/$$p; \
+ 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_installman -i
for i in `find $(PKGDIR)-common -type l -name "lo*.1"`; do \
mv $$i $$i.gz; \
@@@ -3029,14 -3001,14 +3029,14 @@@
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 \
-Nlibreoffice$(VER)-wiki-publisher \
- -Nttf-opensymbol \
-Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
-V'base-version=$(BASE_VERSION)' \
@@@ -3046,18 -3018,21 +3046,18 @@@
-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)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
- dh_gencontrol -pttf-opensymbol -pfonts-opensymbol -- \
+ dh_gencontrol -pfonts-opensymbol -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);' debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
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
@@@ -3066,11 -3041,11 +3066,11 @@@ 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`
- dh_md5sums -i -Xjavasettingsunopkginstall.xml
+ dh_md5sums -i
dh_builddeb -i $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
touch $@
@@@ -3159,8 -3134,8 +3159,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: