./packages/openofficeorg/3.2/experimental r1812: merge
------------------------------------------------------------
revno: 1812 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2010-02-15 11:44:11 +0100
message:
merge
modified:
changelog
control
shell-lib-components.sh
shell-lib-extensions.sh
ure.preinst.in
=== modified file 'changelog'
--- a/changelog 2010-02-12 01:00:40 +0000
+++ b/changelog 2010-02-15 10:44:11 +0000
@@ -20,6 +20,8 @@
for some reason also gets used for lenny-backports which has KDE3..
* debian/control.ure.in: fix uno-libs3*'s ure replaces
* debian/changelog: mention security fixes in last uploads
+ * debian/ure.preinst, debian/shell-lib-{extensions,components}:
+ - add a || true to db_input/db_go where missing (closes: #569840)
-- Rene Engelhard <rene@debian.org> Thu, 11 Feb 2010 13:48:29 +0100
@@ -185,6 +187,7 @@
* ooo-build:
- update (89b6191f14b42664b9c46395722ccecd562418c4)
+ - fixes vba macros not honouring security settings (CVE-2010-0136)
- debian-opt.diff: build with -O2 instead of -Os. Fixes FTBFS on ppc
* debian/control.in:
=== modified file 'control'
--- a/control 2010-02-12 01:00:40 +0000
+++ b/control 2010-02-15 10:44:11 +0000
@@ -3,7 +3,11 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
+<<<<<<< TREE
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, libjpeg-dev, libxml2-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, po-debconf, , 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 sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] , libcurl4-openssl-dev , lib
ssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , li
bbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libserializer-java
-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64], mono-utils (>= 2.4.2.3) [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 (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa]
, libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , 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-gnutls-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-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, libjpeg-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, po-debconf, , 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 sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7
.2.3~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 amd64 ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 amd64 ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , xulrunner-
dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64], mono-utils (>= 2.4.2.3) [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 (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , 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-gnutls-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev
+>>>>>>> MERGE-SOURCE
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), graphicsmagick-imagemagick-compat (<< 1.3.9~), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2010-01-24 20:06:59 +0000
+++ b/shell-lib-components.sh 2010-02-15 10:42:03 +0000
@@ -16,8 +16,8 @@
echo "upgrade." >&2
exit 1
else
- db_input high shared/openofficeorg-running
- db_go
+ db_input high shared/openofficeorg-running || true
+ db_go || true
# try again in case OOo got closed before hitting OK
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-01-24 20:06:59 +0000
+++ b/shell-lib-extensions.sh 2010-02-15 10:42:03 +0000
@@ -16,8 +16,8 @@
echo "upgrade." >&2
exit 1
else
- db_input high shared/openofficeorg-running
- db_go
+ db_input high shared/openofficeorg-running || true
+ db_go || true
# try again in case OOo got closed before hitting OK
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
=== modified file 'ure.preinst.in'
--- a/ure.preinst.in 2010-01-28 09:39:07 +0000
+++ b/ure.preinst.in 2010-02-14 19:30:23 +0000
@@ -20,7 +20,7 @@
echo "in either unopkg or OOo which involve store, please check those" >&2
echo "(and eventually cleanly reinstall the packages and/or use a clean user profile)" >&2
else
- db_input high ure/possibly_corrupted_rdbs
+ db_input high ure/possibly_corrupted_rdbs || true
db_go || true
fi
fi
Reply to: