Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv21996
Modified Files:
README changelog control.in rules
Log Message:
* Add changelog comments for patch changes in ooo-build
(descriptions not yet complete)
* Suggest msttcorefonts
* Don't move OpenSymbol in openoffice.org Woody backport since we don't
ship openoffice.org
* Remove README comment about -PP not working
Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- changelog 7 Jan 2004 21:45:39 -0000 1.256
+++ changelog 9 Jan 2004 09:39:53 -0000 1.257
@@ -9,6 +9,17 @@
netscape, patch taken from SuSE [RE]
- system-db: build with system libdb3 [RE]
- system-nas: build and link dynamically with system libaudio [RE]
+ - font-de-bitstreamize-en: Put bitstream Vera fonts much lower in the
+ font selection order because of missing glyphs and no italics in Serif
+ font (closes: #214588) [CH]
+ - no-splash-takeover: don't let splash screen take over
+ (closes: #175131 ??) [CH]
+ - gui-alpha-hypertoolbar: XXX
+ - pagein-speedup: XXX
+ - path-home-documents: Use ~/Documents as default document path if it
+ exists [MM, CH]
+ - recent-files: XXX
+ - sd-export-no-spell-check: XXX
- system-sane: build with system sane.h [RE]
- system-freetype: merged patch; use system freetype and fix for freetype
2.1.7 [RE]
@@ -19,6 +30,10 @@
- build-sparc-assembler: Use $(CC) for sparc assembler (closes: #218065)
[CH]
* Modified patches:
- config-switches.diff: add new --with-system-* flags [RE]
+ - system-freetype: (obsoletes...)
+ * Removed patches:
+ - berkelydb-handle-no-solar-java: XXX
+ - gui-symbol-remove: Broken (Hopefully will be fixed before upload) [CH]
* debian/rules:
- Fix uudecode/encoding of OpenSymbol font [CH]
- select DebianWoody patchset for builds on woody [CH]
@@ -29,6 +44,8 @@
then can used from oooprelink [RE]
- on Sparc, use sparc-linux-{gcc,g++} to force 32bit compile/link, instead
of ARCH_PREFIX variable [CH]
+ - don't change the location of OpenSymbol in the openoffice.org Woody
+ backport, since we only ship openoffice.org-bin [CH]
* debian/control.in:
- Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
support now (thanks to Ozgur Murat Homurlu) [CH]
@@ -46,6 +63,7 @@
+ add libcurl2-dev | libcurl-dev [RE]
+ add libmyspell-dev (>= 1:3.1-1) [RE]
+ add libaltlinuxhyph-dev - add libhnj-dev to Build-Conflicts: [RE]
+ * suggest msttcorefonts [CH]
* debian/scripts/*:
- add gen_lib_list [RE]
* debian/MANIFEST.*:
@@ -60,8 +78,11 @@
- add it.po, thanks Andrea Tasso (closes: #226640) [RE]
* ooo-build/patches/OOO_1_1_0/apply:
- add a second patchset, DebianWoody [CH, RE]
+ * debian/README:
+ - Remove comment about -PPn failing with Perl 5.8 - it was fixed by
+ Dan's parallel-build-fix.patch [CH]
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 7 Jan 2004 22:44:58 +0100
+ -- Chris Halls <[EMAIL PROTECTED]> Fri, 9 Jan 2004 08:21:10 +0100
openoffice.org (1.1.0-3) unstable; urgency=low
@@ -69,7 +90,7 @@
+ solar-use-fork: use fork in tools/source/solar/solar.c to make it build
with 2.5/2.6 kernels, thanks Ken Foskey (IZ #17241) [RE]
+ datasources_types_add_mysql: add missing MySQL entries in datasource
- dialog (closes: #218036), thanks Josep Monés i Teixador for the
+ dialog (closes: #218036), thanks Josep Monés i Teixador for the
patch [RE]
+ i18n-search-all: Fall back to any lanugage pack instead of crashing
if no -en or -de installed (closes: #171623) [CH]
Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- control.in 5 Jan 2004 02:55:12 -0000 1.113
+++ control.in 9 Jan 2004 09:39:53 -0000 1.114
@@ -11,7 +11,7 @@
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${debianutils-depends}
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, www-browser, libxrender1
+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, www-browser, libxrender1, msttcorefonts
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
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
@@ -33,6 +33,7 @@
automatically
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library
+ * msttcorefonts: Installs standard MS truetype fonts (contrib)
.
See README.Debian for information about using OpenOffice.org in Debian, known
bugs and workarounds. More information about the Debian packages is available
Index: README
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/README,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- README 24 Oct 2003 16:33:26 -0000 1.30
+++ README 9 Jan 2004 09:39:53 -0000 1.31
@@ -33,8 +33,9 @@
There are still some projects which fail, see IssueZilla #9443
-PPn - enable n projects to be built in parallel (-P flag to build.pl).
- This seems to hang when using perl 5.8.
-
+ The log output can get a little confusing, and some projects
+ may fail still
+
startfrom=<prj>
- Resume build from the specified project. Useful if a build is
interrupted.
Index: rules
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- rules 7 Jan 2004 16:57:31 -0000 1.180
+++ rules 9 Jan 2004 09:39:53 -0000 1.181
@@ -115,7 +115,6 @@
endif
USE_SYSTEM_STLPORT=n
#CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
- USE_FONTCONFIG=y
CONFIGURE_FLAGS+= --enable-fontconfig
PATCHSET=Debian
DEBIANUTILSDEPENDS=, debianutils (>= 2.0)
@@ -943,19 +942,9 @@
install -m644 debian/dictlistinfo \
$(MAINPKGDIR)/usr/share/myspell/infos/ooo/openoffice.org$(VER)
-ifeq "$(USE_FONTCONFIG)" "y"
mkdir -p $(MAINPKGDIR)/usr/share/fonts/truetype/openoffice
install -m644 $(OOO_BUILD)/fonts/opens___.ttf \
$(MAINPKGDIR)/usr/share/fonts/truetype/openoffice
-else
- mkdir -p $(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype
- for i in $(PKGOPENOFFICEDIR)/share/fonts/truetype/fonts.dir \
- $(PKGOPENOFFICEDIR)/share/fonts/truetype/fonts.dir.global \
- $(OOO_BUILD)/fonts/opens___.ttf; do \
- install -m644 $$i \
- $(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype ;\
- done
-endif
touch $@
