[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 9e8537d427eb2740f276e9a2ff345218950df1c0
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 34c708500a4b4b413908205c5835adf0cfe9d7d7
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Feb 22 15:11:32 2011 +0100
reducing diff to debian
diff --git a/rules b/rules
index dd1ff93..0ad6d02 100755
--- a/rules
+++ b/rules
@@ -109,7 +109,6 @@ OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcsp
PATCHSET=$(DIST)
BUILD_DEPS=
-
# These are components which can be built from internal copies, or used from the
# distribution. See configure --help for valid values (--with-system-<value>).
SYSTEM_STUFF = dicts
@@ -251,7 +250,6 @@ USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
PARALLEL_BUILD=n
-USE_COMMON_DOCDIR=n
MOZILLA=libxul
ENABLE_LDAP=y
USE_OPENLDAP=y
@@ -287,14 +285,13 @@ SYSTEM_STUFF += graphite
ALLOC=system
USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
-L10N_SEPARATE_SOURCE=n
# when we have a package we want to have to be installed on older things with some older
# 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 classic human
+IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen classic
ENABLE_MYSQLNATIVE=y
# cannot be disabled, unless you have a internal MySQL somewhere :-)
SYSTEM_STUFF += mysql mysql-cppconn
@@ -488,6 +485,7 @@ endif
ifeq "$(DIST)" "Ubuntu"
L10N_SEPARATE_SOURCE=y
USE_COMMON_DOCDIR=y
+ IMAGES += human
ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
BUILD_ONLY_EN_US=y
endif
@@ -782,7 +780,7 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
- BUILD_DEPS += , default-jdk-builddep$(OOO_NO_JAVA_ARCHS)
+ BUILD_DEPS += , default-jdk$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(JDK)" "java-gcj-compat"
JAVA_HOME=/usr/lib/jvm/java-gcj
@@ -803,9 +801,9 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , gij$(OOO_NO_GCJ_ARCHS), java-gcj-compat-dev (>= 1.0.76-7)$(OOO_NO_GCJ_ARCHS), libgcj-bc$(OOO_GCJ_ARCHS)
+ BUILD_DEPS += , default-jdk-builddep$(OOO_NO_GCJ_ARCHS), gij$(OOO_NO_GCJ_ARCHS), java-gcj-compat-dev (>= 1.0.76-7)$(OOO_NO_GCJ_ARCHS), libgcj-bc$(OOO_GCJ_ARCHS)
else
- BUILD_DEPS += , gcj-jdk$(OOO_NO_GCJ_ARCHS), libgcj-common (>= 1:4.4.1)$(OOO_NO_GCJ_ARCHS)
+ BUILD_DEPS += , gcj-native-helper$(OOO_NO_GCJ_ARCHS), libgcj-common (>= 1:4.4.1)$(OOO_NO_GCJ_ARCHS)
endif
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@ -1877,9 +1875,9 @@ ifeq "$(BUILD_KDE)" "n"
endif
ifeq ($(ON_BUILDD),y)
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=/tmp $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
else
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=/tmp $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
endif
# apparently setting this here globally doesn't work, so hack around.
--
LibreOffice packaging repository
Reply to: