The following commit has been merged in the ubuntu-raring-4.0 branch:
commit a67e2bb88e02ec9f8bef2828bf5a54da91c4282d
Author: Bjoern Michaelsen <[email protected]>
Date: Fri Dec 21 13:22:11 2012 +0100
bump version remove l10n special casing
diff --git a/changelog b/changelog
index 35cc839..1234ed1 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.0.0~beta2-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+ * merge from debian
+ * update to upstream beta1
+
+ -- Bjoern Michaelsen <[email protected]> Fri, 21 Dec 2012
13:13:29 +0100
+
libreoffice (1:4.0.0~beta2-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index 7c77f55..1c22eae 100755
--- a/rules
+++ b/rules
@@ -524,7 +524,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ENABLE_MERGELIBS=y
#temp. hacks
ENABLE_EVO2:=n
- BUILD_ONLY_EN_US=n # build a complete set, even if translations are
incomplete still
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
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
