Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24458
Modified Files:
changelog control control.in rules
Added Files:
catalog.xml openoffice.org.xmlcatalogs
Log Message:
* New patches:
- no-sans-serif.diff: don't use SansSerif as default font
thanks Matthias Klose [RE]
* debian/control.in, debian/rules: disable gnomevfs, broken
(closes: #279999) [RE]
* debian/control.in:
- Suggests ooqstart-gnome, not oooqstart-gnome (closes: #299673) [RE]
- Depend and Build-Depend on xml-core. [RE]
* debian/rules:
- copy local XML Catalog into the OOo DTD dir and use
dh_installxmlcatalogs to generate XML Catalogs, thanks Kjetil Kjernsmo
for proposing and helping ;-) (closes: #299430) [RE]
* debian/catalog.xml, debian/openoffice.org.xmlcatalogs: add [RE]
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- control.in 22 Feb 2005 19:57:02 -0000 1.166
+++ control.in 16 Mar 2005 10:32:35 -0000 1.167
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev,
libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev,
render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>=
4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev,
libstartup-notification0-dev, libebook-dev, lsb-release
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev,
libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev,
render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>=
4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork,
libstartup-notification0-dev, libebook-dev, lsb-release, xml-core
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>>
1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) |
openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts, ttf-opensymbol
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1,
msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome |
openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1, openclipart
+Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>>
1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) |
openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts, ttf-opensymbol, xml-core
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1,
msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome |
openoffice.org-kde, xlibmesa-gl | libgl1, openclipart
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),
openoffice.org-gnome, openoffice.org-spellcheck-nb-no (<= 20020814-1),
openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1,
openoffice.org-l10n-1.1.2, kwin-style-baghira (<< 0.6), kwin-baghira (<< 0.6)
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice-de-en, openoffice-de
@@ -108,7 +108,7 @@
Package: openoffice.org-gtk-gnome
Architecture: i386 powerpc sparc s390 arm
Depends: ${shlibs:Depends}, openoffice.org-bin (>= 1.1.2+1.1.3)
-Suggests: openoffice.org-gnomevfs, oooqstart-gnome
+Suggests: ooqstart-gnome
Section: gnome
Enhances: openoffice.org
Description: Gtk UI Plugin and GNOME File Picker for OpenOffice.org
@@ -117,17 +117,6 @@
.
This package contains the Gtk VCLPlug for drawing OOo's widgets with
Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME.
-
-Package: openoffice.org-gnomevfs
-Architecture: i386 powerpc sparc s390 arm
-Section: gnome
-Depends: ${shlibs:Depends}, openoffice.org-bin
-Enhances: openoffice.org-gtk-gnome, openoffice.org
-Description: GNOME VFS support for OpenOffice.org
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package enables OpenOffice.org to access files over GNOME VFS.
Package: openoffice.org-dev
Architecture: i386 powerpc sparc s390 arm
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -d -r1.435 -r1.436
--- changelog 25 Feb 2005 11:21:18 -0000 1.435
+++ changelog 16 Mar 2005 10:32:34 -0000 1.436
@@ -1,3 +1,21 @@
+openoffice.org (1.1.3-7.8pre) unstable; urgency=medium
+
+ * New patches:
+ - no-sans-serif.diff: don't use SansSerif as default font
+ thanks Matthias Klose [RE]
+ * debian/control.in, debian/rules: disable gnomevfs, broken
+ (closes: #279999) [RE]
+ * debian/control.in:
+ - Suggests ooqstart-gnome, not oooqstart-gnome (closes: #299673) [RE]
+ - Depend and Build-Depend on xml-core. [RE]
+ * debian/rules:
+ - copy local XML Catalog into the OOo DTD dir and use
+ dh_installxmlcatalogs to generate XML Catalogs, thanks Kjetil Kjernsmo
+ for proposing and helping ;-) (closes: #299430) [RE]
+ * debian/catalog.xml, debian/openoffice.org.xmlcatalogs: add [RE]
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 16 Mar 2005 01:30:09 +0100
+
openoffice.org (1.1.3-7) unstable; urgency=high
* debian/rules:
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- control 22 Feb 2005 19:57:01 -0000 1.199
+++ control 16 Mar 2005 10:32:35 -0000 1.200
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev,
libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev,
render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>=
4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev,
libstartup-notification0-dev, libebook-dev, lsb-release
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev,
libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev,
render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>=
4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork,
libstartup-notification0-dev, libebook-dev, lsb-release, xml-core
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>>
1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) |
openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts, ttf-opensymbol
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1,
msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome |
openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1, openclipart
+Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>>
1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) |
openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts, ttf-opensymbol, xml-core
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1,
msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome |
openoffice.org-kde, xlibmesa-gl | libgl1, openclipart
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),
openoffice.org-gnome, openoffice.org-spellcheck-nb-no (<= 20020814-1),
openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1,
openoffice.org-l10n-1.1.2, kwin-style-baghira (<< 0.6), kwin-baghira (<< 0.6)
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice-de-en, openoffice-de
@@ -108,7 +108,7 @@
Package: openoffice.org-gtk-gnome
Architecture: i386 powerpc sparc s390 arm
Depends: ${shlibs:Depends}, openoffice.org-bin (>= 1.1.2+1.1.3)
-Suggests: openoffice.org-gnomevfs, oooqstart-gnome
+Suggests: ooqstart-gnome
Section: gnome
Enhances: openoffice.org
Description: Gtk UI Plugin and GNOME File Picker for OpenOffice.org
@@ -117,17 +117,6 @@
.
This package contains the Gtk VCLPlug for drawing OOo's widgets with
Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME.
-
-Package: openoffice.org-gnomevfs
-Architecture: i386 powerpc sparc s390 arm
-Section: gnome
-Depends: ${shlibs:Depends}, openoffice.org-bin
-Enhances: openoffice.org-gtk-gnome, openoffice.org
-Description: GNOME VFS support for OpenOffice.org
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package enables OpenOffice.org to access files over GNOME VFS.
Package: openoffice.org-dev
Architecture: i386 powerpc sparc s390 arm
--- NEW FILE: openoffice.org.xmlcatalogs ---
local;debian/openoffice.org/usr/lib/openoffice/share/dtd/officedocument/1_0/catalog.xml;/usr/share/xml/openoffice.org/catalog.xml
root-and-package;public;-//OpenOffice.org//DTD OfficeDocument
1.0//EN;/usr/share/xml/openoffice.org/catalog.xml
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- rules 25 Feb 2005 11:21:18 -0000 1.261
+++ rules 16 Mar 2005 10:32:35 -0000 1.262
@@ -477,7 +477,7 @@
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
\
debian/openoffice.org-dev.links
- rm -rf tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro)
+# rm -rf tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro)
$(MAKE) -f debian/rules control
@@ -505,7 +505,7 @@
build: build-arch build-indep
build-arch: $(STAMP_DIR)/instsetoo
-build-arch: $(STAMP_DIR)/tools.gnomevfs
+#build-arch: $(STAMP_DIR)/tools.gnomevfs
build-indep: $(STAMP_DIR)/setupins
@@ -780,14 +780,14 @@
touch $@
-tools.gnomevfs: $(STAMP_DIR)/tools.gnomevfs
-$(STAMP_DIR)/tools.gnomevfs: $(STAMP_DIR)/solver
- # Then build tools again, this time with GnomeVFS enabled.
- . $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/tools && \
- OUTPATH="$$OUTPATH.gnomevfs" USE_GNOMEVFS=TRUE \
- $(BUILDCMD) $(BUILDFLAGS) -- $(DMAKEFLAGS)
-
- touch $@
+#tools.gnomevfs: $(STAMP_DIR)/tools.gnomevfs
+#$(STAMP_DIR)/tools.gnomevfs: $(STAMP_DIR)/solver
+# # Then build tools again, this time with GnomeVFS enabled.
+# . $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/tools && \
+# OUTPATH="$$OUTPATH.gnomevfs" USE_GNOMEVFS=TRUE \
+# $(BUILDCMD) $(BUILDFLAGS) -- $(DMAKEFLAGS)
+#
+# touch $@
# Build full installation set for BUILDLANG language
instsetoo: $(STAMP_DIR)/instsetoo
@@ -871,9 +871,6 @@
if [ $$PKG = openoffice.org-java ]; then \
cat debian/java-lib.sh >> $$MAINTSCRIPT ; \
fi ; \
- if [ $$PKG = openoffice.org-gnomevfs ]; then \
- cat debian/gnomevfs-lib.sh >> $$MAINTSCRIPT ; \
- fi ; \
cat debian/shell-lib.sh >> $$MAINTSCRIPT; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e
'/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
else \
@@ -885,6 +882,10 @@
fi; \
done; \
done
+# if [ $$PKG = openoffice.org-gnomevfs ]; then \
+# cat debian/gnomevfs-lib.sh >> $$MAINTSCRIPT ; \
+# fi ;
+
touch $@
# Run openoffice setup for net install
@@ -967,13 +968,13 @@
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-bin.install
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-java.install
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-gtk-gnome.install
-$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-gnomevfs.install
+#$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-gnomevfs.install
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-kde.install
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-dev.install
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-evolution.install
$(STAMP_DIR)/install-arch: $(STAMP_DIR)/manifest
$(STAMP_DIR)/install-arch: $(STAMP_DIR)/extract-sdk
-$(STAMP_DIR)/install-arch: $(STAMP_DIR)/tools.gnomevfs
+#$(STAMP_DIR)/install-arch: $(STAMP_DIR)/tools.gnomevfs
dh_testdir
dh_testroot
umask 022
@@ -1003,9 +1004,9 @@
# install gnomevfs version of libtl, We do it here, not in .install
# because of the output path
- install -m644 \
-
tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so \
-
$(MAINPKGDIR)-gnomevfs/$(OPENOFFICEDIR)/program/libtl$(BUILDNUM)$(LIBSUFFIX).so
+ #install -m644 \
+
#tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro)/lib/libtl$(BUILDNUM)$(LIBSUFFIX).so \
+
#$(MAINPKGDIR)-gnomevfs/$(OPENOFFICEDIR)/program/libtl$(BUILDNUM)$(LIBSUFFIX).so
# when we use external stlport we can just symlink to the "normal"
# stlport development headers; otherwise we need to install them...
@@ -1235,6 +1236,8 @@
cp $(OOO_BUILD)/desktop/*.png \
$(MAINPKGDIR)/usr/share/icons/hicolor/48x48/apps
+ cp debian/catalog.xml
$(MAINPKGDIR)/$(OPENOFFICEDIR)/share/dtd/officedocument/1_0
+
touch $@
# Install files generated by setup into package directories
@@ -1336,6 +1339,7 @@
dh_perl
dh_python
dh_desktop
+ dh_installxmlcatalogs
dh_compress
dh_fixperms
dh_installdeb
--- NEW FILE: catalog.xml ---
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
"file:///usr/share/xml/schema/xml-core/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
uri="/home/rene/tmp/openoffice.org-1.1.3/debian/openoffice.org//usr/lib/openoffice/share/dtd/officedocument/1_0/office.dtd"/>
</catalog>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
