[libreoffice] 01/01: move hardcoded (i386 (!)kfreebsd-amd64 to (!)kfreebsd-any
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 742981d0175e8d158d6d3007018729a513af7ba9
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 3 00:56:25 2016 +0200
move hardcoded (i386 (!)kfreebsd-amd64 to (!)kfreebsd-any
---
changelog | 3 ++-
control | 10 +++++-----
rules | 12 ++++++------
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index 13514be..5904353 100644
--- a/changelog
+++ b/changelog
@@ -3,7 +3,8 @@ libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium
* debian/rules:
- print error in control without gcj-jdk installed
- don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
- - disable the tests on kfreebsd-* (see #801865)
+ - disable the tests on kfreebsd-* (see #801865), move hardcoded
+ (!)kfreebsd-i386 (!)kfreebsd-amd64 to (!)kfreebsd-any
-- Rene Engelhard <rene@debian.org> Tue, 03 May 2016 00:01:09 +0200
diff --git a/control b/control
index 612afca..12c778b 100644
--- a/control
+++ b/control
@@ -16,7 +16,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 9.20160115),
default-jdk (>= 1:1.7-48) [ia64],
- default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386],
+ default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
default-jdk [!mips64],
dh-python,
dpkg-dev (>= 1.18.2~),
@@ -31,24 +31,24 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
gcc-5 [hppa ia64 s390 sparc],
gcj-jdk [hppa ia64 s390 sparc],
gcj-native-helper [hppa ia64 s390 sparc],
- gdb [!kfreebsd-i386 !kfreebsd-amd64],
+ gdb [!kfreebsd-any],
gettext,
gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2) [!kfreebsd-i386 !kfreebsd-amd64],
+ junit4 (>= 4.8.2-2) [!kfreebsd-any],
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
libavahi-client-dev,
- libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libbluetooth-dev [!kfreebsd-any],
libboost-date-time-dev (>= 1.58),
libboost-dev (>= 1.58),
libboost-filesystem-dev (>= 1.58),
libboost-iostreams-dev (>= 1.58),
libboost-system-dev (>= 1.58),
- libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
+ libc0.1 (>= 2.10.2-7) [kfreebsd-any],
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev (>= 0.1),
diff --git a/rules b/rules
index 4055cc0..9e58a90 100755
--- a/rules
+++ b/rules
@@ -93,7 +93,7 @@ BUILD_DEPS=\
flex (>= 2.3.35), \
gperf,\
libarchive-zip-perl,\
- libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],\
+ libc0.1 (>= 2.10.2-7) [kfreebsd-any],\
libcups2-dev,\
libfontconfig1-dev,\
libfreetype6-dev (>= 2.2.0),\
@@ -870,7 +870,7 @@ ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)"
endif
endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!alpha !ia64 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2) [...]
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-any], libc0.3-dbg [hurd-i386], libc6-dbg [!alpha !ia64 !kfreebsd-i386 !kfreebas-any] !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
endif
PYTHON_SIX_RECOMMENDS = python3-six
endif
@@ -930,12 +930,12 @@ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
- BUILD_DEPS += , gdb [!kfreebsd-i386 !kfreebsd-amd64]
+ BUILD_DEPS += , gdb [!kfreebsd-any]
BUILD_DEPS += , fontconfig
BUILD_DEPS += , fonts-liberation
BUILD_DEPS += , fonts-crosextra-carlito
ifeq "$(ENABLE_JUNIT4)" "y"
- BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) [!kfreebsd-i386 !kfreebsd-amd64]
+ BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) [!kfreebsd-any]
else
CONFIGURE_FLAGS += --without-junit
endif
@@ -1006,7 +1006,7 @@ ifeq "$(ENABLE_JAVA)" "y"
BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64]
endif
ifneq (,$(findstring kfreebsd,$(OOO_JAVA_ARCHS)))
- BUILD_DEPS += , default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386]
+ BUILD_DEPS += , default-jdk (>= 2:1.7-52.1) [kfreebsd-any]
endif
ifeq ($(java_default_version),5)
JDK=gcj-jdk
@@ -1448,7 +1448,7 @@ ifeq "$(USE_DBUS)" "y"
CONFIGURE_FLAGS += --enable-dbus
ifeq "$(ENABLE_BLUETOOTH)" "y"
ifneq (,$(filter bluez, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386]
+ BUILD_DEPS += , libbluetooth-dev [!kfreebsd-any]
endif
else
CONFIGURE_FLAGS += --disable-sdremote-bluetooth
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: