CVS:oo-deb/debian changelog,1.338.2.25.2.21,1.338.2.25.2.22 control,1.175.2.8.2.11,1.175.2.8.2.12 control.in,1.142.2.6.2.12,1.142.2.6.2.13
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv21039
Modified Files:
Tag: OPENOFFICE_ORG680
changelog control control.in
Log Message:
- remove unused/-needed builddeps
- description fixes
- Suggests: fixes
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.21
retrieving revision 1.338.2.25.2.22
diff -u -d -r1.338.2.25.2.21 -r1.338.2.25.2.22
--- changelog 15 Mar 2005 22:22:11 -0000 1.338.2.25.2.21
+++ changelog 15 Mar 2005 23:56:37 -0000 1.338.2.25.2.22
@@ -16,12 +16,18 @@
g++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), libldap2-dev,
libexpat1-dev, libbgnomevfs2-dev, libant1.6-java, fastjar,
gjdoc [RE]
+ - (temporarily) remove unneeded/-used (libstlport4.6, libdb4.2++-dev,
+ libmyspell-dev, libaltlinuxhyph-dev, ..) or obsolete
+ (libart-2.0-dev, xsltproc, evolution-data-server-dev, ...)
+ build-depends [RE]
- build-depend on libneon24-dev instead of libneon23-dev [RE]
- version libnss-dev builddep (>= 1.7.5-1) [RE]
- - fix -cores description, it's arch-dependant [RE]
+ - fix -cores description, it's arch-dependant and update
+ openoffice.orgs description and Suggests [RE]
- add mozilla-openoffice.org [RE]
- make openoffice.org-core depend on libnss3 (>= 1.7.5),
it has no .shlibs (and no real SONAME anyway...)... [RE]
+ - Suggest openoffice.org2-thesaurus, format changed... [RE]
* debian/rules:
- compress manpages... [RE]
- install libstdc++.so.6 and libgcc_s.so.1 into $OODIR/program
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.12
retrieving revision 1.142.2.6.2.13
diff -u -d -r1.142.2.6.2.12 -r1.142.2.6.2.13
--- control.in 15 Mar 2005 22:22:12 -0000 1.142.2.6.2.12
+++ control.in 15 Mar 2005 23:56:38 -0000 1.142.2.6.2.13
@@ -3,15 +3,14 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7)) 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], zlib1g-dev, 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, libneon24-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
-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-1)
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7), autoconf, sharutils, libgtk2.0-dev, pkg-config, imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
Standards-Version: 3.6.1
Package: openoffice.orgVER
Architecture: i386 powerpc s390 sparc
Depends: openoffice.orgVER-core (>> ${base-version}), openoffice.orgVER-writer, openoffice.orgVER-calc, openoffice.orgVER-impress, openoffice.orgVER-draw, openoffice.orgVER-math
-Suggests: myspell-dictionary, openoffice.orgVER-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
-Description: Office suite core, version 2.0
+Suggests: myspell-dictionary, openoffice.orgVER-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, msttcorefonts, openoffice.orgVER-gnome | openoffice.orgVER-kde, xlibmesa-gl | libgl1
+Description: OpenOffice.org Office suite version 2.0
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@ -29,8 +28,9 @@
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
* openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
* ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
- * openoffice.org-gtk-gnome/-kde: Gtk/KDE UI Plugin and Gtk/KDE File Picker
- * openoffice.org-mimelnk: OpenOffice.org MIME bindings
+ * openoffice.org-gnome: Gtk UI Plugin, GNOME VFS, GConf and GNOME File Picker
+ support
+ * openoffice.org-kde: KDE UI Plugin and KDE File Picker support
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
* cupsys-bsd: Allows OpenOffice.org to detect your CUPS printer queues
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.11
retrieving revision 1.175.2.8.2.12
diff -u -d -r1.175.2.8.2.11 -r1.175.2.8.2.12
--- control 15 Mar 2005 22:22:11 -0000 1.175.2.8.2.11
+++ control 15 Mar 2005 23:56:37 -0000 1.175.2.8.2.12
@@ -3,15 +3,14 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7)) 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], zlib1g-dev, 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, libneon24-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1),
lsb-release, rpm , libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
-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-1)
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), gij-4.0 (>= 4.0-0pre7), autoconf, sharutils, libgtk2.0-dev, pkg-config, imagemagick, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm , libldap2-dev, libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar
Standards-Version: 3.6.1
Package: openoffice.org2
Architecture: i386 powerpc s390 sparc
Depends: openoffice.org2-core (>> ${base-version}), openoffice.org2-writer, openoffice.org2-calc, openoffice.org2-impress, openoffice.org2-draw, openoffice.org2-math
-Suggests: myspell-dictionary, openoffice.org2-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
-Description: Office suite core, version 2.0
+Suggests: myspell-dictionary, openoffice.org2-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, msttcorefonts, openoffice.org2-gnome | openoffice.org2-kde, xlibmesa-gl | libgl1
+Description: OpenOffice.org Office suite version 2.0
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@ -29,8 +28,9 @@
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
* openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
* ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
- * openoffice.org-gtk-gnome/-kde: Gtk/KDE UI Plugin and Gtk/KDE File Picker
- * openoffice.org-mimelnk: OpenOffice.org MIME bindings
+ * openoffice.org-gnome: Gtk UI Plugin, GNOME VFS, GConf and GNOME File Picker
+ support
+ * openoffice.org-kde: KDE UI Plugin and KDE File Picker support
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
* cupsys-bsd: Allows OpenOffice.org to detect your CUPS printer queues
Reply to: