The following commit has been merged in the debian-experimental-4.1 branch:
commit d1dfa2384dff8d0f517b6c9eb1f819ff1f7bb039
Merge: 4eda70d7768b739f033db7616228559c45dc897d
d163b89f981d07edd1674f5c34c16db9ccae805a
Author: Rene Engelhard <[email protected]>
Date: Mon May 20 22:50:17 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
Conflicts:
patches/uno-executables-link-to-xmlreader.diff
diff --combined changelog
index bb3c89c,1cce386..112592e
--- a/changelog
+++ b/changelog
@@@ -1,29 -1,18 +1,32 @@@
+libreoffice (1:4.1.0~beta1~git20130520-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules, control.sdk.in:
+ - dmake finally gone
+ * debian/rules:
+ - add new conditionals: libmwaw, libodfgen, harfbuzz, mariadb
+ (use MySQL instead of MariaDB, though as long as we need mysqlcppconn
anyway)
+ - build with explicit --enable-python=system
+ * debian/uno-libs3.symbols: update
+
+ -- Rene Engelhard <[email protected]> Sat, 22 Dec 2012 18:03:18 +0100
+
libreoffice (1:4.0.3-3) unstable; urgency=low
* debian/patches/uno-executables-link-to-xmlreader.diff: fix
sp2bv/regcomp/regsingleton/uno-skeletonmaker build on
- mips(el) by linking explicitly with libxmlreader.so
+ mips(el) by linking explicitly with libxmlreader.so with sids gcc without
+ experimentals binutils.
* debian/control.in, debian/rules:
- depend on fonts-dejavu instead of ttf-dejavu (closes: #708062)
+ - prepare build-depending on experimentals binutils on mips(el), thanks
+ Aurelien Jarno for the hint
* debian/copyright:
- mention swext/mediawiki/src/filter/odt2mediawiki.xsl copyright/license
- -- Rene Engelhard <[email protected]> Mon, 20 May 2013 13:50:58 +0200
+ -- Rene Engelhard <[email protected]> Mon, 20 May 2013 18:19:56 +0200
libreoffice (1:4.0.3-2) unstable; urgency=low
diff --combined patches/uno-executables-link-to-xmlreader.diff
index b0486f3,078504b..9034636
--- a/patches/uno-executables-link-to-xmlreader.diff
+++ b/patches/uno-executables-link-to-xmlreader.diff
@@@ -1,3 -1,51 +1,29 @@@
+ 17:51 < aurel32> _rene_: for libreoffice on mips, either you need an old
+ gcc-4.7 (e.g. the one from wheezy), or a binutils matching
the
+ changes from gcc-4.7 (e.g the one from experimental)
+ 17:51 < aurel32> well s/gcc-4.7/gcc-4.6/
+ 17:53 < _rene_> well, I have a workaround now (which is building), so...
+ 17:53 < _rene_> but thanks for the info
+ 17:53 < _rene_> aurel32: I do exactly as gcc says and link with that lib.
seems
+ to work
+ 17:53 < _rene_> aurel32: (that's what the LO build on gabrielli currently
does)
+ 17:54 < aurel32> at some point we'll need a binutils upload to fix that
properly
+ [...]
+ 18:00 < _rene_> aurel32: ok, to summarize: both gcc-4.6 and -4.7 sid don't
+ "work". only with experimentals binfilter?
+ 18:01 < _rene_> aurel32: /me could then remove the patch and add a
appropriate
+ build-dep when the new binutils is in sid..
+ 18:03 * _rene_ can try with that build-dep with LO 4.1 beta1 (to be released
+ and maybe uploaded next week) in experimental :)
+ 18:08 -!- zwenna [[email protected]] has joined
+ #debian-release
+ 18:08 < aurel32> _rene_: as far as i know yes, gcc-4.6 and -4.7 from sid (and
+ soon from testing) need the experimental binutils
+ 18:09 < aurel32> _rene_:
+ http://www.sourceware.org/ml/binutils/2012-08/msg00064.html
+ 18:10 < _rene_> ok. /me will add a comment to the patch and adapt the
changelog
+ then.
+
-diff -urN cpputools.old/Executable_regcomp.mk cpputools/Executable_regcomp.mk
---- a/cpputools.old/Executable_regcomp.mk 2013-04-30 14:54:23.000000000
+0200
-+++ b/cpputools/Executable_regcomp.mk 2013-05-17 21:41:13.665548985 +0200
-@@ -34,6 +34,7 @@
- cppu \
- cppuhelper \
- sal \
-+ xmlreader \
- $(gb_UWINAPI) \
- ))
-
-diff -urN cpputools.old/Executable_regsingleton.mk
cpputools/Executable_regsingleton.mk
---- a/cpputools.old/Executable_regsingleton.mk 2013-04-30
14:54:23.000000000 +0200
-+++ b/cpputools/Executable_regsingleton.mk 2013-05-17 21:41:22.977549255
+0200
-@@ -34,6 +34,7 @@
- cppu \
- cppuhelper \
- sal \
-+ xmlreader \
- $(gb_UWINAPI) \
- ))
-
diff -urN cpputools.old/Executable_sp2bv.mk cpputools/Executable_sp2bv.mk
--- a/cpputools.old/Executable_sp2bv.mk 2013-04-30 14:54:23.000000000
+0200
+++ b/cpputools/Executable_sp2bv.mk 2013-05-17 21:41:33.373549555 +0200
@@@ -9,3 -57,13 +35,3 @@@
))
$(eval $(call gb_Executable_add_exception_objects,sp2bv,\
---- a/unodevtools.old/Executable_skeletonmaker.mk 2013-05-18
11:31:49.705153823 +0200
-+++ b/unodevtools/Executable_skeletonmaker.mk 2013-05-18 11:33:07.993156082
+0200
-@@ -41,6 +41,7 @@
- salhelper \
- cppu \
- cppuhelper \
-+ xmlreader \
- ))
-
- $(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\
diff --combined rules
index e415579,07da7e2..ebd9270
--- a/rules
+++ b/rules
@@@ -22,8 -22,8 +22,8 @@@ 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:=4.0
-OOVER:=4.0
+HELP_L10N_VIRTUAL_VERSION:=4.1
+OOVER:=4.1
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -65,15 -65,15 +65,15 @@@ SOURCE_TREE=
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=4.0.3.3
+lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep
documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-4-0-3
+GIT_BRANCH=master
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -149,7 -149,7 +149,7 @@@ ifeq "$(ENABLE_PYTHON2)" "y
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
-BUILD_ONLY_EN_US=n
+BUILD_ONLY_EN_US=y
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
@@@ -195,8 -195,6 +195,8 @@@ SYSTEM_STUFF += libwpd libwpg libwp
SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
SYSTEM_STUFF += libmspub
+SYSTEM_STUFF += libmwaw
+SYSTEM_STUFF += libodfgen
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -284,6 -282,7 +284,6 @@@ ifeq "$(ENABLE_JUNIT4)" "y
endif
USE_LIBCURL4=y
CURL_SECTYPE=gnutls
-USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
PARALLEL_BUILD=y
@@@ -325,7 -324,6 +325,7 @@@ endi
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
+SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
@@@ -337,10 -335,8 +337,10 @@@ SYSTEM_LIBRSVG=
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
-# cannot be disabled, unless you have a internal MySQL/PostgreSQL somewhere
:-)
-SYSTEM_STUFF += mysql mysql-cppconn
+USE_MARIADB=n
+# set this also to y for system-mysql..
+SYSTEM_STUFF += mariadb
+SYSTEM_STUFF += mysql-cppconn
MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
SYSTEM_STUFF += postgresql
DICT_DIR=/usr/share/hunspell
@@@ -378,7 -374,6 +378,7 @@@ ifeq "$(USE_UCPP)" "y
SYSTEM_STUFF += ucpp
endif
ENABLE_MERGELIBS=n
+PACKAGE_LIBLIBREOFFICE=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -393,8 -388,7 +393,8 @@@
--without-fonts \
--without-myspell-dicts \
--disable-dependency-tracking \
- --enable-hardlink-deliver
+ --enable-hardlink-deliver \
+ --with-branding=$(CURDIR)/debian/branding
ifeq "$(shell echo $(DEB_VERSION_UPSTREAM) | grep -E '(alpha|beta)'; echo
$$?)" "1"
CONFIGURE_FLAGS += --enable-release-build
@@@ -436,10 -430,6 +436,10 @@@ IGNORE_MAKE_CHECK_FAILURES:
IGNORE_MAKE_CHECK_FAILURES:=
endif
endif
+# sw_python would fail anyways as it doesn't work with python2..
+ifeq "$(WHEEZY_BACKPORT)" "y"
+IGNORE_MAKE_CHECK_FAILURES=-
+endif
OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x,
$(OOO_ARCHS))
@@@ -487,11 -477,13 +487,11 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
ENABLE_MINIMIZER=n
ENABLE_MYSQLNATIVE=n
DEBHELPER_OPTIONS += -Nlibreoffice-mysql-connector
- DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin
-Nlibreoffice-report-builder
DEBHELPER_OPTIONS += -Nlibreoffice-presentation-minimizer
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
ENABLE_REPORTDESIGN=n
- DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin
-Nlibreoffice-report-builder
DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher
-Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-extension-integration --disable-extensions
else
@@@ -534,13 -526,26 +534,21 @@@ OOO_NSPLUGIN_ARCHS
endif
$(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
+ # see uno-executables-link-to-xmlreader.diff. That workaround is not needed
+ # with said binutils. Thanks Aurelien Jarno for the hint.
+ #ifneq "$(WHEEZY_BACKPORT)" "y"
+ # ifneq (,$(findstring mips, $(OOO_ARCHS)))
+ #BUILD_DEPS += , binutils (>= 2.32) [mips mipsel}
+ # endif
+ #endif
+
#############
# Distro-specific overrides
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"wheezy-backports"
BUGS=mailto:[email protected]
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds
liblangtag orcus, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw
libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"UNRELEASED"
@@@ -605,9 -610,6 +613,9 @@@ els
CONFIGURE_FLAGS += --disable-graphite
endif
+ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libharfbuzz-dev
+endif
ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libexttextcat-dev (>= 3.1.1)
@@@ -900,13 -902,13 +908,13 @@@ export JAVA_HOM
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
else
- CONFIGURE_FLAGS += --disable-ext-report-builder
+ CONFIGURE_FLAGS += --disable-report-builder
endif
OOO_OFFICEBEAN_DEP = libreoffice-officebean
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common
-Nlibreoffice-filter-mobiledev -Nlibreoffice-gcj
-Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js
+ DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common
-Nlibreoffice-gcj -Nlibreoffice-script-provider-bsh
-Nlibreoffice-script-provider-js
endif
ifneq (,$(filter nss, $(SYSTEM_STUFF)))
@@@ -921,6 -923,9 +929,6 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
CONFIGURE_FLAGS += --disable-nsplugin
endif
-ifeq "$(USE_SYSTEM_DMAKE)" "y"
- BUILD_DEPS += , dmake (>= 1:4.11)
-endif
ifeq "$(USE_UCPP)" "y"
ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
IDLC_CPP_DEPENDS := ucpp
@@@ -971,11 -976,11 +979,11 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.6.0)
+ BUILD_DEPS += , libmdds-dev (>= 0.8.0)
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liborcus-dev
+ BUILD_DEPS += , liborcus-dev (>= 0.5.0)
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -1011,12 -1016,6 +1019,12 @@@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y
ifneq (,$(filter libmspub, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmspub-dev
endif
+ ifneq (,$(filter libmwaw, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libmwaw-dev
+ endif
+ ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libodfgen-dev
+ endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev (>= 0.3.1)
endif
@@@ -1080,17 -1079,13 +1088,17 @@@ els
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- CONFIGURE_FLAGS += --enable-ext-mysql-connector
- ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
+ CONFIGURE_FLAGS += --enable-ext-mariadb-connector
+ ifneq "$(USE_MARIADB)" "y"
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmysqlclient-dev
- else
- BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
+ BUILD_DEPS += , libmysqlclient-dev
+ endif
+ MARIADBCONFIG=/usr/bin/mysql_config
+ else
+ ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libmariadbclient-dev (>= 1.1.0~)
endif
+ MARIADBCONFIG=/usr/bin/mariadb_config
endif
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)
@@@ -1152,7 -1147,6 +1160,7 @@@ els
else
PYUNO_DEPENDS = python3.3-uno | python3-uno (>= 4.0~) | python-uno
endif
+ CONFIGURE_FLAGS += --enable-python=system
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -1251,14 -1245,14 +1259,14 @@@ ifneq (,$(filter redland, $(SYSTEM_STUF
endif
ifeq "$(ENABLE_GIO)" "y"
- CONFIGURE_FLAGS += --enable-gio --disable-gnome-vfs
BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
+else
+ CONFIGURE_FLAGS += --disable-gio
endif
ifeq "$(ENABLE_GVFS)" "y"
BUILD_DEPS += , libgnomevfs2-dev
-else
- CONFIGURE_FLAGS += --disable-gnome-vfs
+ CONFIGURE_FLAGS += --enable-gnome-vfs
endif
ifeq "$(ENABLE_GCONF)" "y"
@@@ -1372,7 -1366,7 +1380,7 @@@ clean
$(MAKE) distclean; \
rm -f config.status; \
fi
- find $(SOURCE_TREE)/solenv/gdb -name "*.pyc" -exec rm {} \;
+ find $(SOURCE_TREE) -name "*.pyc" -exec rm {} \;
rm -rf */*.pro.obsolete
rm -rf $(SOURCE_TREE)/file-lists
@@@ -1541,9 -1535,6 +1549,9 @@@ endi
ifeq "$(PACKAGE_LIBRELOGO)" "y"
cat debian/control.librelogo.in >> debian/control
endif
+ifeq "$(PACKAGE_LIBLIBREOFFICE)" "y"
+ cat debian/control.liblibreoffice.in >> debian/control
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
@@@ -1592,10 -1583,6 +1600,10 @@@ ifeq "$(WHEEZY_BACKPORT)" "y
endif
endif
+ifneq "$(USE_MARIADB)" "y"
+ perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/"
debian/control
+endif
+
ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
@@@ -1703,20 -1690,12 +1711,20 @@@ $(STAMP_DIR)/build-arch
# somehow...
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags
python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs
python-$(PYMAJOR).$(PYMINOR))" \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
./autogen.sh $(CONFIGURE_FLAGS) \
- --without-help --without-doxygen --disable-ext-wiki-publisher \
- --disable-ext-report-builder --disable-scripting-javascript \
+ --without-doxygen --disable-ext-wiki-publisher \
+ --disable-report-builder --disable-scripting-javascript \
--disable-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`
$(MAKE) build
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ # setting PYTHON_FOR_BUILD above does NOT work and otherwise it
+ # might pick up /usr/bin/python (python 2!) due to
wheezy-backports-python.diff
+ # which will not work.
+ perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export
PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
+endif
+
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON)" "y"
@@@ -1737,7 -1716,7 +1745,7 @@@ ifneq "$(BUILD_ISOS)" "en-US
$(MAKE) sdext.clean
$(MAKE) mysqlc.clean
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"
+ make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export
WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
endif
touch $@
@@@ -1755,19 -1734,9 +1763,19 @@@ $(STAMP_DIR)/build-indep
$(MAKE) reportbuilder.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) \
+ PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags
python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs
python-$(PYMAJOR).$(PYMINOR))" \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
+ ./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
+
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ # setting PYTHON_FOR_BUILD above does NOT work and otherwise it
+ # might pick up /usr/bin/python (python 2!) due to
wheezy-backports-python.diff
+ # which will not work.
+ perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export
PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
+endif
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
$(MAKE) build
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
touch $@
@@@ -1832,7 -1801,9 +1840,7 @@@ ifeq "$(BUILD_DBG_PACKAGE)" "y
endif
# FIXME
- if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \
- cd $(CURDIR)/debian/tmp/pkg && rm -rf \*; \
- fi
+ cd $(CURDIR)/debian/tmp/pkg && rm -rf \*
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
@@@ -1984,14 -1955,6 +1992,14 @@@ ifeq "$(BUILD_GTK)" "y
$(PKGDIR)-gnome/$(OODIR)/share/xdg
endif
+ifeq "$(BUILD_KDE)" "y"
+ mkdir -p $(PKGDIR)-kde/$(OODIR)/program
+ mv $(PKGDIR)-common/$(OODIR)/program/kde-open-url \
+ $(PKGDIR)-kde/$(OODIR)/program
+else
+ rm -f $(PKGDIR)-common/$(OODIR)/kde-open-url
+endif
+
ifeq "$(PACKAGE_SDK)" "y"
# move SDK documentation into own package
rm -rf $(PKGDIR)-dev-doc
@@@ -2018,14 -1981,6 +2026,14 @@@ ifeq "$(ENABLE_EVO2)" "y
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
+ifeq "$(PACKAGE_SDK)" "y"
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/share/glade
+ mv $(PKGDIR)-common/$(OODIR)/share/glade/libreoffice-catalog.xml \
+ $(PKGDIR)-dev/$(OODIR)/share/glade
+else
+ rm -rf $(PKGDIR)-common/$(OODIR)/share/glade
+endif
+
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
@@@ -2102,7 -2057,6 +2110,7 @@@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/bu
$(PKGDIR)-$$pkg/$(OODIR)/share/wordbook/$$iso/technical.dic; \
done
+ifneq "$(BUILD_ISOS)" "en-US"
# replace duplicate files in the langpacks with symlinks
TMP=`mktemp -q`; \
fdupes --quiet --recurse --sameline --size \
@@@ -2110,7 -2064,6 +2118,7 @@@
$(foreach d,$(shell echo $(filter-out en-US
ca-XV,$(LANGPACKISOS)) | tr A-Z a-z),debian/libreoffice-l10n-$(d)/$(OODIR)) \
> $$TMP && \
debian/scripts/cleandupes --base=libreoffice --prefix=debian < $$TMP &&
rm -f $$TMP
+endif
ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
@@@ -2207,9 -2160,9 +2215,9 @@@ endi
mv $$i debian/uno-libs3/$(OOUREDIR)/lib; \
ln -sf /$(OOUREDIR)/lib/`basename $$i`
debian/uno-libs3/usr/lib/`basename $$i`; \
done
- # we also need libxmlreader.so and libreg.so.3
(libuno_cppuhelpergcc3.so.3 needs it)
- # and libstore.so.3 (libreg.so.3 needs it)
- for i in libxmlreader.so libreg.so.3 libstore.so.3; do \
+ # we also need libxmlreader.so and libreg.so
(libuno_cppuhelpergcc3.so.3 needs it)
+ # and libstore.so (libreg.so.3 needs it)
+ for i in libxmlreader.so libreg.so libstore.so; do \
mv debian/ure/$(OOUREDIR)/lib/$$i \
debian/uno-libs3/$(OOUREDIR)/lib; \
done
@@@ -2255,15 -2208,15 +2263,15 @@@ ifeq "$(BUILD_GTK)" "y
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
ifeq "$(ENABLE_GIO)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgio1.uno.so \
+ mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_GVFS)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgvfs1.uno.so \
+ mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgvfs1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_GCONF)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* \
+ mv $(PKGDIR)-gtk/$(OODIR)/program/libgconfbe1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program
endif
endif
@@@ -2359,9 -2312,9 +2367,9 @@@ ifeq "$(ENABLE_PYTHON)" "y
debian/python-uno/$(OODIR)/program/$$i; \
ln -s $$i debian/python-uno/$(OODIR)/program/`echo $$i
| sed -e s/2//`; \
done
- install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/python2loader.uno.so \
- debian/python-uno/$(OODIR)/program/python2loader.uno.so
- ln -s python2loader.uno.so
debian/python-uno/$(OODIR)/program/pythonloader.uno.so
+ install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/libpython2loaderlo.so \
+ debian/python-uno/$(OODIR)/program/libpython2loaderlo.so
+ ln -s libpython2loaderlo.so
debian/python-uno/$(OODIR)/program/libpythonloaderlo.so
cp debian/python3.3-uno/$(OODIR)/program/pythonloader.py \
debian/python-uno/$(OODIR)/program
cp debian/python3.3-uno/$(OODIR)/share/registry/pyuno.xcd \
@@@ -2424,6 -2377,10 +2432,6 @@@ ifeq "$(PACKAGE_SDK)" "y
endif
endif
chmod 644 $(PKGDIR)-dev/$(OOSDKDIR)/configure.pl
- for i in csh csh.in; do \
- perl -pi -e 's,/usr/bin/csh,/bin/csh,'\
- $(PKGDIR)-dev/$(OOSDKDIR)/setsdkenv_unix.$$i; \
- done
chmod 755 $(PKGDIR)-dev/$(OOSDKDIR)/setsdkenv_unix
# create wrapper scripts
cd $(PKGDIR)-dev/$(OOSDKDIR)/bin && \
@@@ -2458,6 -2415,18 +2466,6 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
endif
-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)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/pck && \
- for i in juh jurt jut ridl unoloader; do \
- cp $${i}_src.zip \
- $(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
- done
- endif
-endif
-
ifeq "$(ENABLE_JAVA)" "y"
# hrmpf, again something like that, we really need to find the root
cause for that
ln -s libjava_uno.so \
@@@ -2473,13 -2442,13 +2481,13 @@@ ifneq "$(ENABLE_REPORTDESIGN)" "y
# unneeded. a no-Java arch, so the report-builder can't work anyway.
# (and we need to remove it here anyway as it otherwise would end up
# in -base)
- rm -f $(PKGDIR)-base/$(OODIR)/program/librpt*
+ rm -rf $(PKGDIR)-report-builder
else
ifeq "$(PACKAGE_BASE)" "y"
# move rpt stuff into -report-builder-bin
rm -rf $(PKGDIR)-report-builder-bin
mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
- mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
+ mv $(PKGDIR)-report-builder/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder-bin/$(OODIR)/program
endif
endif
@@@ -2500,20 -2469,20 +2508,20 @@@ ifeq "$(ENABLE_MEDIAWIKI)" "y
rm -f
$(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE
endif
-#ifeq "$(PACKAGE_SDK)" "y"
-# # install gengal stuff into -dev
-# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengal \
-# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengal.bin \
-# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
-#endif
ifeq "$(PACKAGE_SDK)" "y"
+ # move gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/gengal.bin \
+ $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-common/$(OODIR)/program/gengal \
+ $(PKGDIR)-dev/$(OODIR)/program
# move ui-previewer into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/ui-previewer \
$(PKGDIR)-dev/$(OODIR)/program
else
+ rm -f $(PKGDIR)-core/$(OODIR)/program/gengal.bin
+ rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
endif
@@@ -2604,6 -2573,21 +2612,6 @@@ ifeq "$(ENABLE_JAVA)" "y
*) ln -s `echo $$i | sed -e
's,$(CURDIR)/$(PKGDIR)-java-common,,'` `basename $$i` ;; esac; \
done
- # move into extra package
- rm -rf $(PKGDIR)-filter-mobiledev
- mkdir -p $(PKGDIR)-filter-mobiledev/$(shell echo $(OODIR) | sed -e
s/lib/share/)/program/classes
- mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes
- for i in aportisdoc pexcel pocketword; do \
- mv $(PKGDIR)-java-common/$(shell echo $(OODIR) | sed -e
s/lib/share/)/program/classes/$$i.jar \
- $(PKGDIR)-filter-mobiledev/$(shell echo $(OODIR) | sed -e
s/lib/share/)/program/classes; \
- ln -s /$(shell echo $(OODIR) | sed -e
s/lib/share/)/program/classes/$$i.jar \
- $(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes; \
- done
- for i in pocketexcel palm pocketword; do \
- mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry && \
- mv $(PKGDIR)-common/$(OODIR)/share/registry/$$i.xcd \
- $(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry; \
- done
ifeq "$(BUILD_TEST_PACKAGE)" "y"
rm -rf $(PKGDIR)-subsequentcheckbase
mkdir -p $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/
@@@ -2789,6 -2773,15 +2797,6 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
endif
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
- ifeq "$(ENABLE_JAVA)" "y"
- for i in THIRDPARTYREADMELICENSE.html readme_en-US.html
readme_en-US.txt \
- registration/LICENSE; do \
- rm -f
$(PKGDIR)-report-builder/$(OODIR)/share/extensions/report-builder/$$i; \
- done
- endif
-endif
-
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -f
$(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
endif
@@@ -3064,7 -3057,7 +3072,7 @@@ endi
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; 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/source/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
endif
endif
endif
@@@ -3097,31 -3090,34 +3105,31 @@@ endi
done
ifeq "$(PACKAGE_SDK)" "y"
- . $(SOURCE_TREE)/solenv/inc/udkversion.mk && \
for i in common cpp java; do \
- cat debian/udk-$$i-ref.in \
- | sed -e "s/@UDK_MAJOR@/$$UDK_MAJOR/" \
- -e "s/@UDK_MINOR@/$$UDK_MINOR/" \
- -e "s/@UDK_MICRO@/$$UDK_MICRO/" \
- > debian/libreoffice-dev-doc.doc-base.udk-$$i-ref; \
+ cat debian/lo-$$i-ref.in \
+ | sed -e "s/@lo_sources_ver@/$(lo_sources_ver)/" \
+ > debian/libreoffice-dev-doc.doc-base.lo-$$i-ref; \
done
# remove Autodoc_DiagnosticMessages.txt
find $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev \
-name "Autodoc_DiagnosticMessages.txt" -exec rm {} \;
UDK_CPP_FILES=`find
$(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/cpp/ref
| sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
- echo "Files: $$UDK_CPP_FILES" >>
debian/libreoffice-dev-doc.doc-base.udk-cpp-ref
+ echo "Files: $$UDK_CPP_FILES" >>
debian/libreoffice-dev-doc.doc-base.lo-cpp-ref
ifeq "$(ENABLE_JAVA)" "y"
UDK_JAVA_FILES=`find
$(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/java/ref
| sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
- echo "Files: $$UDK_JAVA_FILES" >>
debian/libreoffice-dev-doc.doc-base.udk-java-ref
+ echo "Files: $$UDK_JAVA_FILES" >>
debian/libreoffice-dev-doc.doc-base.lo-java-ref
endif
# xargs strips the many files here so we need to post-process it.
UDK_COMMON_FILES=`find
$(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/common/ref
| sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
TMP=`mktemp -q`; \
- cp debian/libreoffice-dev-doc.doc-base.udk-common-ref $$TMP; \
+ cp debian/libreoffice-dev-doc.doc-base.lo-common-ref $$TMP; \
echo "Files: $$UDK_COMMON_FILES" >> $$TMP; \
- cat $$TMP | perl -e 'while(<>) { if (/^Files/) {$$f=1;} if ($$f eq "1")
{ chomp(); } print $$_; }' >
debian/libreoffice-dev-doc.doc-base.udk-common-ref; \
+ cat $$TMP | perl -e 'while(<>) { if (/^Files/) {$$f=1;} if ($$f eq "1")
{ chomp(); } print $$_; }' > debian/libreoffice-dev-doc.doc-base.lo-common-ref;
\
rm -f $$TMP
# no idea why this happens; afais this can't come from above
# since it doesn't affect the files at the end of the lines...
# But fix it..
- perl -pi -e 's,html/,html /,g'
debian/libreoffice-dev-doc.doc-base.udk-common-ref
+ perl -pi -e 's,html/,html /,g'
debian/libreoffice-dev-doc.doc-base.lo-common-ref
endif
dh_installdocs -i -A
for p in $(ARCH_INDEP_PACKAGES); do \
@@@ -3149,7 -3145,6 +3157,7 @@@ endi
# dh_link -X does not work for .links stuff. And adding it there and
# fixing it up later because it's relative doesn't make that much sense.
# So do it here.
+ mkdir -p $(PKGDIR)-common/usr/share/applications
cd $(PKGDIR)-common/usr/share/applications && \
ln -sf /$(OODIR)/share/xdg/startcenter.desktop
libreoffice-startcenter.desktop
dh_fixperms -i
@@@ -3164,6 -3159,7 +3172,6 @@@ ifeq "$(ENABLE_JAVA)" "y
done
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
- -Nlibreoffice-report-builder \
-Nlibreoffice-wiki-publisher \
-Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
@@@ -3193,7 -3189,8 +3201,7 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
dh_gencontrol -plibreoffice-report-builder -- \
-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/util/description.xml | perl -pi -e
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
+ -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)'
endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 |
bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
