[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta1-2-8-g1d8d445
The following commit has been merged in the debian-experimental-4.1 branch:
commit 1d8d445fd933e21b35d2810a3f2bd5ec6e9d9d34
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 2 20:41:43 2013 +0200
remove obsolete harfbuzz Build-Conflicts conditional (which was broken anyways)
diff --git a/rules b/rules
index 6c8c766..6bf376a 100755
--- a/rules
+++ b/rules
@@ -1592,12 +1592,6 @@ ifeq "$(WHEEZY_BACKPORT)" "y"
endif
endif
-ifeq "$(WHEEZY_BACKPORT)" "y"
- ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))
- perl -pi -e "s/(Build-Conflicts: .*)/\1,libharfbuzz-dev (= 0.9.17-3),/" debian/control
- endif
-endif
-
ifneq "$(USE_MARIADB)" "y"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
endif
--
LibreOffice packaging repository
Reply to: