[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.1-3-153-gb42772d
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit f51ae4ed839a9b5b2158379f63869798108221bd
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 26 17:54:46 2011 +0200
reduce diff to debian
diff --git a/rules b/rules
index 4e079ef..20fc38e 100755
--- a/rules
+++ b/rules
@@ -573,7 +573,7 @@ endif
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgraphite-dev (>= 0.9.3)
+ BUILD_DEPS += , libgraphite2-dev (>= 0.9.3)
endif
else
CONFIGURE_FLAGS += --disable-graphite
@@ -1501,7 +1501,7 @@ endif
sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
-e "s|@CCODE@|$$CCODE|g" \
-e "s|@FONT_SUGGESTS@|$$FONT_SUGGESTS|g" \
- -e "s;@LOCALES_DEPENDS@;$$LOCALES_DEPENDS;g" \
+ -e "s:@LOCALES_DEPENDS@:$$LOCALES_DEPENDS:g" \
-e "s:@L10N_COMMON@:$$L10N_COMMON:g" \
-e "s|libreofficeVER|libreoffice$(VER)|g" \
-e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \
--
LibreOffice packaging repository
Reply to: