[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-288-gba509b5
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit ba509b5d79ee7537813e00be272cbad43425461f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Jun 10 10:20:02 2013 +0200
use system orcus for real
diff --git a/changelog b/changelog
index 61a3923..0152526 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.1.0~beta2-0ubuntu1~ppa3) saucy; urgency=low
+
+ * use system orcus for real
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 10 Jun 2013 10:19:23 +0200
+
libreoffice (1:4.1.0~beta2-0ubuntu1~ppa2) saucy; urgency=low
* use system orcus
diff --git a/rules b/rules
index 3a5e373..1f76973 100755
--- a/rules
+++ b/rules
@@ -549,7 +549,7 @@ endif
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag harfbuzz, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag liborcus harfbuzz, $(SYSTEM_STUFF))
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -559,7 +559,7 @@ endif
ifeq "$(DEB_VENDOR)" "Ubuntu"
IMAGES+=human
CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
- SYSTEM_STUFF := $(filter-out graphite orcus lpsolve, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out graphite lpsolve, $(SYSTEM_STUFF))
# lp#1034560: MIR troubles make it easier to use internal jfreereport
SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
--
LibreOffice packaging repository
Reply to: