[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-187-g316eba9
The following commit has been merged in the debian-experimental-4.0 branch:
commit b61fa9bea20f9ad94a6787742b5e924b27624d5b
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 27944eb..8439114 100755
--- a/rules
+++ b/rules
@@ -1509,7 +1509,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: