The following commit has been merged in the debian-experimental-4.2 branch:
commit 94c41b477dfe34a1778248ede468450f04090f64
Merge: f0f21ba4c00dea3b542d7c62b2459c3f7beab180
2130f114f04e902282877ad4495a7a5e77391fca
Author: Rene Engelhard <[email protected]>
Date: Mon Jun 24 18:10:45 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.1' into
debian-experimental-4.2
Conflicts:
changelog
diff --combined changelog
index 909897d,d896313..cfe9c7f
--- a/changelog
+++ b/changelog
@@@ -1,23 -1,16 +1,28 @@@
+libreoffice (1:4.2.0~alpha0~git20130604-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got deplaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+
+ -- Rene Engelhard <[email protected]> Sun, 02 Jun 2013 20:49:18 +0200
+
- libreoffice (1:4.1.0~rc1-1) UNRELEASED; urgency=low
+ libreoffice (1:4.1.0~rc1-1) experimental; urgency=low
* new upstream release candidate
+ * debian/patches/gcj-safe-jni-h-include.diff: fix -I placement...
+
* debian/control.sdk.in:
- also replace libreoffice-common (<< 4.1.0~beta1) (closes: #710767)
* debian/rules:
- enable kk (kazakh) l10n (closes: #700835)
+ - fix JAVA_MAINVER setting to actually set 6 for mips(el) and not
+ for ia64.
+ - also build-depend on libc6 (>= 2.17-6) on mips(el)
* debian/control:
- fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
- temporarily force gcc-4.6(!) (instead of build-conflicting
@@@ -25,8 -18,13 +30,13 @@@
all bridges are ported to the new gcc 4.7+ behaviour
- remove last buildd special-casing: build --enable-verbose everyhwere,
also on the buildds
+ * debian/patches/make-pyuno-work-for-system-wide-module-install.diff,
+ debian/patches/didable-sw-python.diff, debian/rules:
+ remove patch(es), add the lines to uno.oy during install ("stolen" from
+ Fedora)
+ Otherwise the python-based unit tests fail miserably (sw_python).
- -- Rene Engelhard <[email protected]> Mon, 17 Jun 2013 19:31:11 +0200
+ -- Rene Engelhard <[email protected]> Sun, 23 Jun 2013 18:07:00 +0200
libreoffice (1:4.1.0~beta2-2) experimental; urgency=low
diff --combined control
index 160b634,f15ace1..a54d895
--- a/control
+++ b/control
@@@ -16,10 -16,9 +16,10 @@@ Build-Depends: ant (>= 1.7.0)
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ fonts-liberation,
g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
- gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64],
+ gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
@@@ -33,6 -32,7 +33,7 @@@
libboost-date-time1.53-dev,
libboost1.53-dev,
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
+ libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev,
libclucene-dev (>= 2.3.3.4-2),
@@@ -123,7 -123,7 +124,7 @@@
zip,
zlib1g-dev
Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+ doxygen (>= 1.8.4),
fdupes,
fontforge,
imagemagick,
@@@ -170,7 -170,7 +171,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: mailto:[email protected]
+ Bugs:
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -414,8 -414,8 +415,8 @@@ Suggests: libreoffice-style-crystal
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
- vlibreoffice-l10n-3.5,
- vlibreoffice-l10n-3.6
+ libreoffice-l10n-3.5,
+ libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
@@@ -2020,12 -2020,12 +2021,12 @@@ Suggests: hunspell-dictionary-kk | mysp
libreoffice-grammarcheck-kk,
libreoffice-help-kk,
mythes-kk
- Description: office productivity suite -- Kazahk language package
+ Description: office productivity suite -- Kazakh language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
- Kazahk.
+ Kazakh.
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -4444,12 -4444,11 +4445,12 @@@ Depends: ant (>= 1.7.0)
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- doxygen,
+ doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
fontforge,
+ fonts-liberation,
g++-4.6,
g++-mingw-w64-i686,
gcc-4.6,
diff --combined rules
index 0a3eb84,e10716c..e8f7b74
--- 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)
@@@ -528,7 -528,7 +528,7 @@@ $(eval $(call gen_no_archs,OOO_NSPLUGIN
ifneq "$(WHEEZY_BACKPORT)" "y"
ifneq (,$(findstring mips, $(OOO_ARCHS)))
- BUILD_DEPS += , binutils (>= 2.23) [mips mipsel]
+ BUILD_DEPS += , binutils (>= 2.23) [mips mipsel], libc6 (>= 2.17-6) [mips
mipsel]
endif
endif
@@@ -539,7 -539,6 +539,7 @@@
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"wheezy-backports"
BUGS=mailto:[email protected]
SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw
libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
+ PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"UNRELEASED"
@@@ -550,7 -549,7 +550,7 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
- BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64]
,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+ BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
@@@ -585,7 -584,7 +585,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
@@@ -733,11 -732,6 +733,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
@@@ -828,8 -822,8 +828,8 @@@ ifeq "$(ENABLE_JAVA)" "y
ifneq (,$(findstring mips,$(OOO_JAVA_ARCHS)))
BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel]
ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
- JAVA_MAINVER=6
- endif
+ JAVA_MAINVER=6
+ endif
endif
endif
JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
@@@ -1569,9 -1563,9 +1569,9 @@@ endi
ifeq "$(BUILD_TEST_PACKAGE)" "y"
# we want the build deps as dep on subsequentcheckbase, but strip the
arch
# specifics as we are arch-all
- # for now we filter out the arch-specific libc0.1 and ia64, which is
ugly,
+ # for now we filter out the arch-specific libc* and ia64, which is ugly,
# but better than manual bookkeeping
- perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo
'$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep
-v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+ perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo
'$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep
-v libc6| grep -v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
endif
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome |
libreoffice-kde/' debian/control
@@@ -2335,7 -2329,14 +2335,14 @@@ endi
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- mv debian/python3.3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ # prepend stuff so that it works when the module is not in LOs
+ # 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
+ cat debian/python3.3-uno/$(OODIR)/program/uno.py >>
$(PYTHON_SITE)/uno.py
+ rm -f debian/python3.3-uno/$(OODIR)/program/uno.py
mv debian/python3.3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
touch debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
chmod u+w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
--
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]
