[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-2-1-g6f8a321
The following commit has been merged in the master branch:
commit 6f8a321e1a28019c1b25c85ae53a093ac3a0c846
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Wed Jun 19 21:18:14 2013 +0200
typo
diff --git a/control b/control
index 88635fb..efd1661 100644
--- a/control
+++ b/control
@@ -19,7 +19,7 @@ Build-Depends: ant (>= 1.7.0),
flex | flex-old,
g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
- gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64],
+ gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
diff --git a/rules b/rules
index 414bc6c..af86b10 100755
--- a/rules
+++ b/rules
@@ -546,7 +546,7 @@ CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
- BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+ BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
--
LibreOffice packaging repository
Reply to: