[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-59-gb4f1c13
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 1bd3ed3493b1ccc98bf6f867fc712172937c7f10
Merge: 2c77eb4735e3a3116b0160b331a7e16ec2adeae8 e57f76eb376ee7c49b25790e5f5dafadcc4f02c1
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 15 14:14:01 2012 +0100
Merge tag 'libreoffice_3.5.1-1' into ubuntu-precise-3.5
tag libreoffice 1:3.5.1-1
Conflicts:
changelog
patches/series
diff --combined changelog
index bcd1f4d,b67977e..81853f6
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,7 +1,13 @@@
+libreoffice (1:3.5.1~rc2-1ubuntu1) precise; urgency=low
+
+ * merge from debian-experimental-3.5
+
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 09 Mar 2012 21:36:17 +0100
++ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 15 Mar 2012 14:12:12 +0100
+
- libreoffice (1:3.5.1~rc2-1) UNRELEASED; urgency=low
+ libreoffice (1:3.5.1-1) experimental; urgency=low
[ Rene Engelhard ]
- * new upstream release candidate
+ * new upstream release
- fixes up excessive numbers of "JRE is defective" messages
(closes: #602127)
- fixes populating "Recent Documents" after a profile upgrade
@@@ -24,6 -18,8 +24,8 @@@
* debian/patches/bibliography-no-crash-if-no-base.diff: backport fix
from libreoffice-3-5 to not crash Tools -> Bibliography if -base isn't
installed (closes: #602953, #598809)
+ * debian/patches/pyuno_fix_python2.diff: backport from libreoffice-3-5.
+ As name says, fix breakages in python2 after python3 fixes
* debian/rules: rename ext-sources to src, as done upstream
* debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
@@@ -57,26 -53,8 +59,26 @@@
* debian/patches/fix-quickstart-shutdown.diff: fix logout with
quickstarter (closes: #632920, #605268)
- -- Rene Engelhard <rene@debian.org> Tue, 06 Mar 2012 22:30:46 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 12 Mar 2012 22:15:54 +0100
+libreoffice (1:3.5.0-2ubuntu2) oneiric; urgency=low
+
+ * reenable libexttextcat
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 06 Mar 2012 10:53:44 +0100
+
+libreoffice (1:3.5.0-2ubuntu1) precise; urgency=low
+
+ * merge from debian-experimental-3.5 at
+ a9613a0cfaf22d4fa91652cbd135787cbf61e790
+ * backport a6d65732f14e49be8ec61aac53a2a8b909d810f7 by Rene
+ (LP: #882588)
+ * actually give the quickstarter suppressor instance a scope
+ * remove failing parts of -common postinst script, they in -core
+ anyway (LP: #916291)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 05 Mar 2012 08:42:13 +0100
+
libreoffice (1:3.5.0-2) experimental; urgency=low
[ Rene Engelhard ]
@@@ -110,70 -88,6 +112,70 @@@
-- Rene Engelhard <rene@debian.org> Wed, 22 Feb 2012 08:34:06 +0100
+libreoffice (1:3.5.0-1ubuntu4) precise; urgency=low
+
+ * disable reportbuilder again, java deps are just too heavy
+ * drop reportbuilder deps
+ * using partial internal lucene copy (again because deps)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 24 Feb 2012 13:25:34 +0100
+
+libreoffice (1:3.5.0-1ubuntu3) precise; urgency=low
+
+ * MIR lucene2 (LP related: #938708)
+ * MIR libcmis (LP related: #938709)
+ * MIR libexttextcat (LP related: #938582)
+ * MIR sampleicc (LP related: #938712)
+ * reenable reportdesigner
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 23 Feb 2012 14:33:42 +0100
+
+libreoffice (1:3.5.0-1ubuntu2) precise; urgency=low
+
+ * replaces/breaks for the unopkg move
+ * make gbuild use hardlinks and use linkoo in smoketest to save some
+ space
+ * do not run checks on powerpc armel armhf for now as they fail with
+ debug output level 11 is too high rules
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 22 Feb 2012 10:54:18 +0100
+
+libreoffice (1:3.5.0-1ubuntu1) precise; urgency=low
+
+ * Ubuntufy splash progress
+ * merge from debian-experimental-3.5
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 20 Feb 2012 03:26:05 +0100
+
+libreoffice (1:3.5.0-3) UNRELEASED; urgency=low
+
+ * debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
+ (+ testcase) from master
+
+ * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
+ lintian
+
+ -- Rene Engelhard <rene@debian.org> Thu, 23 Feb 2012 17:37:45 +0100
+
+libreoffice (1:3.5.0-1ubuntu1~ppa2) precise; urgency=low
+
+ * remove failing smoketest cleanup code for now
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 18 Feb 2012 18:53:38 +0100
+
+libreoffice (1:3.5.0-1ubuntu1~ppa1) precise; urgency=low
+
+ * reenable EVO2 and MEDIAWIKI extensions (reduces delta to debian)
+ * move unopkg wrapper from -common to -core to allow extension
+ registration
+ * do extension registration from -common to -core because we actually
+ have the binaries (unopkg.bin etc.) to do it there (LP: #917153)
+ * cherry-picked from debian-experimental-3.5:
+ debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
+ * use source tarballs from debian
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 17 Feb 2012 14:01:47 +0100
+
libreoffice (1:3.5.0-1) experimental; urgency=low
* LibreOffice 3.5.0 final release (identical to rc3)
@@@ -257,13 -171,6 +259,13 @@@ libreoffice (1:3.5.0~rc1-1) experimenta
-- Rene Engelhard <rene@debian.org> Fri, 20 Jan 2012 10:19:36 +0000
+libreoffice (1:3.5.0~beta2-2ubuntu4) precise; urgency=low
+
+ * demote lucene and java-common recommends to suggests for help
+ packages again (LP: #916726)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 19 Jan 2012 19:14:09 +0100
+
libreoffice (1:3.5.0~beta3-1) experimental; urgency=low
* new upstream beta release
@@@ -303,50 -210,6 +305,50 @@@
-- Rene Engelhard <rene@debian.org> Tue, 17 Jan 2012 10:03:24 +0000
+libreoffice (1:3.5.0~beta2-2ubuntu3) precise; urgency=low
+
+ * enable l10n
+ * get rid of obsolete BrOffice specialcasing (LP: #884786)
+ * add control tags as per 'firefox distro add-on support'-spec (picked
+ from oneiric-3.4)
+ * enable human theme and make it the default for gtk desktops
+ * cherry-pick Replaces commit from 3.4 (LP: #705343)
+ * cherry-pick demotion of java-Recommends for -writer to Suggests
+ * make preinst cleanup a bit more robust (LP: #915271)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 13 Jan 2012 11:09:32 +0100
+
+libreoffice (1:3.5.0~beta2-2ubuntu2) precise; urgency=low
+
+ * enable gio, disable gvfs
+ * backport fpicker kde4 workaround by Lubos Lunak
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 11 Jan 2012 11:43:19 +0100
+
+libreoffice (1:3.5.0~beta2-2ubuntu1) precise; urgency=low
+
+ * reenable junit tests
+ - however, disable sc unoapi tests for now
+ - unset DISPLAY for subsequenttests
+ * no dependencies needed for full builds
+ - propagate gb_FULLDEPS
+ * SOURCE_TREE still needed as root path
+ * also look for mozilla-plugin with pkg-config
+ * allow firefox-dev as alternative to xulrunner-dev
+ * for now, use internal:
+ - libcmis
+ - lpsolve
+ - libvisio
+ - lucene
+ - libexttextcat
+ - graphite
+ - sampleicc
+ * for now, disable:
+ - reportdesign
+ - smoketest on powerpc and armel
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 09 Jan 2012 16:21:55 +0100
+
libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
* debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
diff --combined patches/series
index 60aaed5,89c75ed..71cefe1
--- a/patches/series
+++ b/patches/series
@@@ -24,13 -24,13 +24,14 @@@ add-debian-multiarch-support.dif
propagate-gb_FULLDEPS.diff
disable-sc-sw-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
- #no-rcX-in-final.diff
armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
armhf-bridges-doubles.diff
-debian-hardened-buildflags.diff
fix-quickstart-shutdown.diff
bibliography-no-crash-if-no-base.diff
+ pyuno_fix_python2.diff
+ prevent-sax-obsolete-dir.diff
+pkgconfig-mozilla-plugin.diff
+ubuntu-quicklists.diff
diff --combined rules
index 3216370,756e6b9..e2003a6
--- a/rules
+++ b/rules
@@@ -62,8 -62,10 +62,8 @@@ export QUILT_PATCHES=debian/patche
export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.1.2 libreoffice-3.5.1.2
GIT_TAG=libreoffice-3.5.1.2
-GIT_BRANCH=tag-libreoffice-3.5.1.2
+GIT_BRANCH=libreoffice-3.5.1.2
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
@@@ -454,7 -456,6 +454,7 @@@ ifeq "$(DEB_VENDOR)" "Debian
BUILD_ONLY_EN_US=y
endif
CONFIGURE_FLAGS += --with-intro-progressbar-color=215,7,81
+ VENDOR_PRESENTATION_TEMPLATES=templates
endif
# Debian Squeeze
@@@ -466,22 -467,6 +466,22 @@@ ifeq "$(SQUEEZE_BACKPORT)" "y
ENABLE_PDFIMPORT=n
endif
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+ IMAGES+=human
+ CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
+ SYSTEM_STUFF := $(filter-out graphite libvisio lpsolve, $(SYSTEM_STUFF))
+ CONFIGURE_FLAGS += --with-intro-progressbar-color=221,72,20
+ # unfortunately way to heavy dependency-wise for main (via libloader)
+ ENABLE_REPORTDESIGN=n
+ # too heavy deps for main, internal copy does only build parts
+ SYSTEM_STUFF:=$(filter-out lucene,$(SYSTEM_STUFF))
+ # do not run checks on armel armhf powerpc for now as they fail with "debug output level 11 is too high"
+ ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
+ RUN_MAKE_CHECK:=n
+ endif
+ VENDOR_PRESENTATION_TEMPLATES=ubuntu-templates
+endif
+
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@@ -530,7 -515,7 +530,7 @@@ ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y
CONFIGURE_FLAGS += --disable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev
else
CONFIGURE_FLAGS += --disable-ext-pdfimport
endif
@@@ -871,7 -856,7 +871,7 @@@ ifneq (,$(filter nss, $(SYSTEM_STUFF))
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
- BUILD_DEPS+= , xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
+ BUILD_DEPS+= , xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS) | firefox-dev$(OOO_NO_NSPLUGIN_ARCHS)
endif
CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NSPLUGIN_ARCHS)))
@@@ -1235,6 -1220,7 +1235,7 @@@ clean
$(MAKE) distclean; \
rm -f config.status; \
fi
+ find $(SOURCE_TREE)/solenv/gdb -name "*.pyc" -exec rm {} \;
rm -rf $(SOURCE_TREE)/file-lists
rm -rf $(SOURCE_TREE)/pyuno-py3
rm -f configure aclocal.m4
@@@ -1609,7 -1595,7 +1610,7 @@@ ifeq "$(BUILD_PYUNO)" "y
endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- $(CURDIR)/debian/rules check
+ unset DISPLAY && $(CURDIR)/debian/rules check gb_FULLDEPS= gb_Deliver_HARDLINK=T
endif
touch $@
@@@ -1921,9 -1907,9 +1922,9 @@@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/in
> $$TMP && \
debian/scripts/cleandupes --base=libreoffice$(VER) --prefix=debian < $$TMP && rm -f $$TMP
-ifeq "$(DEB_VENDOR)" "Debian"
- # install Debian presentation template
- otps=`cd debian/templates; echo *.otp`; \
+ifneq "$(VENDOR_PRESENTATION_TEMPLATES)" ""
+ # install vendor presentation template
+ otps=`cd debian/$(VENDOR_PRESENTATION_TEMPLATES); echo *.otp`; \
for iso in $(LANGPACKISOS); do \
[ "$$iso" = "en-US" ] && continue; \
pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
--
LibreOffice packaging repository
Reply to: