[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-30-gda67782
The following commit has been merged in the debian-experimental-4.0 branch:
commit c7a71b816164e78ec9403905263a6aeb1a4663da
Author: Benjamin Drung <bdrung@debian.org>
Date: Thu Mar 7 23:09:09 2013 +0100
Apply fonts package renames from ttf-foo to fonts-foo.
diff --git a/control.in b/control.in
index 14c14ad..8e12566 100644
--- a/control.in
+++ b/control.in
@@ -77,7 +77,7 @@ Depends: libreofficeVER-base%OOO_NO_BASE_ARCHS%,
libreofficeVER-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
libreofficeVER-writer,
ttf-dejavu,
- ttf-sil-gentium-basic,
+ fonts-sil-gentium-basic,
${java-common-depends},
${misc:Depends},
${pyuno-depends}
@@ -179,7 +179,7 @@ Depends: libreofficeVER-l10n-as,
libreofficeVER-l10n-ta,
libreofficeVER-l10n-te,
${misc:Depends}
-Recommends: ttf-indic-fonts
+Recommends: fonts-indic
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 703a1ec..a6504da 100755
--- a/rules
+++ b/rules
@@ -1348,22 +1348,22 @@ 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=", ttf-devanagari-fonts"; \
+ FONT_SUGGESTS=", fonts-deva"; \
;; \
he) \
FONT_SUGGESTS=", culmus"; \
;; \
km) \
- FONT_SUGGESTS=", ttf-khmeros"; \
+ FONT_SUGGESTS=", fonts-khmeros"; \
;; \
ar) \
- FONT_SUGGESTS=", ttf-arabeyes"; \
+ FONT_SUGGESTS=", fonts-arabeyes"; \
;; \
fa) \
- FONT_SUGGESTS=", ttf-farsiweb"; \
+ FONT_SUGGESTS=", fonts-farsiweb"; \
;; \
dz) \
- FONT_SUGGESTS=", ttf-dzongkha"; \
+ FONT_SUGGESTS=", fonts-dzongkha"; \
;; \
th) \
FONT_SUGGESTS=", fonts-thai-tlwg"; \
@@ -1416,7 +1416,7 @@ ifneq "$(ENABLE_HELP)" "n"
# en_US is in -common
perl -pi -e 's|(Depends: libreoffice$(VER)-writer \| language-support-translations-en), libreoffice$(VER)-l10n-en-us|\1|' \
debian/control
- perl -pi -e 's|(Depends: libreoffice$(VER)-writer, libreoffice$(VER)-l10n-en-us)|\1, ttf-devanagari-fonts|' \
+ perl -pi -e 's|(Depends: libreoffice$(VER)-writer, libreoffice$(VER)-l10n-en-us)|\1, fonts-deva|' \
debian/control
endif
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
--
LibreOffice packaging repository
Reply to: