[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-2-77-g501f0a1
The following commit has been merged in the debian-experimental-4.1 branch:
commit 501f0a1847f417ca53f5c879f1fde531e355e3cc
Merge: 1c40630be5f3aa225beaf14ba381341c299412f8 1a156d901dd768e5e53e443f72ef8ee234c7d47c
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 19 20:23:28 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.0' into debian-experimental-4.1
Conflicts:
changelog
rules
diff --combined changelog
index 053b164,7f51415..b218a59
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,13 +1,21 @@@
+libreoffice (1:4.1.0~alpha1~git20130417-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ * debian/uno-libs3.symbols: update and cleanup - use (symver) instead
+ of *@...
+
+ -- Rene Engelhard <rene@debian.org> Sat, 22 Dec 2012 18:03:18 +0100
+
- libreoffice (1:4.0.2-1) UNRELEASED; urgency=low
+ libreoffice (1:4.0.3~rc1-2) experimental; urgency=low
- * LibreOffice 4.0.2 final release (identical to rc2)
+ * brown paper bag release
+ * fix make -k check || make check rule
+
+ -- Rene Engelhard <rene@debian.org> Fri, 19 Apr 2013 17:47:59 +0200
+
+ libreoffice (1:4.0.3~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
* debian/control.librelogo.in:
- actually use ${pyuno-depends}...
@@@ -17,8 -16,11 +24,11 @@@
- Use internal clucene until clucene 2.x is in unstable. Remove
arm* hack for internal clucene as it seems to work in the
meanwhile
- - explicitely set JDK=openjdk again until default-jdk (>= 1:1.7-48)
+ - explicitly set JDK=openjdk again until default-jdk (>= 1:1.7-48)
is in unstable (needed for ia64 defaulting to java7)
+ - run make -k check || make check (try to work around spurious failures) and
+ ignore test suite failures (on the second run) on armhf, ia64, sparc,
+ mips(el)
-- Rene Engelhard <rene@debian.org> Wed, 10 Apr 2013 23:15:27 +0200
diff --combined rules
index 18ece61,ee9d172..ef3b2fb
--- 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.1
+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
@@@ -189,7 -189,6 +189,7 @@@ SYSTEM_STUFF += libwpd libwpg libwp
SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
SYSTEM_STUFF += libmspub
+SYSTEM_STUFF += libmwaw
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -258,14 -257,17 +258,17 @@@ ifeq "$(ENABLE_JAVA)" "y
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
+ IGNORE_MAKE_CHECK_FAILURES=
endif
else
ifeq "$(JDK)" "openjdk"
RUN_MAKE_CHECK=y
ENABLE_JUNIT4=y
+ IGNORE_MAKE_CHECK_FAILURES=
else
RUN_MAKE_CHECK=n
ENABLE_JUNIT4=n
+ IGNORE_MAKE_CHECK_FAILURES=-
endif
endif
else
@@@ -277,6 -279,7 +280,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
@@@ -329,10 -332,8 +332,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
@@@ -370,7 -371,6 +373,7 @@@ ifeq "$(USE_UCPP)" "y
SYSTEM_STUFF += ucpp
endif
ENABLE_MERGELIBS=n
+PACKAGE_LIBLIBREOFFICE=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -385,8 -385,7 +388,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
@@@ -419,6 -418,19 +422,19 @@@ ifeq "$(ENABLE_OPENGL)" "y
$(eval $(call gen_no_archs,OOO_OGLTRANS_ARCHS))
endif
+ ifeq (armhf,$(findstring armhf,$(DEB_HOST_ARCH)))
+ IGNORE_MAKE_CHECK_FAILURES:=-
+ endif
+ ifeq (ia64,$(findstring ia64,$(DEB_HOST_ARCH)))
+ IGNORE_MAKE_CHECK_FAILURES:=-
+ endif
+ ifeq (sparc,$(findstring sparc,$(DEB_HOST_ARCH)))
+ IGNORE_MAKE_CHECK_FAILURES:=-
+ endif
+ ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
+ IGNORE_MAKE_CHECK_FAILURES:=-
+ endif
+
OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
# Java...
@@@ -465,11 -477,13 +481,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
@@@ -515,10 -529,15 +531,10 @@@ $(eval $(call gen_no_archs,OOO_NSPLUGIN
#############
# Distro-specific overrides
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds liblangtag orcus, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw mdds liblangtag orcus, $(SYSTEM_STUFF))
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@@ -875,13 -894,13 +891,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)))
@@@ -896,6 -915,9 +912,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
@@@ -946,11 -968,11 +962,11 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.6.0)
+ BUILD_DEPS += , libmdds-dev (>= 0.7.1)
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liborcus-dev
+ BUILD_DEPS += , liborcus-dev (>= 0.5.0)
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -986,9 -1008,6 +1002,9 @@@ 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 libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev (>= 0.3.1)
endif
@@@ -1052,17 -1071,13 +1068,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)
@@@ -1222,14 -1237,14 +1238,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"
@@@ -1506,9 -1521,6 +1522,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
@@@ -1664,13 -1676,12 +1680,13 @@@ $(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
+ 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-nocheck
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON)" "y"
@@@ -1691,7 -1702,7 +1707,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 $@
@@@ -1709,12 -1720,9 +1725,12 @@@ $(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)
- 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) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
touch $@
@@@ -1735,7 -1743,7 +1751,7 @@@ endi
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) -k check && \
+ $(IGNORE_MAKE_CHECK_FAILURES)$(MAKE) -k check || $(MAKE) check && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@@ -1779,7 -1787,9 +1795,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 \
@@@ -1957,14 -1967,6 +1973,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 $@
@@@ -2355,6 -2357,10 +2371,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 && \
@@@ -2389,6 -2395,18 +2405,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 \
@@@ -2404,13 -2422,13 +2420,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
@@@ -2535,6 -2553,21 +2551,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/
@@@ -2720,6 -2753,15 +2736,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
@@@ -2993,7 -3035,7 +3009,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
@@@ -3026,31 -3068,34 +3042,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 \
@@@ -3078,7 -3123,6 +3094,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
@@@ -3093,6 -3137,7 +3109,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 -- \
@@@ -3122,7 -3167,8 +3138,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
Reply to: