[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian changelog,1.363,1.364 control,1.186,1.187 control.in,1.153,1.154 control.lang.in,1.23,1.24 rules,1.233,1.234



Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv13951

Modified Files:
	changelog control control.in control.lang.in rules 
Log Message:
- mention the CUPS fixes
- mention the security fix
- s/openoffice.org/OpenOffice.org/ here too
- fix some snafus in debian/rules
- conflict against broken oo-d-f
- build-conflict against older libidn11 not working with libcurl3
- remove www-browser from openoffice.org's Suggests
- tighten language pack depends


Index: control.lang.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.lang.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- control.lang.in	10 Jul 2004 14:31:50 -0000	1.23
+++ control.lang.in	17 Sep 2004 07:40:21 -0000	1.24
@@ -1,6 +1,6 @@
 Package: openoffice.org-l10n-@LCODE@
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-@LCODE@
 Replaces: openoffice.org1.1-l10n-@LCODE@
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-@LCODE@
@@ -9,7 +9,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  @LNAME@. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- control.in	27 Jul 2004 19:40:24 -0000	1.153
+++ control.in	17 Sep 2004 07:40:21 -0000	1.154
@@ -4,14 +4,14 @@
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
 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, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | dpkg-dev (<< 1.10), 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 | dpkg-dev (<< 1.10), libdb4.2++-dev | dpkg-dev (<< 1.10), libaudio-dev | nas-dev, xlibs-static-pic | dpkg-dev (<< 1.10), libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl3-dev | dpkg-dev (<< 1.10), libmyspell-dev (>= 1:3.1-1) | dpkg-dev (<< 1.10), libaltlinuxhyph-dev (>= 0.1.1-6) | dpkg-dev (<< 1.10), libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xl
 ibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | dpkg-dev (<< 1.10), libneon23-dev | dpkg-dev (<< 1.10), libstlport4.6-dev (>= 4.6.2-1) | dpkg-dev (<< 1.10), libcupsys2-dev
-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)
+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)
 Standards-Version: 3.6.1
 
 Package: openoffice.org
 Architecture: all
 Depends: openoffice.org-debian-files (>> 1.1.1+1.1.2rc3), openoffice.org-bin (>> 1.1.1+1.1.2rc3), openoffice.org-l10n-en (>> 1.1.1+1.1.2rc3) | openoffice.org-l10n-1.1.2, 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, www-browser, libxrender1, msttcorefonts, openoffice.org-mimelnk
-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
+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
+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-debian-files (= 1.1.2+3-1), openoffice.org-debian-files (= 1.1.2+3-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-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.363
retrieving revision 1.364
diff -u -d -r1.363 -r1.364
--- changelog	12 Aug 2004 14:38:08 -0000	1.363
+++ changelog	17 Sep 2004 07:40:20 -0000	1.364
@@ -1,9 +1,36 @@
-openoffice.org (1.1.2-3.4pre) unstable; urgency=low
+openoffice.org (1.1.2-3.4pre) unstable; urgency=high
 
+  * Urgency because of temporary file permissions and important CUPS
+    fixes...
+  * New patch:
+    - tmpfile-mask.diff: ensure temporary files are only readable by the
+      user - IZ#33357, CAN-2004-0752 (closes: #271503) [CH]
+  * Modified patches:
+    - psprint-cups.diff: Backport pl's fixes from m51 to fix some crashes,
+      PPD problems and hanging when a CUPS server isn't available [CH]
+      closes: #265148: Cannot print with CUPS
+      closes: #254239: cups printer device options missing
+      closes: #260007: does not start if cups server not available
   * debian/rules:
-    - fix broken if statement breaking with-Java builds, thanks martink [RE]
+    - fix broken if statement breaking with-Java builds, thanks martink
+      (closes: #268173) [CH] 
+    - oops, exchange spaces to a tab at installing internal db for Java builds,
+      thanks Konstantin Seiler (closes: #267979) [RE]
+    - ignore CVS dirs when checking for the berkeleydb version on Woody
+      backports, thanks Konstantin Seiler again (closes: #268172)
+  * debian/control.*:
+    - yet another s/openoffice.org/OpenOffice.org/ in the langpack
+      descriptions [RE]
+    - add Build-Conflicts: against libidn11 (<< 0.5.2-1) since libcurl3
+      needs those newer versions but didn't declare it because of broken
+      .shlibs in libidn11 [RE]
+    - remove www-browser from openoffice.orgs Suggests: [RE]
+    - tighten language packs depends (closes: #266042) [RE]
+    - conflict against openoffice.org-debian-files (= 1.1.2-3+1) and
+      openoffice.org-debian-files (= 1.1.2-3+2) because they miss important
+      stuff [RE]
 
- -- Rene Engelhard <rene@debian.org>  Thu, 12 Aug 2004 16:36:14 +0200
+ -- Rene Engelhard <rene@debian.org>  Thu, 16 Sep 2004 23:10:01 +0200
 
 openoffice.org (1.1.2-3) unstable; urgency=medium
 

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- control	27 Jul 2004 19:40:23 -0000	1.186
+++ control	17 Sep 2004 07:40:21 -0000	1.187
@@ -4,14 +4,14 @@
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
 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, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | dpkg-dev (<< 1.10), 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 | dpkg-dev (<< 1.10), libdb4.2++-dev | dpkg-dev (<< 1.10), libaudio-dev | nas-dev, xlibs-static-pic | dpkg-dev (<< 1.10), libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl3-dev | dpkg-dev (<< 1.10), libmyspell-dev (>= 1:3.1-1) | dpkg-dev (<< 1.10), libaltlinuxhyph-dev (>= 0.1.1-6) | dpkg-dev (<< 1.10), libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xl
 ibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | dpkg-dev (<< 1.10), libneon23-dev | dpkg-dev (<< 1.10), libstlport4.6-dev (>= 4.6.2-1) | dpkg-dev (<< 1.10), libcupsys2-dev
-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)
+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)
 Standards-Version: 3.6.1
 
 Package: openoffice.org
 Architecture: all
 Depends: openoffice.org-debian-files (>> 1.1.1+1.1.2rc3), openoffice.org-bin (>> 1.1.1+1.1.2rc3), openoffice.org-l10n-en (>> 1.1.1+1.1.2rc3) | openoffice.org-l10n-1.1.2, 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, www-browser, libxrender1, msttcorefonts, openoffice.org-mimelnk
-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
+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
+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-debian-files (= 1.1.2+3-1), openoffice.org-debian-files (= 1.1.2+3-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-de-en, openoffice-de
 Description: high-quality office productivity suite
@@ -114,7 +114,7 @@
 
 Package: openoffice.org-l10n-en
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-en
 Replaces: openoffice.org1.1-l10n-en
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-en
@@ -123,7 +123,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  English (US). 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -143,7 +143,7 @@
 
 Package: openoffice.org-l10n-pt
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-pt
 Replaces: openoffice.org1.1-l10n-pt
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-pt
@@ -152,7 +152,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Portuguese. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -172,7 +172,7 @@
 
 Package: openoffice.org-l10n-ru
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-ru
 Replaces: openoffice.org1.1-l10n-ru
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-ru
@@ -181,7 +181,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Russian. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -201,7 +201,7 @@
 
 Package: openoffice.org-l10n-ns
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-ns
 Replaces: openoffice.org1.1-l10n-ns
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-ns
@@ -210,7 +210,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Northern Sotho. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -230,7 +230,7 @@
 
 Package: openoffice.org-l10n-af
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-af
 Replaces: openoffice.org1.1-l10n-af
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-af
@@ -239,7 +239,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Afrikaans. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -259,7 +259,7 @@
 
 Package: openoffice.org-l10n-zu
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-zu
 Replaces: openoffice.org1.1-l10n-zu
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-zu
@@ -268,7 +268,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Zulu. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -288,7 +288,7 @@
 
 Package: openoffice.org-l10n-el
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-el
 Replaces: openoffice.org1.1-l10n-el
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-el
@@ -297,7 +297,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Greek. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -317,7 +317,7 @@
 
 Package: openoffice.org-l10n-nl
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-nl
 Replaces: openoffice.org1.1-l10n-nl
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-nl
@@ -326,7 +326,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Dutch. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -346,7 +346,7 @@
 
 Package: openoffice.org-l10n-fr
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-fr
 Replaces: openoffice.org1.1-l10n-fr
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-fr
@@ -355,7 +355,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  French. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -375,7 +375,7 @@
 
 Package: openoffice.org-l10n-es
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-es
 Replaces: openoffice.org1.1-l10n-es
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-es
@@ -384,7 +384,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Spanish. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -404,7 +404,7 @@
 
 Package: openoffice.org-l10n-fi
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-fi
 Replaces: openoffice.org1.1-l10n-fi
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-fi
@@ -413,7 +413,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Finnish. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -433,7 +433,7 @@
 
 Package: openoffice.org-l10n-hu
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-hu
 Replaces: openoffice.org1.1-l10n-hu
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-hu
@@ -442,7 +442,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Hungarian. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -462,7 +462,7 @@
 
 Package: openoffice.org-l10n-ca
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-ca
 Replaces: openoffice.org1.1-l10n-ca
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-ca
@@ -471,7 +471,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Catalan. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -491,7 +491,7 @@
 
 Package: openoffice.org-l10n-it
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-it
 Replaces: openoffice.org1.1-l10n-it
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-it
@@ -500,7 +500,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Italian. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -520,7 +520,7 @@
 
 Package: openoffice.org-l10n-cs
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-cs
 Replaces: openoffice.org1.1-l10n-cs
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-cs
@@ -529,7 +529,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Czech. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -549,7 +549,7 @@
 
 Package: openoffice.org-l10n-sk
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-sk
 Replaces: openoffice.org1.1-l10n-sk
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-sk
@@ -558,7 +558,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Slovak. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -578,7 +578,7 @@
 
 Package: openoffice.org-l10n-da
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-da
 Replaces: openoffice.org1.1-l10n-da
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-da
@@ -587,7 +587,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Danish. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -607,7 +607,7 @@
 
 Package: openoffice.org-l10n-sv
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-sv
 Replaces: openoffice.org1.1-l10n-sv
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-sv
@@ -616,7 +616,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Swedish. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -636,7 +636,7 @@
 
 Package: openoffice.org-l10n-nb
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-nb
 Replaces: openoffice.org1.1-l10n-nb
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-nb
@@ -645,7 +645,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Norwegian Bokmal. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -665,7 +665,7 @@
 
 Package: openoffice.org-l10n-pl
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-pl
 Replaces: openoffice.org1.1-l10n-pl
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-pl
@@ -674,7 +674,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Polish. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -694,7 +694,7 @@
 
 Package: openoffice.org-l10n-de
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-de
 Replaces: openoffice.org1.1-l10n-de
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-de
@@ -703,7 +703,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  German. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -723,7 +723,7 @@
 
 Package: openoffice.org-l10n-sl
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-sl
 Replaces: openoffice.org1.1-l10n-sl
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-sl
@@ -732,7 +732,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Slovenian. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -752,7 +752,7 @@
 
 Package: openoffice.org-l10n-cy
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-cy
 Replaces: openoffice.org1.1-l10n-cy
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-cy
@@ -761,7 +761,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Welsh. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -781,7 +781,7 @@
 
 Package: openoffice.org-l10n-pt-br
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-pt-br
 Replaces: openoffice.org1.1-l10n-pt-br
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-pt-br
@@ -790,7 +790,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Portuguese (Brazil). 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -810,7 +810,7 @@
 
 Package: openoffice.org-l10n-th
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-th
 Replaces: openoffice.org1.1-l10n-th
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-th
@@ -819,7 +819,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Thai. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -839,7 +839,7 @@
 
 Package: openoffice.org-l10n-et
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-et
 Replaces: openoffice.org1.1-l10n-et
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-et
@@ -848,7 +848,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Estonian. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -868,7 +868,7 @@
 
 Package: openoffice.org-l10n-nn
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-nn
 Replaces: openoffice.org1.1-l10n-nn
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-nn
@@ -877,7 +877,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Norwegian Nynorsk. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -897,7 +897,7 @@
 
 Package: openoffice.org-l10n-ja
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-ja
 Replaces: openoffice.org1.1-l10n-ja
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-ja
@@ -906,7 +906,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Japanese. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -926,7 +926,7 @@
 
 Package: openoffice.org-l10n-ko
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-ko
 Replaces: openoffice.org1.1-l10n-ko
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-ko
@@ -935,7 +935,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Korean. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -955,7 +955,7 @@
 
 Package: openoffice.org-l10n-zh-cn
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-zh-cn
 Replaces: openoffice.org1.1-l10n-zh-cn
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-zh-cn
@@ -964,7 +964,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Chinese Simplified. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -984,7 +984,7 @@
 
 Package: openoffice.org-l10n-zh-tw
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-zh-tw
 Replaces: openoffice.org1.1-l10n-zh-tw
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-zh-tw
@@ -993,7 +993,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Chinese Traditional. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -1013,7 +1013,7 @@
 
 Package: openoffice.org-l10n-tr
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-tr
 Replaces: openoffice.org1.1-l10n-tr
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-tr
@@ -1022,7 +1022,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Turkish. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -1042,7 +1042,7 @@
 
 Package: openoffice.org-l10n-hi
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-hi, openoffice.org-l10n-hi-in
 Replaces: openoffice.org1.1-l10n-hi, openoffice.org-l10n-hi-in
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-hi, openoffice.org-l10n-hi-in
@@ -1051,7 +1051,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Hindi. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -1071,7 +1071,7 @@
 
 Package: openoffice.org-l10n-ar
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-ar
 Replaces: openoffice.org1.1-l10n-ar
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-ar
@@ -1080,7 +1080,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Arabic. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 
@@ -1100,7 +1100,7 @@
 
 Package: openoffice.org-l10n-he
 Architecture: all
-Depends: openoffice.org (>> 1.0.99+1.1)
+Depends: openoffice.org (>> 1.1.1+1.1.2)
 Conflicts: openoffice.org1.1-l10n-he
 Replaces: openoffice.org1.1-l10n-he
 Provides: openoffice.org-l10n-1.1.2, openoffice.org1.1-l10n-he
@@ -1109,7 +1109,7 @@
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the localization of openoffice.org in
+ This package contains the localization of OpenOffice.org in
  Hebrew. 
  It contains the user interface, the templates and the autotext features.
  (please note that not all this is available for all possible languages). 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- rules	16 Aug 2004 10:17:20 -0000	1.233
+++ rules	17 Sep 2004 07:40:21 -0000	1.234
@@ -153,7 +153,7 @@
   # Don't use system libstlport
   USE_SYSTEM_STLPORT=n
   PATCHSET=DebianWoody
-  D=$(shell ls -1 berkeleydb/download | cut -d"-" -f2 | cut -d"." -f1,2)
+  D=$(shell ls -1 berkeleydb/download | cut -d"-" -f2 | cut -d"." -f1,2 | grep -v CVS)
 endif
 
 # gcc version can be overriden by setting GCCVER in scripts/vars[.arch]
@@ -937,8 +937,8 @@
 	done
 
 ifneq "$(USE_SYSTEM_DB)" "y"
-       cp -rf $(PKGOPENOFFICEDIR)/program/libdb_java-$(D).so \
-         $(MAINPKGDIR)-java/$(OPENOFFICEDIR)/program
+	cp -rf $(PKGOPENOFFICEDIR)/program/libdb_java-$(D).so \
+	 $(MAINPKGDIR)-java/$(OPENOFFICEDIR)/program
 endif
 endif
 



Reply to: