The following commit has been merged in the ubuntu-precise-3.5 branch:
commit cd2b077bab75dd51aa5e956d01a9136600e19cdd
Merge: b0d8982168b29dd2942f697557a4deec7f7bfd6f
f6acd44ba24120323b9fa18586356a5a9d03b8f6
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Sun Feb 19 21:49:31 2012 +0100
Merge branch 'debian-experimental-3.5' into ubuntu-precise-3.5
Conflicts:
changelog
patches/series
diff --combined changelog
index e2da5e0,59cfa2f..3915d7b
--- a/changelog
+++ b/changelog
@@@ -1,28 -1,21 +1,47 @@@
- libreoffice (1:3.5.0-1ubuntu1~ppa3) precise; urgency=low
++libreoffice (1:3.5.0-2ubuntu1) UNRELEASED; urgency=low
+
+ * Ubuntufy splash progress
++ * merge from debian-experimental-3.5
+
- -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Sun, 19 Feb 2012
21:35:11 +0100
++ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Sun, 19 Feb 2012
21:44:13 +0100
++
+ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
+
+ [ Rene Engelhard ]
+ * debian/patches/armhf-bridges*.diff: add armhf bridges fixes from
+ Jani Monoses
+ * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
+ remove, obsolete
+ * debian/patches/icu-arm.diff: fix internal icu build on arm.
+
+ * debian/rules:
+ - remove obsolete (and buggy) conditional icu-on-arm-fails breaking
+ the build
+
+ [ Bjoern Michaelsen ]
+ * debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
+
+ -- Rene Engelhard <r...@debian.org> Thu, 16 Feb 2012 22:46:30 +0000
+libreoffice (1:3.5.0-1ubuntu1~ppa2) precise; urgency=low
+
+ * remove failing smoketest cleanup code for now
+
+ -- Bjoern Michaelsen <bjoern.michael...@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.michael...@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)
@@@ -106,13 -99,6 +125,13 @@@ libreoffice (1:3.5.0~rc1-1) experimenta
-- Rene Engelhard <r...@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.michael...@canonical.com> Thu, 19 Jan 2012
19:14:09 +0100
+
libreoffice (1:3.5.0~beta3-1) experimental; urgency=low
* new upstream beta release
@@@ -152,50 -138,6 +171,50 @@@
-- Rene Engelhard <r...@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.michael...@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.michael...@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.michael...@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 bdc6183,f699fd5..f94db42
--- a/patches/series
+++ b/patches/series
@@@ -23,7 -23,6 +23,6 @@@ search-usr-share-for-images.dif
make-package-modules-not-suck.diff
fix-ARM-detection-in-set-soenv.diff
add-debian-multiarch-support.diff
- revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
disable-sc-sw-unoapi-subsequentcheck-for-now.diff
SwTblBoxFormula-destructor.diff
@@@ -31,4 -30,6 +30,7 @@@ ia64-oox-size.dif
mediwiki-oor-replace.diff
no-rcX-in-final.diff
odk-fix-rdb-paths.diff
+ armhf-bridges.diff
+ armhf-bridges-fix-armv4t-armel.diff
+ icu-arm.diff
+pkgconfig-mozilla-plugin.diff
diff --combined rules
index 684268d,cb40a54..d27b317
--- 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.0.3 libreoffice-3.5.0.3
GIT_TAG=libreoffice-3.5.0.3
-GIT_BRANCH=tag-libreoffice-3.5.0.3
+GIT_BRANCH=libreoffice-3-5.0.3
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
@@@ -347,10 -349,7 +347,7 @@@ endi
ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
ifneq (stdlibs,$(findstring stdlibs,$(SYSTEM_STUFF)))
- $(error sal doesn not built on arm with internal stdlibs!)
- endif
- ifneq (icu,$(findstring stdlibs,$(SYSTEM_STUFF)))
- $(error internal icu ddoes nt build on arm!)
+ $(error sal does not build on arm with internal stdlibs!)
endif
endif
@@@ -459,14 -458,6 +456,14 @@@ ifeq "$(SQUEEZE_BACKPORT)" "y
ENABLE_PDFIMPORT=n
endif
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+ IMAGES+=human
+ CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
+ ENABLE_REPORTDESIGN:=n
+ SYSTEM_STUFF := $(filter-out lucene libcmis libexttextcat graphite
sampleicc libvisio lpsolve, $(SYSTEM_STUFF))
+ CONFIGURE_FLAGS += --with-intro-progressbar-color=221,72,20
+endif
+
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@@ -515,7 -506,7 +512,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
@@@ -868,7 -859,7 +865,7 @@@ ifneq (,$(filter nss, $(SYSTEM_STUFF))
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
- BUILD_DEPS+= , xulrunner-dev
+ BUILD_DEPS+= , xulrunner-dev | firefox-dev
endif
CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NPSOPLUGIN_ARCHS)))
@@@ -1620,7 -1611,7 +1617,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=
endif
touch $@
@@@ -1638,7 -1629,10 +1635,11 @@@ endi
export HOME=$(CURDIR)/debian/smoketest; \
export SAL_USE_VCLPLUGIN="svp"; \
$(MAKE) check gb_FULLDEPS=
+ # doesn't get cleaned up.. (at least the dirs, the contents are gone)
+ cd $(CURDIR)/debian/smoketest && \
+ find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \;
+
+
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
patch -p1 -R <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
@@@ -3044,7 -3038,7 +3045,7 @@@ ifeq "$(USE_GIT_TARBALLS)" "y
GIT_INSTALLED:=$(shell which git >/dev/null 2>/dev/null && echo "y")
-get_orig_tarball=$(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig$(1).tar.bz2
+get_orig_tarball=$(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig$(1).tar.xz
define pack_gittarball
$(if $(GIT_INSTALLED),,$(error You need git.))
--
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/e1rzoun-0006qc...@vasks.debian.org
