The following commit has been merged in the debian-experimental-4.2 branch:
commit 40338ee16c71400aff23fed88f1051c7a895fabe
Merge: 46714347bd7b7a8557d8d4962530f6bb6c91a0e6
ddf2781d532861a70076d74a9ec65dcb3870f023
Author: Rene Engelhard <r...@debian.org>
Date: Fri Jul 26 20:06:16 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.2
Conflicts:
changelog
diff --combined changelog
index 4eede8d,9f60000..d14c15e
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,14 +1,28 @@@
+libreoffice (1:4.2.0~alpha0~git20130726-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got replaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ Run dh_doxygen
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+ - add conditionals for new libs used: opencl, firebird, avahi-client
+
+ -- Rene Engelhard <r...@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+
+ libreoffice (1:4.1.0-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix uno.py, actually add starting / in LOs path (closes: #717930)
+ * debian/libreoffice-common.postrm.in:
+ - don't create /var/lib/libreoffice/share/config/ anymore and
+ remove it (and javaunopkginstall.xml if exists) on purge
+ (closes: #707933)
+
+ -- Rene Engelhard <r...@debian.org> Thu, 25 Jul 2013 18:33:02 +0200
+
libreoffice (1:4.1.0-1) unstable; urgency=low
* new upstream release
diff --combined rules
index f065e89,be2588d..103bae4
--- a/rules
+++ b/rules
@@@ -23,7 -23,7 +23,7 @@@ BASE_VERSION:=$(shell echo $(DEB_VERSIO
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d:
-f2 | tr [~] [\\-])
HELP_L10N_VIRTUAL_VERSION:=4.1
-OOVER:=4.1
+OOVER:=4.2
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -245,14 -245,12 +245,14 @@@ ifeq "$(USE_DBUS)" "y
SYSTEM_STUFF += bluez
endif
endif
+ENABLE_AVAHI=y
USE_GSTREAMER=y
ifneq "$(WHEEZY_BACKPORT)" "y"
GSTREAMER_VERSION=1.0
else
GSTREAMER_VERSION=0.10
endif
+USE_VLC=y
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@@ -376,11 -374,6 +376,11 @@@ ifeq "$(USE_UCPP)" "y
endif
ENABLE_MERGELIBS=n
PACKAGE_LIBLIBREOFFICE=n
+USE_OPENCL=y
+SYSTEM_STUFF += firebird
+ifeq (,$(filter firebird, $(SYSTEM_STUFF)))
+SYSTEM_STUFF += libatomic-ops
+endif
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -546,8 -539,7 +546,8 @@@ endi
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"wheezy-backports"
BUGS=mailto:debian-backpo...@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw
libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw
libodfgen mdds liblangtag orcus harfbuzz libatomic-ops libwpd,$(SYSTEM_STUFF))
+ PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"UNRELEASED"
@@@ -593,7 -585,7 +593,7 @@@ ifneq "$(PACKAGE_SDK)" "y
endif
else
ifeq "$(PACKAGE_SDK_DOCS)" "y"
- BUILD_DEPS_INDEP += , doxygen
+ BUILD_DEPS_INDEP += , doxygen (>= 1.8.4)
endif
endif
@@@ -651,10 -643,6 +651,10 @@@ ifneq (,$(filter openssl, $(SYSTEM_STUF
BUILD_DEPS += , libssl-dev
DBG_DBG_SUGGESTS += , libssl$(shell readlink
/usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
endif
+ifeq "$(USE_OPENCL)" "y"
+ BUILD_DEPS += , ocl-icd-opencl-dev
+ CONFIGURE_FLAGS += --with-opencl-sdk=/usr
+endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
@@@ -745,11 -733,6 +745,11 @@@ ifneq (,$(filter cppunit, $(SYSTEM_STUF
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , gdb
+ ifeq "$(WHEEZY_BACKPORT)" "y"
+ BUILD_DEPS += , ttf-liberation
+ else
+ BUILD_DEPS += , fonts-liberation
+ endif
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
@@@ -995,7 -978,7 +995,7 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.8.0)
+ BUILD_DEPS += , libmdds-dev (>= 0.9.0)
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
@@@ -1012,7 -995,7 +1012,7 @@@ endi
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libwpd, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libwpd-dev (>= 0.9.0)
+ BUILD_DEPS += , libwpd-dev (>= 0.9.5)
endif
ifneq (,$(filter mythes, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmythes-dev (>= 2:1.2)
@@@ -1118,23 -1101,6 +1118,23 @@@ ifeq "$(ENABLE_MYSQLNATIVE)" "y
endif
endif
+ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libatomic-ops-dev (>= 7.3~alpha1+git20110913-1)
+endif
+ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
+ ifneq "$(WHEEZY_BACKPORT)" "y"
+ BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)
+ # no FIREBIRD_CFLAGS here. Have no effect as fb_config is there
+ # and configure prefers that over our values...
+ else
+ BUILD_DEPS += , firebird-dev
+ # firebird-dev only _Suggests_ libfbembed2.5...
+ BUILD_DEPS += , libfbembed2.5
+ FIREBIRD_CFLAGS := " "
+ FIREBIRD_LIBS := "-L/usr/lib/$(DEB_HOST_MULTIARCH) -lfbembed"
+ endif
+endif
+
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
DEBHELPER_OPTIONS+= -Nlibreoffice-gtk -Nlibreoffice-gnome
@@@ -1257,11 -1223,6 +1257,11 @@@ ifeq "$(USE_DBUS)" "y
endif
endif
+ifeq "$(ENABLE_AVAHI)" "y"
+ BUILD_DEPS += , libavahi-client-dev
+ CONFIGURE_FLAGS += --enable-avahi
+endif
+
ifeq "$(USE_GSTREAMER)" "y"
ifeq "$(GSTREAMER_VERSION)" "1.0"
BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
@@@ -1274,11 -1235,6 +1274,11 @@@ els
CONFIGURE_FLAGS += --disable-gstreamer-0-10
endif
+ifeq "$(USE_VLC)" "y"
+ BUILD_DEPS += , libvlc-dev
+ CONFIGURE_FLAGS += --enable-vlc
+endif
+
ifneq (,$(filter neon, $(SYSTEM_STUFF)))
ifneq "$(NEON_SECTYPE)" "openssl"
BUILD_DEPS += , libneon$(NEONSONR)-$(NEON_SECTYPE)-dev
@@@ -1753,7 -1709,6 +1753,7 @@@ $(STAMP_DIR)/build-arch
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) \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) \
--without-doxygen --disable-ext-wiki-publisher \
--disable-report-builder --disable-scripting-javascript \
@@@ -1808,7 -1763,6 +1808,7 @@@ $(STAMP_DIR)/build-indep
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) \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
ifneq "$(WHEEZY_BACKPORT)" "y"
@@@ -2381,8 -2335,8 +2381,8 @@@ ifeq "$(ENABLE_PYTHON)" "y
# directories but in $(PYTHON_SITE). Can't be a patch (anymore)
# as otherwise the python-based unittests fail miserably.
echo "import sys, os" > $(PYTHON_SITE)/uno.py
- echo "sys.path.append('$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
- echo "os.putenv('URE_BOOTSTRAP',
'vnd.sun.star.pathname:$(OODIR)/program/fundamentalrc')" >>
$(PYTHON_SITE)/uno.py
+ echo "sys.path.append('/$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
+ echo "os.putenv('URE_BOOTSTRAP',
'vnd.sun.star.pathname:/$(OODIR)/program/fundamentalrc')" >>
$(PYTHON_SITE)/uno.py
cat debian/python3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
rm -f debian/python3-uno/$(OODIR)/program/uno.py
mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
@@@ -3204,9 -3158,6 +3204,9 @@@ endi
ifeq "$(PACKAGE_LIBRELOGO)" "y"
dh_installchangelogs -plibreoffice-librelogo -k
librelogo/source/ChangeLog
endif
+ifeq "$(PACKAGE_SDK_DOCS)" "y"
+ dh_doxygen -plibreoffice-dev-doc
+endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v2mpg-0000tv...@vasks.debian.org
