[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0_beta2-2ubuntu3



The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 48167268d391ef21dcc7ae97953a549b8e43ef42
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Jan 13 00:07:58 2012 +0100

    adapt --with-images/--with-themes change to configure

diff --git a/rules b/rules
index 8c614c0..76c8c78 100755
--- a/rules
+++ b/rules
@@ -957,7 +957,7 @@ endif
 ifeq "$(BUILD_KDE)" "n"
 	CONFIGURE_FLAGS+= --disable-kde
 	CONFIGURE_FLAGS-= --disable-kde4
-	CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
+	CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
 else
 	CONFIGURE_FLAGS += --disable-kde
 	CONFIGURE_FLAGS += --enable-kde4
@@ -986,7 +986,7 @@ endif
 ifeq "$(BUILD_GTK)" "n"
 	CONFIGURE_FLAGS+= --disable-gtk
 	DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk -Nlibreoffice$(VER)-gnome
-	CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
+	CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
 else
 	BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
 endif

-- 
LibreOffice packaging repository


Reply to: