[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-176-gfaf5073
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit b1a39cd9e5dd4ce8f9986288c3ef06d2ba8b4d75
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Aug 25 11:23:27 2011 +0200
just preparing for lo-menubar, not actually packing it
diff --git a/changelog b/changelog
index a543df5..3e37a54 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,6 @@
libreoffice (1:3.4.2-3ubuntu1) UNRELEASED; urgency=low
* merge from debian 165efec47b35fa52a88e3b4bc8eaa410d2c323e0
- * enable lo-menubar
* refresh patch queues
* fix armel ftbs because in external/gcc3_specific (LP: #832121)
* regenerate control
diff --git a/rules b/rules
index 4a6825d..90fb5b2 100755
--- a/rules
+++ b/rules
@@ -457,13 +457,13 @@ ifeq "$(DIST)" "Ubuntu"
IMAGES += human
ON_BUILDD_VERBOSITY := true
PATCHSET=Ubuntu
+ ENABLE_LOMENUBAR:=n # lp#725250 MIR lo-menubar
USE_LZMA_COMPRESS=$(if $(filter-out armel,$(ARCH)),y,n)
# migrated flags from the old libreoffice-build/distro-config dir
CONFIGURE_FLAGS += \
--enable-gnome-vfs \
- --enable-lomenubar \
--enable-symbols \
--with-linker-hash-style=gnu \
--with-openldap \
@@ -485,6 +485,10 @@ ifeq "$(DIST)" "Ubuntu"
INTERNAL_STDLIBS=y
endif
+ ifeq "$(ENABLE_LOMENUBAR) "y"
+ CONFIGURE_FLAGS += --enable-lomenubar
+ endif
+
# FIXME: smoketest fails, but we need the indep packages for the other archs
# disabling for all archs to get rid of epm dependency
RUN_SMOKETEST=n
--
LibreOffice packaging repository
Reply to: