Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv32570/debian
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
changelog control control.in rules
Log Message:
- merge 1.1.0.6
- add da.po
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.3
retrieving revision 1.182.4.4
diff -u -d -r1.182.4.3 -r1.182.4.4
--- rules 27 Jan 2004 00:14:29 -0000 1.182.4.3
+++ rules 21 Feb 2004 01:58:22 -0000 1.182.4.4
@@ -322,7 +322,7 @@
# we do not need them and they make problem with dpkg-source....
rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
- $(OOO_BUILD)/templates/*.s*
+ $(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s*
cd $(SOURCE_TREE)/config_office && \
rm -f config.cache config.log \
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114.4.4
retrieving revision 1.114.4.5
diff -u -d -r1.114.4.4 -r1.114.4.5
--- control.in 9 Feb 2004 00:45:23 -0000 1.114.4.4
+++ control.in 21 Feb 2004 01:58:22 -0000 1.114.4.5
@@ -4,15 +4,15 @@
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb4.1++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev |
libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev
+Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.5.6
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1a), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1,
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, 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)
+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, prelink
+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
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
Description: high-quality office productivity suite
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.6
retrieving revision 1.262.4.7
diff -u -d -r1.262.4.6 -r1.262.4.7
--- changelog 9 Feb 2004 00:45:23 -0000 1.262.4.6
+++ changelog 21 Feb 2004 01:58:22 -0000 1.262.4.7
@@ -17,8 +17,11 @@
openoffice.org-10n-en (>> 1.1.0+1.1.a) | openoffice.org-l10n-1.1.1
* debian/local/openoffice-xlate-lang:
- add 50:sl:SLOVENIAN:Slovenian [RE]
+ * debian/po:
+ - add da.po, thanks Claus Hindsgaul (closes: #233268)
+ * merge 1.1.0-6 [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 8 Feb 2004 22:21:43 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 21 Feb 2004 02:29:25 +0100
openoffice.org (1.1.0+1.1.1a-1) experimental; urgency=low
@@ -47,6 +50,32 @@
- 1.1.1a updates [RE]
-- Rene Engelhard <[EMAIL PROTECTED]> Tue, 20 Jan 2004 03:21:17 +0100
+
+openoffice.org (1.1.0-6) unstable; urgency=low
+
+ * Modified patches:
+ - config-switches: add -L$XINC -lXt to the extra libs for the
+ nas and curl checks - fails on woody otherwise. Do not check for
+ the libdb_cxx.so symlink when we supply the version with
+ --with-db-version=A.B. Same Argument ;)
+ - system-db: fix to actually work in all circumstances [RE]
+ - recent-files: remove usage of rtl_ in the interface exposed
+ by recent-files.hxx (closes: #228324), create ~/.recently-used
+ if it does not exist (closes: #230912) [AB]
+ - psprint-handle-no-solar-java: Patch did not apply as indended,
+ fixed [CH]
+ - sc-show-sensitize: do not mark cells als multiselect
+ (closes: #229012) [AS]
+ - gtk-themeing: Fix text colour problems in some themes e.g. Mist [DW]
+ * debian/control.in:
+ - Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre1) due to enum failure [CH, RE]
+ - openoffice.org Conflicts with old package openoffice.org-gnome
+ (closes: #224675) [CH]
+ - Mention prelink in description (closes: #229564) [CH]
+ * debian/po:
+ - add es.po. Thanks Javi Castelo (closes: #232209) [RE]
+
+ -- Chris Halls <[EMAIL PROTECTED]> Mon, 16 Feb 2004 10:05:01 +0100
openoffice.org (1.1.0-5) unstable; urgency=low
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147.4.5
retrieving revision 1.147.4.6
diff -u -d -r1.147.4.5 -r1.147.4.6
--- control 9 Feb 2004 00:45:23 -0000 1.147.4.5
+++ control 21 Feb 2004 01:58:22 -0000 1.147.4.6
@@ -4,15 +4,15 @@
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb4.1++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev |
libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev
+Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.5.6
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1a), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) | openoffice.org-l10n-1.1.1,
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, 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)
+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, prelink
+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
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
Description: high-quality office productivity suite
