The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 9389dbbe3981951e6de2204d4303336c017287f8
Author: Bjoern Michaelsen <[email protected]>
Date: Mon Jul 4 11:34:01 2011 +0200
galaxy is now named 'default' in upstream configure, always explicitly
state wanted themes
diff --git a/rules b/rules
index 6fee9f1..2878ec3 100755
--- a/rules
+++ b/rules
@@ -267,8 +267,8 @@ SYSTEM_STUFF += cppunit
# C++ ABI (like it was the case with libreoffice2), we need to set this. Don't
touch
# otherwise
INTERNAL_STDLIBS=n
-DEFAULT_IMAGE=galaxy
-IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
+DEFAULT_IMAGE:=default
+IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast oxygen tango
ENABLE_MYSQLNATIVE=y
# cannot be disabled, unless you have a internal MySQL somewhere :-)
SYSTEM_STUFF += mysql mysql-cppconn
@@ -472,6 +472,7 @@ ifeq "$(L10N_SEPARATE_SOURCE)" "y"
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
+CONFIGURE_FLAGS += --enable-theme="$(IMAGES)"
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@ -969,7 +970,6 @@ endif
ifeq "$(BUILD_KDE)" "n"
CONFIGURE_FLAGS+= --disable-kde
CONFIGURE_FLAGS-= --disable-kde4
- CONFIGURE_FLAGS+= --with-themes="$(IMAGES)"
else
CONFIGURE_FLAGS += --disable-kde
KDE_ICONSET_DEP=libreoffice$(VER)-style-oxygen
@@ -997,7 +997,6 @@ endif
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk -Nlibreoffice$(VER)-gnome
- CONFIGURE_FLAGS+= --with-themes="$(IMAGES)"
endif
ifeq "$(ENABLE_EVO2)" "n"
--
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]
