[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.4-1-3-ga2ed2d9
The following commit has been merged in the debian-experimental-3.6 branch:
commit a2ed2d9358e40d29592efd1a5ed4cca8310b6957
Author: Rene Engelhard <rene@debian.org>
Date: Fri Dec 14 19:45:59 2012 +0100
also build-conflict against base-files (= 7.1)
diff --git a/rules b/rules
index 3fccd3b..7adba52 100755
--- a/rules
+++ b/rules
@@ -1476,7 +1476,7 @@ ifeq "$(ENABLE_GIO)" "y"
endif
ifneq "$(WHEEZY_BACKPORT)" "y"
- perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 7.0)/" debian/control
+ perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 7.0), base-files (= 7.1)/" debian/control
endif
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: