[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 08/20: diable vlc again



This is an automated email from the git hooks/post-receive script.

sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.

commit 334adaa1f2bef23d53813b37abd540e5649985b7
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Nov 21 23:46:25 2013 +0100

    diable vlc again
---
 changelog | 4 ++--
 rules     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 9162a2d..8f96093 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,8 @@
-libreoffice (1:4.2.0~beta1-0ubuntu1~trusty1~ppa1) trusty; urgency=low
+libreoffice (1:4.2.0~beta1-0ubuntu1~trusty1~ppa2) trusty; urgency=low
 
   * upstream beta build
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 21 Nov 2013 08:52:23 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 21 Nov 2013 23:44:27 +0100
 
 libreoffice (1:4.2.0~alpha1-0ubuntu1~trusty1~ppa2) trusty; urgency=low
 
diff --git a/rules b/rules
index c63ac1b..28738f8 100755
--- a/rules
+++ b/rules
@@ -621,6 +621,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   ifeq ($(ON_BUILDD),y)
     buildd_discspace_hack:=find workdir/ -type f -name '*.o' -exec mv {} {}_org \; -exec touch -r {}_org {} \; -exec rm {}_org \;
   endif
+  USE_VLC:=n
   #temp. hacks
   ENABLE_EVO2:=n
   SYSTEM_STUFF := $(filter-out libcmis mdds libodfgen libmwaw libetonyek libfreehand libebook lpsolve, $(SYSTEM_STUFF))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: