[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-1-1-gd77fbb5
The following commit has been merged in the debian-experimental-4.0 branch:
commit d77fbb57725dfeb4d65e719a299b3a9e41f603bf
Author: Rene Engelhard <rene@debian.org>
Date: Sat Feb 23 12:33:11 2013 +0100
fix Build-Conflicts
diff --git a/control b/control
index 917601c..00df3cd 100644
--- a/control
+++ b/control
@@ -137,6 +137,7 @@ Build-Depends-Indep: bsh (>= 2.0b4),
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
xml-core
Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
+ ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
flex (= 2.5.34-1) [amd64],
g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
@@ -152,7 +153,7 @@ Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
libc6-dev (= 2.6.1-3) [i386 amd64],
libc6-dev (= 2.6.1-4) [i386 amd64],
libcairo2 (= 1.4.8-1),
- libhsqldb-java (>= 1.8.1~) ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
+ libhsqldb-java (>= 1.8.1~),
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
diff --git a/rules b/rules
index e413726..6ec63fb 100755
--- a/rules
+++ b/rules
@@ -1517,7 +1517,7 @@ ifeq "$(ENABLE_GIO)" "y"
endif
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
- perl -pi -e "s/(Build-Conflicts: .*)/\1, libhsqldb-java (>= $(HSQLDB_TOONEWVER)~)/" debian/control
+ perl -pi -e "s/(Build-Conflicts: .*)/\1,libhsqldb-java (>= $(HSQLDB_TOONEWVER)~),/" debian/control
endif
ifeq (4.4,$(SYSTEM_GCC_VERSION))
--
LibreOffice packaging repository
Reply to: