[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-8-gb236620
The following commit has been merged in the master branch:
commit 472e363230e422570c666877f95f5d857da638a9
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Mon Nov 21 14:17:40 2011 +0100
rename ttf-opensymbol to fonts-opensymbol
diff --git a/changelog b/changelog
index 4b38979..c7ade54 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:3.4.4-2) UNRELEASED; urgency=low
- disable mono in prepartion for mono transition
* debian/control.in, debian/rules:
- correctly disable SRB on gcj-archs
+ * debian/rules, debian/control.fonts.in:
+ - rename ttf-opensymbol to fonts-opensymbol
-- Rene Engelhard <rene@debian.org> Sun, 20 Nov 2011 13:11:02 +0000
diff --git a/control b/control
index 60caeab..82f048d 100644
--- a/control
+++ b/control
@@ -88,7 +88,7 @@ Description: office productivity suite -- Indic language packages
Package: libreoffice-core
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-common (>> ${base-version}), ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15), fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
+Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol | ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15), fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<< ${binary:Version}), libreoffice-impress (<< ${binary:Version}), libreoffice-draw (<< ${binary:Version}), libreoffice-base (<< ${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome (<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}), libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<< ${binary:Version}), libreoffice-officebean (<< ${binary:Version}), libreoffice-dev (<< ${binary:Version}), libreoffice-style-crystal (<< 1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango (<< 1:3.3.0-1), libreoffice-style-hicontrast (<< 1:3.3.0-1), libreoffice-style-galaxy (<< 1:3.3.0-1), libreoffice-style-andromeda (<< 1:3.3.0-1), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), lib
reoffice-kab (<< 1:3.4.1~)
Provides: libreoffice-bundled
@@ -180,7 +180,7 @@ Description: office productivity suite -- drawing
Package: libreoffice-math
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-opensymbol (>= 2:2.4.3~)
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, fonts-opensymbol | ttf-opensymbol (>= 2:2.4.3~)
Description: office productivity suite -- equation editor
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3216,16 +3216,26 @@ Description: LibreOffice extension for importing PDF documents
LibreOffice Draw.
Homepage: http://extensions.services.openoffice.org/project/pdfimport
-Package: ttf-opensymbol
+Package: fonts-opensymbol
Section: fonts
Architecture: all
Depends: ${misc:Depends}
Recommends: fontconfig
+Replaces: ttf-opensymbol
+Provides: ttf-opensymbol
Description: OpenSymbol TrueType font
This package contains the OpenSymbol TrueType font included in
LibreOffice. This font contains symbols (like fonts as Wingdings(tm)),
bullets (needed for bullets in LibreOffice) and non-latin character
+Package: ttf-opensymbol
+Section: fonts
+Architecture: all
+Depends: fonts-opensymbol
+Description: transitional package for fonts-opensymbol
+ This package is a transitiional package for font-opensymbol.
+ It can be removed when fonts-opensymbol is installed.
+
Package: libreoffice-dbg
Section: debug
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
diff --git a/control.fonts.in b/control.fonts.in
index 610bc14..882c816 100644
--- a/control.fonts.in
+++ b/control.fonts.in
@@ -1,10 +1,20 @@
-Package: ttf-opensymbol
+Package: fonts-opensymbol
Section: fonts
Architecture: all
Depends: ${misc:Depends}
Recommends: fontconfig
+Replaces: ttf-opensymbol
+Provides: ttf-opensymbol
Description: OpenSymbol TrueType font
This package contains the OpenSymbol TrueType font included in
LibreOffice. This font contains symbols (like fonts as Wingdings(tm)),
bullets (needed for bullets in LibreOffice) and non-latin character
+Package: ttf-opensymbol
+Section: fonts
+Architecture: all
+Depends: fonts-opensymbol
+Description: transitional package for fonts-opensymbol
+ This package is a transitiional package for font-opensymbol.
+ It can be removed when fonts-opensymbol is installed.
+
diff --git a/control.in b/control.in
index f7bd563..c47c89a 100644
--- a/control.in
+++ b/control.in
@@ -161,7 +161,7 @@ Description: office productivity suite -- Indic language packages
Package: libreofficeVER-core
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-common (>> ${base-version}),
- ttf-opensymbol (>= 1:3.0),
+ fonts-opensymbol | ttf-opensymbol (>= 1:3.0),
${shlibs:Depends},
ure (>= 1.5.1+OOo3.1.1-15),
fontconfig,
@@ -307,7 +307,7 @@ Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
- ttf-opensymbol (>= 2:2.4.3~)
+ fonts-opensymbol | ttf-opensymbol (>= 2:2.4.3~)
Description: office productivity suite -- equation editor
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 8a29847..d518721 100755
--- a/rules
+++ b/rules
@@ -2965,9 +2965,9 @@ endif
$(PKGDIR)-common/usr/share/myspell/dicts
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
- mkdir -p debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
+ mkdir -p debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf \
- debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
+ debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
rm -rf $(PKGDIR)-common/$(OODIR)/share/fonts/truetype
else
rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
@@ -3539,6 +3539,7 @@ endif
-Nlibuno-cli-cppuhelper1.0-cil \
-Nlibuno-cli-ure1.0-cil \
-Nttf-opensymbol \
+ -Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
-V'base-version=$(BASE_VERSION)' \
-V'basis-version=$(BASIS_VERSION)' \
@@ -3569,8 +3570,8 @@ ifeq "$(ENABLE_MONO)" "y"
-v$(shell grep CLI_URE_NEW_VERSION $(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
- dh_gencontrol -pttf-opensymbol -- \
- -v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);' debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_gencontrol -pttf-opensymbol -pfonts-opensymbol -- \
+ -v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);' debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -plibreoffice$(VER)-wiki-publisher -- \
--
LibreOffice packaging repository
Reply to: