------------------------------------------------------------
revno: 775
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2007-07-04 23:29:24 +0200
message:
merge 2.2.1-5
modified:
changelog
control
control.mozilla.in
rules
------------------------------------------------------------
revno: 772.1.6
merged: [EMAIL PROTECTED]
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2007-07-04 23:16:18 +0200
message:
disable smoketest again; revert to stlport4.6, update ooo-build, -5
------------------------------------------------------------
revno: 772.1.5
merged: [EMAIL PROTECTED]
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-07-03 17:10:44 +0200
message:
update ooo-build; close 430141
------------------------------------------------------------
revno: 772.1.4
merged: [EMAIL PROTECTED]
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-07-03 16:21:30 +0200
message:
cut'n'waste error
------------------------------------------------------------
revno: 772.1.3
merged: [EMAIL PROTECTED]
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-07-03 16:13:13 +0200
message:
remove FontOOo from script.xlb, update ooo-build
------------------------------------------------------------
revno: 772.1.2
merged: [EMAIL PROTECTED]
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-02 16:27:21 +0200
message:
update ooo-build
------------------------------------------------------------
revno: 772.1.1
merged: [EMAIL PROTECTED]
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-07-01 22:20:14 +0200
message:
stop recommending mozilla-browser
=== modified file 'changelog'
--- a/changelog 2007-07-03 23:15:39 +0000
+++ b/changelog 2007-07-04 21:29:24 +0000
@@ -19,6 +19,22 @@
-- Rene Engelhard <[EMAIL PROTECTED]> Wed, 4 Jul 2007 00:38:31 +0200
+openoffice.org (2.2.1-5) unstable; urgency=low
+
+ * ooo-build:
+ - update (r9703)
+ + libpaper-support.diff: backport suppressing of
+ "paperconf: command not found" from cws vcl79 (closes: #430141)
+ * debian/control.mozilla.in:
+ - stop recommending mozilla-browser (closes: #431269)
+ * debian/rules:
+ - remove FontOOo from /usr/lib/openoffice/share/basic/launcher/script.xlb,
+ see issue 79153
+ - stop running the smoketest again...
+ - revert to using libstlport4.6, sorry Torsten...
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 4 Jul 2007 10:48:34 +0200
+
openoffice.org (2.2.1-4) unstable; urgency=low
* debian/rules: fix lp-solve builddeps, oops
=== modified file 'control'
--- a/control 2007-07-03 23:15:39 +0000
+++ b/control 2007-07-04 21:29:24 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], dmake (>= 1:4.6) [i386
powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64],
libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc
sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64],
imagemagick [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64 ppc64]
libxml-parser-perl [i386 powerpc sparc amd64 ppc64], , libcurl3-gnutls-dev
[i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc
amd64 ppc64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc
amd64 ppc64] , dpkg-dev (>= 1.13.19) , xvfb [i386 powerpc sparc amd64 ppc64],
xbase-clients [i386 powerpc sparc amd64 ppc64], xfonts-base [i386 powerpc sparc
amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64
ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>=
0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc
sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64
ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc
sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev
[i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs
(>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>=
1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev
(>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libaltlinuxhyph-dev (>=
0.1.1-11) [i386 powerpc sparc amd64 ppc64] , libstlport5.1-dev (>= 5.0.99rc2-5)
[i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64
ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev
[i386 powerpc sparc amd64 ppc64] , libicu36-dev [i386 powerpc sparc amd64
ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386
powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64]
, kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java
(>= 1.8.0.0-2) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386
powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-2) [i386 powerpc
sparc amd64 ppc64], lp-solve (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64] ,
libufsparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60)
[i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386
powerpc sparc amd64 ppc64] , libneon26-dev [i386 powerpc sparc amd64 ppc64] ,
libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], dmake (>= 1:4.6) [i386
powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64],
libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc
sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64],
imagemagick [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64 ppc64]
libxml-parser-perl [i386 powerpc sparc amd64 ppc64], , libcurl3-gnutls-dev
[i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc
amd64 ppc64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc
amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386
powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] ,
libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java
[i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc
sparc amd64 ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32
[i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64],
libnss3-dev [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386
amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64],
mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] ,
libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] ,
libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] ,
portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libicu36-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc
sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64],
libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>=
4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.0-2)
[i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64
ppc64] , liblpsolve55-dev (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64],
lp-solve (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64] , libufsparse-dev
[i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc
sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc
amd64 ppc64] , libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev
(>= 2.10) [i386 powerpc sparc amd64 ppc64]
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -3118,7 +3118,7 @@
openoffice.org,
openoffice.org-core
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.2.0-2)
-Recommends: iceweasel | firefox | iceape-browser | mozilla-browser,
openoffice.org-writer, openoffice.org-calc, openoffice.org-draw,
openoffice.org-impress, openoffice.org-math, openoffice.org-base
+Recommends: iceweasel | firefox | iceape-browser, openoffice.org-writer,
openoffice.org-calc, openoffice.org-draw, openoffice.org-impress,
openoffice.org-math, openoffice.org-base
Description: OpenOffice.org Mozilla plugin
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.mozilla.in'
--- a/control.mozilla.in 2007-06-28 23:20:02 +0000
+++ b/control.mozilla.in 2007-07-01 20:20:14 +0000
@@ -9,7 +9,7 @@
openoffice.orgVER-core
Depends: ${shlibs:Depends},
openoffice.orgVER-core (>= 2.2.0-2)
-Recommends: iceweasel | firefox | iceape-browser | mozilla-browser,
+Recommends: iceweasel | firefox | iceape-browser,
openoffice.org-writer,
openoffice.org-calc,
openoffice.org-draw,
=== modified file 'rules'
--- a/rules 2007-07-03 23:15:39 +0000
+++ b/rules 2007-07-04 21:29:24 +0000
@@ -94,7 +94,7 @@
USE_AGG=n
SYSTEM_AGG=n
USE_STLPORT=y
-USE_STLPORT5=y
+USE_STLPORT5=n
USE_SYSTEM_STLPORT=y
USE_SYSTEM_BOOST=n
USE_SYSTEM_PORTAUDIO=y
@@ -128,7 +128,7 @@
PACKAGE_QUICKSTART=y
USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
-RUN_SMOKETEST=y
+RUN_SMOKETEST=n
USE_LIBCURL4=y
# when we have a package we want to have to be installed on older things with
some older
@@ -1172,14 +1172,8 @@
test: $(STAMP_DIR)/test
$(STAMP_DIR)/test: $(STAMP_DIR)/build
-ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
ifeq "$(RUN_SMOKETEST)" "y"
# smoketest
- # apparently setting this here globally doesn't work, so hack around.
If we don't do this we get loads
- # of harmless, but log-bloating warnings
- if ! grep fakeroot $(SOURCE_TREE)/*.sh; then \
- perl -pi -e
's,LD_LIBRARY_PATH=\"(.*)\",LD_LIBRARY_PATH=\"/usr/lib/libfakeroot:\1\",'
$(SOURCE_TREE)/*.sh; \
- fi
cd $(SOURCE_TREE)/smoketestoo_native && \
mkdir -p $(CURDIR)/oosmoketest && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
@@ -1192,7 +1186,6 @@
fi && \
rm -rf $(CURDIR)/oosmoketest
endif
-endif
touch $@
@@ -2132,14 +2125,15 @@
's,\$$UNO_SHARED_PACKAGES/cache,file:///var/spool/openoffice$(VER)/uno_packages/cache,g'
\
$(PKGDIR)-common/$(OODIR)/program/unorc
- # install DicOOo and FontOOo; we need to do this manually; the
+ # install DicOOo; we need to do this manually; the
# dictionaries/ module isn't built with --without-myspell-dicts
# and those two somehow (why?) are in there...
mkdir -p $(PKGDIR)-common/usr/share/myspell/dicts
install -m644 $(SOURCE_TREE)/dictionaries/diclst/DicOOo.sxw \
$(PKGDIR)-common/usr/share/myspell/dicts
- #install -m644 $(SOURCE_TREE)/dictionaries/diclst/FontOOo.sxw \
- # $(PKGDIR)-common/usr/share/myspell/dicts
+ # issue 79153
+ perl -pi -e 's,\s<library:element library:name="FontOOo"/>\n,,' \
+ $(PKGDIR)-common/$(OODIR)/share/basic/launcher/script.xlb
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
mkdir -p debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice
