------------------------------------------------------------
revno: 1120
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-06-15 20:41:02 +0200
message:
merge 2.4.1-3
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.109
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-06-12 22:41:15 +0200
message:
update ooo-build, close 477653, reenable mozilla plugin for 64bits;
remove obsolete comment (db4.6 4.6.21-9 in NEW makes -dev libdb4.6-dev)
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.110
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-06-13 23:45:15 +0200
message:
update ooo-build, add ENABLE_RANDR conditional
modified:
changelog
control.in
rules
------------------------------------------------------------
revno: 1022.1.111
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-06-13 23:48:14 +0200
message:
oops...
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.112
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-06-15 20:36:29 +0200
message:
-3
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-06-13 19:22:14 +0000
+++ b/changelog 2008-06-15 18:41:02 +0000
@@ -7,7 +7,7 @@
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r12883)
+ - update (r12887)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -64,6 +64,21 @@
-- Rene Engelhard <[EMAIL PROTECTED]> Fri, 13 Jun 2008 20:37:17 +0200
+openoffice.org (1:2.4.1-3) unstable; urgency=medium
+
+ * ooo-build:
+ - update (r12885)
+ + cws-cmcfixes47-sw.diff: backport fix from 3.0 to not open Word
+ documents read-only (closes: #477653)
+ + cws-cmcfixes47-extensions.diff: fix mozilla plugin for 64-bit mozilla
+ API
+ + distro-configs/Common.conf.in: --disable-randr (closes: #485833)
+ * debian/rules:
+ + reenable mozilla plugin for 64bit archs
+ + add ENABLE_RANDR conditional, remove libxrandr2 Recommends:
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 13 Jun 2008 23:41:39 +0200
+
openoffice.org (1:2.4.1-2) unstable; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2008-06-13 23:07:28 +0000
+++ b/control 2008-06-15 18:41:02 +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), 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-1)
[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, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, libxrandr-dev, bc , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev ,
libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) ,
debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , 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 , libxslt1-dev , libcairo2-dev , libhsqldb-java (>= 1.8.0.9-1) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>=
5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , libgtk2.0-dev (>= 2.10) , libglib2.0-dev (>= 2.15.0)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1)
[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, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev , libssl-dev ,
libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>=
6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64]
, libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , 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 , libxslt1-dev , libcairo2-dev , libhsqldb-java (>= 1.8.0.9-1) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>=
5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , libgtk2.0-dev (>= 2.10) , libglib2.0-dev (>= 2.15.0)
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),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -172,7 +172,6 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-draw (=
${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-impress (<< ${Source-Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
-Recommends: libxrandr2
Provides: openoffice.org2-impress
Conflicts: openoffice.org-debian-files, openoffice.org2-impress (<<
${Source-Version})
Description: OpenOffice.org office suite - presentation
=== modified file 'control.in'
--- a/control.in 2008-06-13 13:24:06 +0000
+++ b/control.in 2008-06-15 18:41:02 +0000
@@ -48,7 +48,6 @@
libxml-parser-perl,
gperf,
libpq-dev,
- libxrandr-dev,
bc
%BUILD_DEPS%
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),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
@@ -364,7 +363,6 @@
openoffice.org-debian-files,
openoffice.org2-impress (<< ${Source-Version}),
openoffice.org-common (<< 2.0.3+2.0.4m179)
-Recommends: libxrandr2
Provides: openoffice.org2-impress
Conflicts: openoffice.org-debian-files,
openoffice.org2-impress (<< ${Source-Version})
=== modified file 'rules'
--- a/rules 2008-06-13 19:22:14 +0000
+++ b/rules 2008-06-15 18:41:02 +0000
@@ -172,6 +172,7 @@
ENABLE_PDFIMPORT=y
BUILD_GTK=n
ENABLE_GIO=y
+ENABLE_RANDR=n
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this.
Don't touch
@@ -330,23 +331,7 @@
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
-# Mozilla plugin. Crashes on amd64
-OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel s390
-ifeq "$(BUILD_AMD64)" "y"
- ifeq "$(ARCH)" "amd64"
- PACKAGE_NPSOPLUGIN=n
- endif
-endif
-ifeq "$(BUILD_PPC64)" "y"
- ifeq "$(ARCH)" "ppc64"
- PACKAGE_NPSOPLUGIN=n
- endif
-endif
-ifeq "$(BUILD_IA64)" "y"
- ifeq "$(ARCH)" "ia64"
- PACKAGE_NPSOPLUGIN=n
- endif
-endif
+OOO_NPSOPLUGIN_ARCHS = $(OOO_MOZILLA_ARCHS)
else
OOO_NPSOPLUGIN_ARCHS=
endif
@@ -422,7 +407,6 @@
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut
-d"." -f3,4,5)-dbg
endif
- # libdb-dev since 4.6 but it provides libdb4.6-dev, so keep this
as-is...
BUILD_DEPS += , libdb$(DBVER)-dev
ifneq "$(BUILD_DBG_PACKAGE)" "y"
@@ -799,6 +783,11 @@
CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
endif
+ifeq "$(ENABLE_RANDR)" "y"
+ CONFIGURE_FLAGS += --enable-randr
+ BUILD_DEPS += , libxrandr-dev
+endif
+
ifeq "$(BUILD_BINFILTERS)" "y"
CONFIGURE_FLAGS+= --enable-binfilter
OOO_BINFILTER_DEP = openoffice.org$(VER)-filter-binfilter
