------------------------------------------------------------
revno: 1685
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-09-30 17:26:05 +0200
message:
lintian fixes; update ooo-build and close #416877
modified:
changelog
control
control.mysql.in
control.postgresql.in
rules
=== modified file 'changelog'
--- a/changelog 2009-09-30 01:06:35 +0000
+++ b/changelog 2009-09-30 15:26:05 +0000
@@ -3,9 +3,11 @@
* The "Goodbye sparc!" release. :-(
* ooo-build:
- - update (cb6d5f3ab0837310b9733880b14a61bf7fad6ae4)
+ - update (4d4be60ad4dfc84b85b0ea1d4b21b8d74212673d)
- Fixed range selection for RTL languages. (closes: #548767)
- fix some Extended Tips abbreviations for Italian (closes: #478761)
+ - apply optional-icon-themes.diff so that OOo doesn't list not-installed
+ icons anymore (closes: #416877)
* merge from Ubuntu:
- Add support to turn off building on sparc.
@@ -27,7 +29,7 @@
it breaks. Removing "Adding extension XY .. done" echos
* debian/templates, debian/po: add debconf error shown when OOo is running
- -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 03:03:53 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 13:49:29 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-09-29 11:21:00 +0000
+++ b/control 2009-09-30 15:26:05 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes,
xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390
amd64 ia64 ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64
s390x] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6-jdk
, gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-common (>=
1:4.4.0) [i386 mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-java-openoffice
.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x], libloader-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], librepository-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libserializer-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm armel amd64
ia64 ppc64 s390x], libnss3-dev [i386 powerpc mips mipsel s390 arm armel amd64
ia64 ppc64
s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64],
libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [i386 amd64
ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev ,
libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x)],
libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve
(>= 5.5.0.13-5+b1)
, libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev , libgconf2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes,
xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390
amd64 ia64 ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64
s390x] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6-jdk
, gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-common (>=
1:4.4.0) [i386 mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-java-openoffice
.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x], libloader-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], librepository-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libserializer-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm armel amd64
ia64 ppc64 s390x], libnss3-dev [i386 powerpc mips mipsel s390 arm armel amd64
ia64 ppc64
s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64],
libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [i386 amd64
ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev ,
libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x],
libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve
(>= 5.5.0.13-5+b1)
, libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev , libgconf2-dev
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
@@ -3495,7 +3495,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-common
+Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212),
openoffice.org-gcj (<< 2.3.0~src680m212)
Suggests: postgresql
@@ -3511,7 +3511,7 @@
Section: misc
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1~) ${misc:Depends}
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1~), ${misc:Depends}
Suggests: mysql-server (>= 5.1)
Homepage:
http://wiki.services.openoffice.org/wiki/Database/Drivers/MySQL_Native
Description: MySQL Connector extension for OpenOffice.org
=== modified file 'control.mysql.in'
--- a/control.mysql.in 2009-09-29 11:08:34 +0000
+++ b/control.mysql.in 2009-09-30 15:26:05 +0000
@@ -2,7 +2,7 @@
Section: misc
Architecture: %OOO_ARCHS%
Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.1~)
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.1~),
${misc:Depends}
Suggests: mysql-server (>= 5.1)
Homepage:
http://wiki.services.openoffice.org/wiki/Database/Drivers/MySQL_Native
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2009-08-30 18:24:18 +0000
+++ b/control.postgresql.in 2009-09-30 15:26:05 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-common
+Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212),
openoffice.orgVER-gcj (<< 2.3.0~src680m212)
=== modified file 'rules'
--- a/rules 2009-09-30 01:06:35 +0000
+++ b/rules 2009-09-30 15:26:05 +0000
@@ -957,7 +957,7 @@
endif
ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "y"
CONFIGURE_FLAGS += --with-system-mysql-cppconn
- BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS)))], libmysqlcppconn-stlport-dev
[$(OOO_STLPORT_ARCHS)]
+ BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS))], libmysqlcppconn-stlport-dev
[$(OOO_STLPORT_ARCHS)]
endif
endif
@@ -3158,7 +3158,7 @@
else
dh_strip -s
endif
-ifneq "$(LENNY_BACKPORT)" "y"
+ifeq "$(LENNY_BACKPORT)" "y"
dh_desktop -s
endif
dh_icons -s
@@ -3367,7 +3367,7 @@
dh_lintian -i
dh_link -i
dh_fixperms -i
-ifneq "$(LENNY_BACKPORT)" "y"
+ifeq "$(LENNY_BACKPORT)" "y"
dh_desktop -i
endif
dh_icons -i
