[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.1-3-153-gb42772d
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit b42772d5bb85e1b9dedfbd8d95626e759592f4dd
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jul 27 12:27:32 2011 +0200
reduce diff to debian
diff --git a/rules b/rules
index 20fc38e..8ee7c27 100755
--- a/rules
+++ b/rules
@@ -285,8 +285,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:=default
-IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast oxygen tango
+DEFAULT_IMAGE:=galaxy
+IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
# cannot be disabled, unless you have a internal MySQL somewhere :-)
SYSTEM_STUFF += mysql mysql-cppconn
@@ -879,11 +879,11 @@ endif
ifneq "$(OOO_MONO_ARCHS)" ""
ifeq "$(MONO2)" "y"
- BUILD_DEPS += , mono-devel $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)]
+ BUILD_DEPS += , mono-devel $(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)]
else
# mono-gmcs for gmcs itself and mkbundle2
# mono-mcs for mcs itself and al
- BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)], mono-1.0-devel [$(OOO_MONO_ARCHS)], mono-2.0-devel [$(OOO_MONO_ARCHS)]
+ BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)], mono-1.0-devel [$(OOO_MONO_ARCHS)], mono-2.0-devel [$(OOO_MONO_ARCHS)]
endif
endif
ifeq "$(ENABLE_MONO)" "y"
--
LibreOffice packaging repository
Reply to: