[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc2-1-250-g3aa7282
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit c088a365cf51ffb3c0eaac88567ee3e6d4508d99
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Apr 9 14:26:47 2013 +0200
partially revert c7a71b816
- fonts-indic and fonts-deva are not yet renamed in raring
diff --git a/control.in b/control.in
index ef0ae97..903fe98 100644
--- a/control.in
+++ b/control.in
@@ -149,7 +149,7 @@ Depends: libreoffice-l10n-as,
libreoffice-l10n-ta,
libreoffice-l10n-te,
${misc:Depends}
-Recommends: fonts-indic
+Recommends: ttf-indic-fonts
Description: office productivity suite -- Indic language packages
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index 72f2cf0..1557cec 100755
--- a/rules
+++ b/rules
@@ -1405,7 +1405,7 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
FONT_SUGGESTS=", ttf-`echo $$LNAME | tr A-Z a-z`-fonts"; \
;; \
hi-in|ne|mr) \
- FONT_SUGGESTS=", fonts-deva"; \
+ FONT_SUGGESTS=", ttf-devanagari-fonts"; \
;; \
he) \
FONT_SUGGESTS=", culmus"; \
@@ -1470,7 +1470,7 @@ ifneq "$(ENABLE_HELP)" "n"
# en_US is in -common
perl -pi -e 's|(Depends: libreoffice-writer \| language-support-translations-en), libreoffice-l10n-en-us|\1|' \
debian/control
- perl -pi -e 's|(Depends: libreoffice-writer, libreoffice-l10n-en-us)|\1, fonts-deva|' \
+ perl -pi -e 's|(Depends: libreoffice-writer, libreoffice-l10n-en-us)|\1, ttf-devanagari-fonts|' \
debian/control
endif
cat debian/control.ure.in >> debian/control
--
LibreOffice packaging repository
Reply to: