[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0-2-45-g19d5a57
The following commit has been merged in the debian-experimental-4.2 branch:
commit 19d5a573cec9f9c6dafdf78c22d834fbaff389b3
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 30 15:38:06 2013 +0200
--with-system-xextensions-headers is gone/default
diff --git a/changelog b/changelog
index 75c948a..1214da3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.0~alpha0~git20130729-1) UNRELEASED; urgency=low
+libreoffice (1:4.2.0~alpha0~git20130730-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index 687b12e..31ee3e7 100755
--- a/rules
+++ b/rules
@@ -350,7 +350,6 @@ SYSTEM_STUFF += expat
SYSTEM_STUFF += odbc
SYSTEM_STUFF += curl
SYSTEM_STUFF += sane
-SYSTEM_STUFF += xextensions-headers
SYSTEM_STUFF += mesa-headers
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
@@ -636,9 +635,7 @@ endif
ifneq (,$(filter sane, $(SYSTEM_STUFF)))
BUILD_DEPS += , libsane-dev
endif
-ifneq (,$(filter xextensions-headers, $(SYSTEM_STUFF)))
BUILD_DEPS += , libxrender-dev
-endif
ifneq (,$(filter libpng, $(SYSTEM_STUFF)))
BUILD_DEPS += , libpng12-dev
endif
--
LibreOffice packaging repository
Reply to: