------------------------------------------------------------
revno: 1682
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Tue 2009-09-29 13:21:00 +0200
message:
hrm, forgot to add the -vs for unopkg (add|remove) and the corresponding
changelog message
modified:
changelog
control
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2009-09-29 11:08:34 +0000
+++ b/changelog 2009-09-29 11:21:00 +0000
@@ -18,11 +18,14 @@
- remove bogus (.*på engelsk) from GSI_da to fix some functions
(closes: #548608)
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
- * debian/shell-lib.sh: check whether OOo is running before (de-)registering
- extensions or components (closes: #548721, #546723)
+ * debian/shell-lib.sh:
+ - check whether OOo is running before (de-)registering extensions or
+ components (closes: #548721, #546723)
+ - run unopkg with -v to have more info and to see where it breaks when
+ 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> Tue, 29 Sep 2009 08:37:49 +0200
+ -- Rene Engelhard <r...@debian.org> Tue, 29 Sep 2009 13:18:59 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-09-29 11:08:34 +0000
+++ b/control 2009-09-29 11:21:00 +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
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2009-09-29 11:08:34 +0000
+++ b/shell-lib.sh 2009-09-29 11:21:00 +0000
@@ -86,7 +86,7 @@
INSTDIR=`mktemp -d`
export PYTHONPATH="/@OOBASISDIR@/program"
basis=`readlink /usr/lib/openoffice/basis-link`
- /usr/lib/openoffice/program/unopkg remove --shared $1 \
+ /usr/lib/openoffice/program/unopkg remove -v --shared $1 \
"-env:UserInstallation=file://$INSTDIR" \
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml"
\
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
@@ -100,7 +100,7 @@
INSTDIR=`mktemp -d`
export PYTHONPATH="/@OOBASISDIR@/program"
basis=`readlink /usr/lib/openoffice/basis-link`
- /usr/lib/openoffice/program/unopkg add --shared $1 \
+ /usr/lib/openoffice/program/unopkg add -v --shared $1 \
"-env:UserInstallation=file:///$INSTDIR" \
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml"
\
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
