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

[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc2-1-246-g9ff9f34



The following commit has been merged in the ubuntu-raring-4.0 branch:
commit f07f8650c9f28f75b6bcd474c29b90568b4c3de4
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Apr 8 12:54:38 2013 +0200

    build against system liblangtag

diff --git a/changelog b/changelog
index 8ddaadc..8f52b6d 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
 libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa3) raring; urgency=low
 
   * some lintian tweaks
+  * build against system liblangtag (requested by Benjamin Drung)
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 02 Apr 2013 18:48:50 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Mon, 08 Apr 2013 12:53:27 +0200
 
 libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa2) raring; urgency=low
 
diff --git a/rules b/rules
index 9f2ac33..81fde0c 100755
--- a/rules
+++ b/rules
@@ -545,7 +545,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   ENABLE_MERGELIBS=y
   #temp. hacks
   ENABLE_EVO2:=n
-  SYSTEM_STUFF := $(filter-out liblangtag, $(SYSTEM_STUFF)) # using internal liblangtag for now -- debian reported armel troubles
   ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
     ENABLE_HELP=n
   endif

-- 
LibreOffice packaging repository


Reply to: