CVS:oo-deb/debian changelog,1.243,1.244 control,1.139,1.140 control.in,1.107,1.108 rules,1.169,1.170
Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv8457
Modified Files:
changelog control control.in rules
Log Message:
* debian/rules:
- Fix uudecode/encoding of OpenSymbol font
* debian/control.in:
- Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
support now (thanks to Ozgur Murat Homurlu)
* 1.1.0-3.pre4
Index: rules
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- rules 17 Nov 2003 14:37:35 -0000 1.169
+++ rules 11 Dec 2003 12:54:57 -0000 1.170
@@ -359,9 +359,10 @@
rm -f desktop/source/icons/*.xpm
# uuencode OpenSymbol font
- if [ -f $(OOO_BUILD)/fonts/opens___.ttf ]; then \
+ if [ -s $(OOO_BUILD)/fonts/opens___.ttf ]; then \
uuencode $(OOO_BUILD)/fonts/opens___.ttf opens___.ttf \
- > $(OOO_BUILD)/fonts/opens___.ttf.uu ;\
+ > $(OOO_BUILD)/fonts/opens___.ttf.uu &&\
+ touch -r $(OOO_BUILD)/fonts/opens___.ttf.uu $(OOO_BUILD)/fonts/opens___.ttf ;\
fi
rm -f $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/symbols.xls
@@ -502,9 +503,10 @@
endif
# uudecode OpenSymbol font
- if [ ! -f $(OOO_BUILD)/fonts/opens___.ttf ]; then \
- uudecode $(OOO_BUILD)/fonts/opens___.ttf.uu \
- > $(OOO_BUILD)/fonts/opens___.ttf ;\
+ if [ ! -s $(OOO_BUILD)/fonts/opens___.ttf ]; then \
+ uudecode -o $(OOO_BUILD)/fonts/opens___.ttf \
+ $(OOO_BUILD)/fonts/opens___.ttf.uu ;\
+ touch -r $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/opens___.ttf.uu ;\
fi
touch $@
@@ -942,7 +944,8 @@
$(PKGOPENOFFICEDIR)/share/fonts/truetype/fonts.dir.global \
$(OOO_BUILD)/fonts/opens___.ttf; do \
install -m644 $$i \
- $(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype
+ $(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype ;\
+ done
endif
touch $@
Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- control.in 17 Nov 2003 11:01:42 -0000 1.107
+++ control.in 11 Dec 2003 12:54:57 -0000 1.108
@@ -9,7 +9,7 @@
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
-Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
+Recommends: openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n, openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6), openoffice.org-spellcheck-de-ch (<= 20020701-6), openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es (<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -20,8 +20,6 @@
.
You can extend the functionality of OpenOffice.org by installing these
packages:
- * x-ttcidfont-conf: Makes all defoma-registered fonts on your system
- available to OpenOffice.org
* myspell-dictionary: Myspell dictionaries for use with OpenOffice.org
* openoffice.org-help: User help
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- changelog 18 Nov 2003 15:36:04 -0000 1.243
+++ changelog 11 Dec 2003 12:54:57 -0000 1.244
@@ -1,3 +1,13 @@
+openoffice.org (1.1.0-3.pre4) unstable; urgency=low
+
+ * debian/rules:
+ - Fix uudecode/encoding of OpenSymbol font [CH]
+ * debian/control.in:
+ - Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
+ support now (thanks to Ozgur Murat Homurlu) [CH]
+
+ -- Chris Halls <halls@debian.org> Wed, 3 Dec 2003 15:08:18 +0100
+
openoffice.org (1.1.0-3) unstable; urgency=low
* New patches:
Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- control 17 Nov 2003 11:01:42 -0000 1.139
+++ control 11 Dec 2003 12:54:57 -0000 1.140
@@ -9,7 +9,7 @@
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final, dictionaries-common (>= 0.10) | openoffice.org-updatedicts
-Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
+Recommends: openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, openoffice.org-crashrep, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n, openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6), openoffice.org-spellcheck-de-ch (<= 20020701-6), openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es (<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -20,8 +20,6 @@
.
You can extend the functionality of OpenOffice.org by installing these
packages:
- * x-ttcidfont-conf: Makes all defoma-registered fonts on your system
- available to OpenOffice.org
* myspell-dictionary: Myspell dictionaries for use with OpenOffice.org
* openoffice.org-help: User help
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
Reply to: