The following commit has been merged in the debian-experimental-4.2 branch:
commit 16d86be722883bc5ea2857295c3ae31b461bd2d6
Author: Rene Engelhard <r...@debian.org>
Date: Fri Jul 26 20:05:01 2013 +0200
git update; add vlc conditional
diff --git a/changelog b/changelog
index 69c5b0e..4eede8d 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.0~alpha0~git20130725-1) UNRELEASED; urgency=low
+libreoffice (1:4.2.0~alpha0~git20130726-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index 460e06f..1796b1e 100755
--- a/rules
+++ b/rules
@@ -252,6 +252,7 @@ ifneq "$(WHEEZY_BACKPORT)" "y"
else
GSTREAMER_VERSION=0.10
endif
+USE_VLC=y
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@ -1273,6 +1274,11 @@ else
CONFIGURE_FLAGS += --disable-gstreamer-0-10
endif
+ifeq "$(USE_VLC)" "y"
+ BUILD_DEPS += , libvlc-dev
+ CONFIGURE_FLAGS += --enable-vlc
+endif
+
ifneq (,$(filter neon, $(SYSTEM_STUFF)))
ifneq "$(NEON_SECTYPE)" "openssl"
BUILD_DEPS += , libneon$(NEONSONR)-$(NEON_SECTYPE)-dev
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v2mpg-0000tp...@vasks.debian.org
