------------------------------------------------------------
revno: 916
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2007-10-19 11:28:01 +0200
message:
update ooo-build; add a libstlport_gcc.so symlink; fix control to include
mozilla-openoffice.org....
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-10-17 13:36:26 +0000
+++ b/changelog 2007-10-19 09:28:01 +0000
@@ -1,9 +1,16 @@
openoffice.org (1:2.3.0-2.3pre) experimental; urgency=low
+ * ooo-build:
+ - update (r10536)
+ + ooo82608.vcl.gtkbadfree.diff: backport fix from i#82608 to fix
+ bad free on theme resources (closes: #444741)
* debian/rules:
- readd $(OOO_ARCHS) at neon builddep which got lost
+ - add a libstlport_gcc.so symlink in /usr/lib/openoffice/program when
+ using STLport4 to not rely on libstlport4.6-dev where binary-only
+ components would expect a libstlport_gcc.so
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 17 Oct 2007 15:35:22 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 19 Oct 2007 11:23:57 +0200
openoffice.org (1:2.3.0-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2007-10-17 13:36:26 +0000
+++ b/control 2007-10-19 09:28:01 +0000
@@ -2876,6 +2876,24 @@
This package contains the test data for the OpenOffice.org Java and
Basic APIs.
+Package: mozilla-openoffice.org
+Section: net
+Architecture: i386 powerpc sparc
+Enhances: iceape-browser,
+ iceweasel,
+ mozilla-browser,
+ firefox,
+ openoffice.org,
+ openoffice.org-core
+Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.2.0-2)
+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.
+ .
+ This package contains a Mozilla/Netscape compatible plugin which can handle
+ all OOo documents.
+
Package: ttf-opensymbol
Section: x11
Architecture: all
=== modified file 'rules'
--- a/rules 2007-10-17 13:36:26 +0000
+++ b/rules 2007-10-19 09:28:01 +0000
@@ -1957,8 +1957,11 @@
echo "libgcc_s $$LIBGCC_SOVER" >> debian/shlibs.override.stdlibs
endif
ifeq "$(USE_SYSTEM_STLPORT)" "y"
- # remove a eventually sneaked-in stlport...
rm -f $(PKGDIR)-core/$(OODIR)/program/libstlport*
+ ifneq "$(USE_STLPORT5)" "y"
+ ln -s `readlink /usr/lib/libstlport_gcc.so` \
+ libstlport_gcc.so
+ endif
endif
ifeq "$(ENABLE_JAVA)" "y"
