The following commit has been merged in the debian-experimental-4.2 branch:
commit 002f8815f585fdeed46122063ab8bffdd116d11c
Merge: aaa9aaeb250ba44a264d7765e3fac1215fa86224
552b6ea88b0dacefd2bdad2ce67a1ed86bb5f754
Author: Rene Engelhard <r...@debian.org>
Date: Thu Jul 25 20:47:01 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.2
Conflicts:
changelog
patches/series
diff --combined changelog
index 6be4020,e9f1917..0677bce
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,20 +1,34 @@@
+libreoffice (1:4.2.0~alpha0~git20130723-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
+
+ -- Rene Engelhard <r...@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+
- libreoffice (1:4.1.0~rc3-1) UNRELEASED; urgency=low
+ libreoffice (1:4.1.0-1) unstable; urgency=low
+
+ * new upstream release
+
+ * upload to unstable
+
+ * debian/rules:
+ - use internal clucene again; still no action from the clucene
+ maintainers...
+
+ -- Rene Engelhard <r...@debian.org> Wed, 24 Jul 2013 23:54:17 +0200
+
+ libreoffice (1:4.1.0~rc3-1) experimental; urgency=low
* new upstream release candidate
- -- Rene Engelhard <r...@debian.org> Mon, 15 Jul 2013 01:19:56 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 17 Jul 2013 18:08:19 +0200
libreoffice (1:4.1.0~rc2-2) experimental; urgency=low
diff --combined control
index 71dc0bb,38acf51..28f2999
--- a/control
+++ b/control
@@@ -15,9 -15,7 +15,9 @@@ Build-Depends: ant (>= 1.7.0)
debhelper (>= 7.2.3~),
dpkg-dev (>= 1.16.1),
fastjar,
+ firebird-dev (>= 2.5.2.26540.ds4-2),
flex | flex-old,
+ fonts-liberation,
g++-mingw-w64-i686 [i386 amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
@@@ -35,7 -33,6 +35,6 @@@
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev,
- libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcppunit-dev (>= 1.12),
libcups2-dev,
@@@ -66,7 -63,7 +65,7 @@@
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -108,7 -105,6 +107,7 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe
ppc64 s390 s390x sparc],
pkg-config,
@@@ -124,7 -120,7 +123,7 @@@
zip,
zlib1g-dev
Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+ doxygen (>= 1.8.4),
fdupes,
fontforge,
imagemagick,
@@@ -145,8 -141,7 +144,8 @@@
libservlet3.0-java,
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
xml-core
-Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
+Build-Conflicts: amd-libopencl1,
+ ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
flex (= 2.5.34-1) [amd64],
@@@ -165,7 -160,6 +164,7 @@@
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
+ nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
XS-Python-Version: current
@@@ -173,7 -167,7 +172,7 @@@ XS-Python3-Version: 3.
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -4444,13 -4438,11 +4443,13 @@@ Depends: ant (>= 1.7.0)
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- doxygen,
+ doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
+ firebird-dev (>= 2.5.2.26540.ds4-2),
flex | flex-old,
fontforge,
+ fonts-liberation,
g++-mingw-w64-i686,
gcj-jdk,
gcj-native-helper,
@@@ -4467,7 -4459,6 +4466,6 @@@
libboost1.53-dev,
libcairo2-dev,
libcdr-dev,
- libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcommons-codec-java,
libcommons-httpclient-java,
@@@ -4507,7 -4498,7 +4505,7 @@@
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -4556,7 -4547,6 +4554,7 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2),
pkg-config,
python (>= 2.6.6-3+squeeze4),
diff --combined patches/series
index 563797a,0ea38ed..5bac6ed
--- a/patches/series
+++ b/patches/series
@@@ -27,5 -27,6 +27,6 @@@ wheezy-backports-python.dif
fix-internal-hsqldb-build.diff
javadoc-optional.diff
show-the-startcenter.diff
-fix-kk-in-lo-xlate-lang.diff
hack-interlck_sparc.diff
+opencl-path.diff
+ revert-ba6478560792e0eec161142c8cfbc0e08cd7a4f5.diff
diff --combined rules
index 992bb70,4fd86cf..930d775
--- 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)
@@@ -353,7 -353,7 +353,7 @@@ SYSTEM_STUFF += mesa-header
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
- SYSTEM_STUFF += clucene
+ #SYSTEM_STUFF += clucene
ENABLE_HELP=y
SYSTEM_STUFF += lcms2
SYSTEM_STUFF += openldap
@@@ -374,11 -374,6 +374,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= \
@@@ -544,8 -539,7 +544,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, $(SYSTEM_STUFF))
+ PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"UNRELEASED"
@@@ -591,7 -585,7 +591,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
@@@ -649,10 -643,6 +649,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)))
@@@ -743,11 -733,6 +743,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
@@@ -993,7 -978,7 +993,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)))
@@@ -1116,23 -1101,6 +1116,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
@@@ -1741,7 -1709,6 +1741,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 \
@@@ -1795,7 -1762,6 +1795,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))" \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
MARIADBCONFIG=$(MARIADBCONFIG) \
./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
@@@ -3192,9 -3158,6 +3192,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/e1v2qby-0005pi...@vasks.debian.org
