[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-2-g7db12cd



The following commit has been merged in the master branch:
commit 41ea385c7b70e7e1d332bff96e6eb35b19b9978f
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Nov 16 22:30:12 2011 +0000

    recommend fonts-thai-tlwg instead of ttf-thai-tlwg (closes: #648785)

diff --git a/changelog b/changelog
index c37208c..9cc975b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.4.4-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - recommend fonts-thai-tlwg instead of ttf-thai-tlwg (closes: #648785)
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 16 Nov 2011 22:28:40 +0000
+
 libreoffice (1:3.4.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/control b/control
index 85691ef..f98acbe 100644
--- a/control
+++ b/control
@@ -2228,7 +2228,7 @@ Package: libreoffice-l10n-th
 Section: localization
 Architecture: all
 Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-th, ttf-thai-tlwg
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-th, fonts-thai-tlwg
 Provides: libreoffice-l10n-${help-l10n-virtual-version}
 Suggests: hunspell-dictionary-th | myspell-dictionary-th, hyphen-th, mythes-th, libreoffice-help-th
 Description: office productivity suite -- Thai language package
diff --git a/rules b/rules
index 9a68675..7532039 100755
--- a/rules
+++ b/rules
@@ -1444,7 +1444,9 @@ endif
 			FONT_SUGGESTS=", ttf-dzongkha"; \
 			;; \
 		th) \
-			FONT_SUGGESTS=", ttf-thai-tlwg"; \
+			if [ "$(SQUEEZE_BACKPORTS)" != "y" ]; then \
+			FONT_SUGGESTS=", fonts-thai-tlwg"; else \
+			FONT_SUGGESTS=", ttf-thai-tlwg"; fi; \
 			;; \
 		*) \
 			FONT_SUGGESTS= ;; \

-- 
LibreOffice packaging repository


Reply to: