./packages/openofficeorg/3.0.1/unstable r1460: handle stuff from DEB_BUILD_OPTIONS *after* lang=xx...
revno: 1460
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 12:07:06 +0200
message:
handle stuff from DEB_BUILD_OPTIONS *after* lang=xx...
modified:
rules
=== modified file 'rules'
--- a/rules 2009-04-15 10:02:51 +
+++ b/rules 2009-04-15 10:07:06 +
@@ -507,9 +507,9 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
- ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^,\s*\)\s.*/\1/p' | sed -e 's/,/ /')
- LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
+ ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^,\s*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+ LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
else
# Note that the first one here *has to be* en-US. the first one gets
# gid_Module_Root as filelist later and the rest gid_Module_Root.$iso
./packages/openofficeorg/3.1/experimental r1494: Fix DEB_BUILD_OPTIONS lang= parsing to actually
revno: 1494 committer: Rene Engelhard branch nick: experimental timestamp: Wed 2009-04-15 12:02:33 +0200 message: Fix DEB_BUILD_OPTIONS lang= parsing to actually work with DEB_BUILD_OPTIONS being separated by spaces as introduced in 3.8.0 modified: changelog rules === modified file 'changelog' --- a/changelog 2009-04-15 09:38:01 + +++ b/changelog 2009-04-15 10:02:33 + @@ -3,8 +3,10 @@ * debian/control.in, debian/control.kde.in, debian/rules: - disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve BUILD_KDE conditional - * debian/control.in, debian/broffice.org.postrm.in: -- Standards-Version: 3.8.1 + * debian/control.in, debian/broffice.org.postrm.in, debian/rules: +- Standards-Version: 3.8.1. Fix DEB_BUILD_OPTIONS lang= parsing to actually + work with DEB_BUILD_OPTIONS being separated by spaces as introduced + in 3.8.0. (ccache,lang=en-US de -> ccache lang=en-US,de) * debian/rules, debian/control.debug.in: - fix lintians dbg-package-missing-depends === modified file 'rules' --- a/rules 2009-04-15 09:38:01 + +++ b/rules 2009-04-15 10:02:33 + @@ -546,9 +546,9 @@ ifneq "$(BUILD_ONLY_EN_US)" "y" ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS))) - ISOS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p') - HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p') - LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p') + ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /') + HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^,\s*\)\s.*/\1/p' | sed -e 's/,/ /') + LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /') else # Note that the first one here *has to be* en-US. the first one gets # gid_Module_Root as filelist later and the rest gid_Module_Root.$iso
./packages/openofficeorg/3.1/experimental r1495: merge
revno: 1495
committer: Rene Engelhard
branch nick: experimental
timestamp: Wed 2009-04-15 12:07:34 +0200
message:
merge
modified:
rules
=== modified file 'rules'
--- a/rules 2009-04-15 10:02:33 +
+++ b/rules 2009-04-15 10:07:34 +
@@ -546,9 +546,9 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
- ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^,\s*\)\s.*/\1/p' | sed -e 's/,/ /')
- LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | sed -e 's/,/ /')
+ ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^,\s*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+ LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
else
# Note that the first one here *has to be* en-US. the first one gets
# gid_Module_Root as filelist later and the rest gid_Module_Root.$iso
./packages/openofficeorg/3.0.1/unstable r1458: merge
revno: 1458
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 11:45:34 +0200
message:
merge
modified:
changelog
control
control.fonts.in
control.mono.in
=== modified file 'changelog'
--- a/changelog 2009-04-15 09:42:15 +
+++ b/changelog 2009-04-15 09:45:34 +
@@ -10,7 +10,7 @@
* debian/control*in:
- update for new sections:
- -dbg -> debug, -l10n-* -> localization, -officebean -> java,
--base -> database
+-base -> database, ttf-opensymbol -> fonts, *cli* -> cli-mono
-- Rene Engelhard Mon, 13 Apr 2009 19:43:23 +0200
=== modified file 'control'
--- a/control 2009-04-15 09:43:12 +
+++ b/control 2009-04-15 09:45:34 +
@@ -3151,7 +3151,7 @@
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
Package: cli-uno-bridge
-Section: libs
+Section: cli-mono
Architecture: i386 sparc amd64 ia64
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}),
libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil,
libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil,
libuno-cli-ure1.0-cil, ${cli:Depends}, ${misc:Depends}
Conflicts: libuno-cil, libuno-cli-types1.1-cil
@@ -3168,7 +3168,7 @@
OpenOffice.org is *not* yet supported.
Package: libuno-cli-basetypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- base types
@@ -3179,7 +3179,7 @@
some base types.
Package: libuno-cli-uretypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- URE type library
@@ -3190,7 +3190,7 @@
and interfaces for components and client programs. It contains the URE types.
Package: libuno-cli-oootypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- OpenOffice.org type
library
@@ -3201,7 +3201,7 @@
and interfaces for components and client programs. It contains the OOo types.
Package: libuno-cli-cppuhelper1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, cli-uno-bridge, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- bootstrapping library
@@ -3213,7 +3213,7 @@
implemented in different languages).
Package: libuno-cli-ure1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- helper classes
@@ -3347,7 +3347,7 @@
Homepage: http://extensions.services.openoffice.org/project/pdfimport
Package: ttf-opensymbol
-Section: x11
+Section: fonts
Architecture: all
Replaces: openoffice.org (<= 1.1.1+1.1.2rc3)
Depends: ${misc:Depends}
=== modified file 'control.fonts.in'
--- a/control.fonts.in 2009-03-29 20:28:49 +
+++ b/control.fonts.in 2009-04-15 09:45:34 +
@@ -1,5 +1,5 @@
Package: ttf-opensymbol
-Section: x11
+Section: fonts
Architecture: all
Replaces: openoffice.org (<= 1.1.1+1.1.2rc3)
Depends: ${misc:Depends}
=== modified file 'control.mono.in'
--- a/control.mono.in 2009-03-29 20:28:49 +
+++ b/control.mono.in 2009-04-15 09:45:34 +
@@ -1,5 +1,5 @@
Package: cli-uno-bridge
-Section: libs
+Section: cli-mono
Architecture: %OOO_MONO_ARCHS%
Depends: ${shlibs:Depends},
openoffice.orgVER-core (>> ${base-version}),
@@ -24,7 +24,7 @@
OpenOffice.org is *not* yet supported.
Package: libuno-cli-basetypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
@@ -36,7 +36,7 @@
some base types.
Package: libuno-cli-uretypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
@@ -48,7 +48,7 @@
and interfaces for components and client programs. It contains the URE types.
Package: libuno-cli-oootypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
@@ -60,7 +60,7 @@
and interfaces for components and client programs. It contains the OOo types.
Package: libuno-cli-cppuhelper1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, cli-uno-bridge,
${misc:Depends}
@@ -73,7 +73,7 @@
implemented in different languages).
Package: libuno-cli-ure1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
./packages/openofficeorg/3.1/experimental r1493: merge
revno: 1493 committer: Rene Engelhard branch nick: experimental timestamp: Wed 2009-04-15 11:38:01 +0200 message: merge modified: broffice.org.postrm.in changelog control control.debug.in control.in rules revno: 1332.1.119 committer: Rene Engelhard branch nick: unstable timestamp: Thu 2009-04-09 00:23:39 +0200 message: typo; update ooo-build modified: changelog rules revno: 1332.1.120 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-04-13 23:30:26 +0200 message: released -10 with some updates (ooo-build, GSIs) modified: changelog revno: 1332.1.121 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-04-13 23:43:09 +0200 message: BUILD_KDE=n + conditional improvements (from 3.1 branch) modified: changelog control control.in rules revno: 1332.1.122 committer: Rene Engelhard branch nick: unstable timestamp: Wed 2009-04-15 11:33:39 +0200 message: Standards-v ersion: 3.8.1 modified: broffice.org.postrm.in changelog control control.in revno: 1332.1.123 committer: Rene Engelhard branch nick: unstable timestamp: Wed 2009-04-15 11:35:28 +0200 message: fix lintians dbg-package-missing-depends modified: changelog control control.debug.in rules === modified file 'broffice.org.postrm.in' --- a/broffice.org.postrm.in2009-01-07 20:14:44 + +++ b/broffice.org.postrm.in2009-04-15 09:33:39 + @@ -14,7 +14,7 @@ LANGPACKISOS="@LANGPACKISOS@" -if [ "$1" = "remove" ]; then +if [ "$1" = "remove" -o "$1" = "abort-install" -o "$1" = "disappear" ]; then for i in $DIVERSIONS; do dpkg-divert --package $THIS_PACKAGE --remove --rename --divert $i.ooo $i done === modified file 'changelog' --- a/changelog 2009-04-13 21:28:27 + +++ b/changelog 2009-04-15 09:38:01 + @@ -3,6 +3,10 @@ * debian/control.in, debian/control.kde.in, debian/rules: - disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve BUILD_KDE conditional + * debian/control.in, debian/broffice.org.postrm.in: +- Standards-Version: 3.8.1 + * debian/rules, debian/control.debug.in: +- fix lintians dbg-package-missing-depends -- Rene Engelhard Mon, 13 Apr 2009 19:43:23 +0200 === modified file 'control' --- a/control 2009-04-13 17:45:22 + +++ b/control 2009-04-15 09:38:01 + @@ -5,7 +5,7 @@ Uploaders: Chris Halls , Rene Engelhard Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), 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, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
./packages/openofficeorg/3.1/experimental r1496: update ooo-build - Python26 patchset and scsolver are gone...
revno: 1496
committer: Rene Engelhard
branch nick: experimental
timestamp: Wed 2009-04-15 13:38:25 +0200
message:
update ooo-build - Python26 patchset and scsolver are gone...
removed:
openoffice.org-calc.postinst.in
openoffice.org-calc.preinst.in
openoffice.org-calc.prerm.in
openoffice.org-calc.script.bug.in
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-15 10:02:33 +
+++ b/changelog 2009-04-15 11:38:25 +
@@ -1,5 +1,8 @@
openoffice.org (1:3.1.0~rc1-3) UNRELEASED; urgency=low
+ * ooo-build
+- update (f51d5e08421d33dc4d88f193c252451c6262a23f)
+
* debian/control.in, debian/control.kde.in, debian/rules:
- disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve
BUILD_KDE conditional
@@ -9,6 +12,10 @@
in 3.8.0. (ccache,lang=en-US de -> ccache lang=en-US,de)
* debian/rules, debian/control.debug.in:
- fix lintians dbg-package-missing-depends
+ * debian/rules:
+- remove Python26 special-casing, we now have a generic patch for 2.4 and
+ 2.6
+- remove scsolver stuff, scsolver is gone from ooo-build
-- Rene Engelhard Mon, 13 Apr 2009 19:43:23 +0200
=== modified file 'control'
--- a/control 2009-04-15 09:38:01 +
+++ b/control 2009-04-15 11:38:25 +
@@ -156,7 +156,7 @@
Package: openoffice.org-calc
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep},
${scsolver-shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9),
openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4),
openoffice.org2-calc (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${binary:Version})
Provides: openoffice.org2-calc
=== modified file 'control.in'
--- a/control.in2009-04-15 09:38:01 +
+++ b/control.in2009-04-15 11:38:25 +
@@ -352,7 +352,7 @@
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base-core (= ${binary:Version}),
${shlibs:Depends},
- ${lpsolve-dep}, ${scsolver-shlibs:Depends},
+ ${lpsolve-dep},
${misc:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1),
openoffice.org (<< 1.9),
=== removed file 'openoffice.org-calc.postinst.in'
--- a/openoffice.org-calc.postinst.in 2008-08-16 02:33:23 +
+++ b/openoffice.org-calc.postinst.in 1970-01-01 00:00:00 +
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=openoffice.org-wiki-publisher
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension
/usr/lib/openoffice/share/extension/install/scsolver.uno.oxt
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-calc.preinst.in'
--- a/openoffice.org-calc.preinst.in2008-08-16 02:33:23 +
+++ b/openoffice.org-calc.preinst.in1970-01-01 00:00:00 +
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# preinst script for openoffice.org-calc
-
-THIS_PACKAGE=openoffice.org-calc
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- upgrade)
- # we might upgrade from a -calc version which hasn't the
- # extension
- if /usr/lib/openoffice/program/unopkg list --shared | grep -q
org.go-oo.CalcSolver; then
- remove_extension org.go-oo.CalcSolver
- fi
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-calc.prerm.in'
--- a/openoffice.org-calc.prerm.in 2008-08-16 02:33:23 +
+++ b/openoffice.org-calc.prerm.in 1970-01-01 00:00:00 +
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# preinst script for openoffice.org-calc
-
-THIS_PACKAGE=openoffice.org-calc
-THIS_SCRIPT=prerm
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension org.go-oo.CalcSolver
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-calc.script.bug.in'
--- a/openoffice.org-calc.script.bug.in 2008-08-16 02:33:23 +
+++ b/openoffice.org-calc.script.bug.in 1970-01-01 00:00:00 +
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared org.go-oo.CalcSolver >&3
=== modified file 'rules'
--- a/rules 2009-04-15 10:07:34 +
+++ b/rules 2009-04-15 11:38:25 +
@@ -208,8 +208,6 @@
ifeq "$(BUILD_GTK)" &qu
./packages/openofficeorg/3.0.1/unstable r1455: fix lintians dbg-package-missing-depends
revno: 1455
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 11:35:28 +0200
message:
fix lintians dbg-package-missing-depends
modified:
changelog
control
control.debug.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-15 09:33:39 +
+++ b/changelog 2009-04-15 09:35:28 +
@@ -5,6 +5,8 @@
BUILD_KDE conditional
* debian/control.in, debian/broffice.org.postrm.in:
- Standards-Version: 3.8.1
+ * debian/rules, debian/control.debug.in:
+- fix lintians dbg-package-missing-depends
-- Rene Engelhard Mon, 13 Apr 2009 19:43:23 +0200
=== modified file 'control'
--- a/control 2009-04-15 09:33:39 +
+++ b/control 2009-04-15 09:35:28 +
@@ -3274,7 +3274,8 @@
Section: devel
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Priority: extra
-Depends: ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version} | openoffice.org-gcj (=
${binary:Version} | openoffice.org-dev (= ${binary:Version} |
openoffice.org-gnome (= ${binary:Version} | openoffice.org-kde (=
${binary:Version} | openoffice.org-calc (= ${binary:Version},
openoffice.org-base-core (= ${binary:Version} | openoffice.org-base (=
${binary:Version}, openoffice.org-filter-binfilter (= ${binary:Version} |
openoffice.org-draw (= ${binary:Version}, openoffice.org-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.org (= ${binary:Version}, ${misc:Depends}
+Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.debug.in'
--- a/control.debug.in 2009-03-29 20:28:49 +
+++ b/control.debug.in 2009-04-15 09:35:28 +
@@ -2,7 +2,8 @@
Section: devel
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: ${misc:Depends}
+Depends: openoffice.orgVER-core (= ${binary:Version} | openoffice.orgVER-gcj
(= ${binary:Version} | openoffice.orgVER-dev (= ${binary:Version} |
openoffice.orgVER-gnome (= ${binary:Version} | openoffice.orgVER-kde (=
${binary:Version} | openoffice.orgVER-calc (= ${binary:Version},
openoffice.orgVER-base-core (= ${binary:Version} | openoffice.orgVER-base (=
${binary:Version}, openoffice.orgVER-filter-binfilter (= ${binary:Version} |
openoffice.orgVER-draw (= ${binary:Version}, openoffice.orgVER-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.orgVER (= ${binary:Version},
${misc:Depends}
+Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'rules'
--- a/rules 2009-04-13 21:43:09 +
+++ b/rules 2009-04-15 09:35:28 +
@@ -439,7 +439,7 @@
else
SMALL_SYMBOLS = y
endif
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], ure-dbg, libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head
-n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg,
libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg,
libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head
-n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg,
libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg,
libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
else
./packages/openofficeorg/3.1/experimental r1497: prepare for m10; w2l will be gone there
revno: 1497
committer: Rene Engelhard
branch nick: experimental
timestamp: Wed 2009-04-15 14:58:32 +0200
message:
prepare for m10; w2l will be gone there
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-15 11:38:25 +
+++ b/changelog 2009-04-15 12:58:32 +
@@ -1,4 +1,4 @@
-openoffice.org (1:3.1.0~rc1-3) UNRELEASED; urgency=low
+openoffice.org (1:3.1.0~rc2-1) UNRELEASED; urgency=low
* ooo-build
- update (f51d5e08421d33dc4d88f193c252451c6262a23f)
@@ -12,6 +12,10 @@
in 3.8.0. (ccache,lang=en-US de -> ccache lang=en-US,de)
* debian/rules, debian/control.debug.in:
- fix lintians dbg-package-missing-depends
+ * debian/rules, debian/control.in:
+- remove writer2latex remains as it a) is not a "bundled extension"
+ anymore and b) is not in the code anymore either. Still available
+ externally.
* debian/rules:
- remove Python26 special-casing, we now have a generic patch for 2.4 and
2.6
=== modified file 'control'
--- a/control 2009-04-15 11:38:25 +
+++ b/control 2009-04-15 12:58:32 +
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ${ooo-officebean-dep}, ${writer-w2l-dep},
openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ${ooo-officebean-dep}, openoffice.org-filter-mobiledev,
${lucene-depends}, ${java-common-depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ttf-liberation | msttcorefonts
Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, openoffice.org-gnome, iceweasel | firefox | icedove | thunderbird |
iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat |
imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common
(<< 1:3.0.0)
@@ -143,7 +143,7 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.org-emailmerge,
openoffice.org-math
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, openoffice.org-emailmerge, openoffice.org-math
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${binary:Version}), openoffice.org-common (<<
1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${binary:Version}), openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
=== modified file 'control.in'
--- a/control.in2009-04-15 11:38:25 +
+++ b/control.in2009-04-15 12:58:32 +
@@ -68,7 +68,6 @@
openoffice.orgVER-report-builder-bin,
ttf-dejavu,
${ooo-officebean-dep},
- ${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
${lucene-depends},
${java-common-depends},
@@ -330,7 +329,7 @@
openoffice.orgVER-base-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge,
openoffice.orgVER-math
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, openoffice.orgVER-emailmerge, openoffice.orgVER-math
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${binary:Version}),
=== modified file 'rules'
--- a/rules 2009-04-15 11:38:25 +
+++ b/rules 2009-04-15 12:58:32 +
@@ -63,7 +63,7 @@
MWS=OOO310
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
-MILESTONE=m9
+MILESTONE=m10
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-1
@@ -519,11 +519,6 @@
CONFI
./packages/openofficeorg/3.0.1/unstable r1461: update ooo-build; resolve conflicts/regen control
revno: 1461
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 21:09:05 +0200
message:
update ooo-build; resolve conflicts/regen control
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-04-15 10:02:51 +
+++ b/changelog 2009-04-15 19:09:05 +
@@ -1,5 +1,8 @@
openoffice.org (1:3.0.1-11) UNRELEASED; urgency=low
+ * ooo-build
+- update (142ca02d3bfd7bb2ce4574348a499d1568dfb449)
+
* debian/control.in, debian/control.kde.in, debian/rules:
- disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve
BUILD_KDE conditional
@@ -14,7 +17,7 @@
- -dbg -> debug, -l10n-* -> localization, -officebean -> java,
-base -> database, ttf-opensymbol -> fonts, *cli* -> cli-mono
- -- Rene Engelhard Mon, 13 Apr 2009 19:43:23 +0200
+ -- Rene Engelhard Wed, 15 Apr 2009 21:02:53 +0200
openoffice.org (1:3.0.1-10) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-04-15 09:45:34 +
+++ b/control 2009-04-15 19:09:05 +
@@ -219,11 +219,8 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-<<<<<<< TREE
+Section: database
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends},
${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
-===
-Section: database
->>>>>>> MERGE-SOURCE
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java, openoffice.org-gcj,
openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<<
1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-base (<< ${binary:Version}), openoffice.org-java,
openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (=
1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1),
openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (=
2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<<
${binary:Version}), openoffice.org-common (= 2.0.4-4)
@@ -403,12 +400,8 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
-<<<<<<< TREE
-Section: misc
+Section: java
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${java-runtime-depends}, ${java-common-depends}, ${misc:Depends}
-===
-Section: java
->>>>>>> MERGE-SOURCE
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
=== modified file 'control.in'
--- a/control.in2009-04-15 09:43:12 +
+++ b/control.in2009-04-15 19:09:05 +
@@ -445,12 +445,9 @@
Package: openoffice.orgVER-base
Architecture: %OOO_ARCHS%
-<<<<<<< TREE
-Depends: openoffice.orgVER-core (= ${binary:Version}),
- openoffice.orgVER-base-core (= ${binary:Version}),
-===
Section: database
->>>>>>> MERGE-SOURCE
+Depends: openoffice.orgVER-core (= ${binary:Version}),
+ openoffice.orgVER-base-core (= ${binary:Version}),
${shlibs:Depends},
${java-runtime-depends},
${base-hsqldb-depends},
@@ -676,12 +673,8 @@
Package: openoffice.orgVER-officebean
Architecture: %OOO_JAVA_ARCHS%
-<<<<<<< TREE
-Section: misc
-Depends: openoffice.orgVER-core (= ${binary:Version}),
-===
Section: java
->>>>>>> MERGE-SOURCE
+Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${java-runtime-depends},
${java-common-depends},
./packages/openofficeorg/3.1/experimental r1498: update ooo-build; fix rules; regenerate control
revno: 1498 committer: Rene Engelhard branch nick: experimental timestamp: Wed 2009-04-15 21:11:07 +0200 message: update ooo-build; fix rules; regenerate control modified: changelog control rules === modified file 'changelog' --- a/changelog 2009-04-15 12:58:32 + +++ b/changelog 2009-04-15 19:11:07 + @@ -1,7 +1,7 @@ openoffice.org (1:3.1.0~rc2-1) UNRELEASED; urgency=low * ooo-build -- update (f51d5e08421d33dc4d88f193c252451c6262a23f) +- update (5e7715535e0fda133a7993c3ef95fa6801cc42ff) * debian/control.in, debian/control.kde.in, debian/rules: - disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve @@ -21,7 +21,7 @@ 2.6 - remove scsolver stuff, scsolver is gone from ooo-build - -- Rene Engelhard Mon, 13 Apr 2009 19:43:23 +0200 + -- Rene Engelhard Wed, 15 Apr 2009 21:10:27 +0200 openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low === modified file 'control' --- a/control 2009-04-15 12:58:32 + +++ b/control 2009-04-15 19:11:07 + @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team Uploaders: Chris Halls , Rene Engelhard -Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), 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, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , libxrandr
./packages/openofficeorg/3.1/experimental r1499: update ooo-build; close 523314
revno: 1499 committer: Rene Engelhard branch nick: experimental timestamp: Wed 2009-04-15 21:39:12 +0200 message: update ooo-build; close 523314 modified: changelog === modified file 'changelog' --- a/changelog 2009-04-15 19:11:07 + +++ b/changelog 2009-04-15 19:39:12 + @@ -1,7 +1,9 @@ openoffice.org (1:3.1.0~rc2-1) UNRELEASED; urgency=low * ooo-build -- update (5e7715535e0fda133a7993c3ef95fa6801cc42ff) +- update (5921707d680b88c54e7195481847b87abf140b5f) + - moves default-system-fpicker.diff into the common set +(closes: #523314) * debian/control.in, debian/control.kde.in, debian/rules: - disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve @@ -21,7 +23,7 @@ 2.6 - remove scsolver stuff, scsolver is gone from ooo-build - -- Rene Engelhard Wed, 15 Apr 2009 21:10:27 +0200 + -- Rene Engelhard Wed, 15 Apr 2009 21:38:05 +0200 openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low
./packages/openofficeorg/3.1/experimental r1500: looks like m10 won't be rc2 (some stoppers not in m10)...
revno: 1500 committer: Rene Engelhard branch nick: experimental timestamp: Thu 2009-04-16 16:38:14 +0200 message: looks like m10 won't be rc2 (some stoppers not in m10)... modified: changelog rules === modified file 'changelog' --- a/changelog 2009-04-15 19:39:12 + +++ b/changelog 2009-04-16 14:38:14 + @@ -1,5 +1,6 @@ -openoffice.org (1:3.1.0~rc2-1) UNRELEASED; urgency=low +openoffice.org (1:3.1.0~rc2~ooo310m10-1) UNRELEASED; urgency=low + * new upstream snapshot (OOO310_m10) * ooo-build - update (5921707d680b88c54e7195481847b87abf140b5f) - moves default-system-fpicker.diff into the common set === modified file 'rules' --- a/rules 2009-04-15 19:11:07 + +++ b/rules 2009-04-16 14:38:14 + @@ -62,8 +62,8 @@ unexport LS_COLORS MWS=OOO310 -#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//) -MILESTONE=m10 +MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//) +#MILESTONE=m10 TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) #TAG=$(MWS)_$(MILESTONE) #OOO_BUILD_BRANCH=ooo-build-3-1
./packages/openofficeorg/3.1/experimental r1501: actually add control.kde.in ...
revno: 1501 committer: Rene Engelhard branch nick: experimental timestamp: Fri 2009-04-17 20:24:15 +0200 message: actually add control.kde.in ... added: control.kde.in modified: changelog control Diff too large for email (2662 lines, the limit is 1000).
./packages/openofficeorg/3.1/experimental r1502: oops
revno: 1502 committer: Rene Engelhard branch nick: experimental timestamp: Fri 2009-04-17 20:32:23 +0200 message: oops modified: changelog control Diff too large for email (2618 lines, the limit is 1000).
./packages/openofficeorg/3.0.1/unstable r1462: fixup HELPISOS
revno: 1462
committer: Rene Engelhard
branch nick: unstable
timestamp: Fri 2009-04-17 20:37:06 +0200
message:
fixup HELPISOS
modified:
rules
=== modified file 'rules'
--- a/rules 2009-04-15 10:07:06 +
+++ b/rules 2009-04-17 18:37:06 +
@@ -136,7 +136,7 @@
BUILD_CAIROCANVAS=y
USE_SYSTEM_CAIRO=y
CAIRO_FONTS_PATCH=y
-BUILD_KDE=n
+BUILD_KDE=y
ifeq "$(BUILD_KDE)" "y"
ENABLE_KDEAB=y
endif
@@ -508,7 +508,7 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^,\s*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
else
# Note that the first one here *has to be* en-US. the first one gets
./packages/openofficeorg/3.1/experimental r1503: merge
revno: 1503
committer: Rene Engelhard
branch nick: experimental
timestamp: Fri 2009-04-17 20:40:12 +0200
message:
merge
modified:
changelog
rules
revno: 1332.1.124
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 11:42:15 +0200
message:
merge
modified:
changelog
control
control.debug.in
control.in
control.lang.in
control.ure.in
revno: 1332.1.125
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 11:43:12 +0200
message:
merge
modified:
control
control.in
revno: 1332.1.126
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 11:45:34 +0200
message:
merge
modified:
changelog
control
control.fonts.in
control.mono.in
revno: 1332.1.127
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 12:02:51 +0200
message:
merge
modified:
changelog
rules
revno: 1332.1.128
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 12:07:06 +0200
message:
handle stuff from DEB_BUILD_OPTIONS *after* lang=xx...
modified:
rules
revno: 1332.1.129
committer: Rene Engelhard
branch nick: unstable
timestamp: Wed 2009-04-15 21:09:05 +0200
message:
update ooo-build; resolve conflicts/regen control
modified:
changelog
control
control.in
revno: 1332.1.130
committer: Rene Engelhard
branch nick: unstable
timestamp: Fri 2009-04-17 20:37:06 +0200
message:
fixup HELPISOS
modified:
rules
=== modified file 'changelog'
--- a/changelog 2009-04-17 18:32:23 +
+++ b/changelog 2009-04-17 18:40:12 +
@@ -24,7 +24,7 @@
2.6
- remove scsolver stuff, scsolver is gone from ooo-build
- -- Rene Engelhard Fri, 17 Apr 2009 20:29:42 +0200
+ -- Rene Engelhard Fri, 17 Apr 2009 20:39:57 +0200
openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-04-16 14:38:14 +
+++ b/rules 2009-04-17 18:40:12 +
@@ -528,7 +528,7 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^,\s*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /')
else
# Note that the first one here *has to be* en-US. the first one gets
./packages/openofficeorg/3.1/experimental r1504: add missing )
revno: 1504
committer: Rene Engelhard
branch nick: experimental
timestamp: Sat 2009-04-18 11:51:18 +0200
message:
add missing )
modified:
control
control.debug.in
=== modified file 'control'
--- a/control 2009-04-17 18:40:12 +
+++ b/control 2009-04-18 09:51:18 +
@@ -3396,7 +3396,7 @@
Section: debug
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Priority: extra
-Depends: openoffice.org-core (= ${binary:Version} | openoffice.org-gcj (=
${binary:Version} | openoffice.org-dev (= ${binary:Version} |
openoffice.org-gnome (= ${binary:Version} | openoffice.org-kde (=
${binary:Version} | openoffice.org-calc (= ${binary:Version},
openoffice.org-base-core (= ${binary:Version} | openoffice.org-base (=
${binary:Version}, openoffice.org-filter-binfilter (= ${binary:Version} |
openoffice.org-draw (= ${binary:Version}, openoffice.org-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.org (= ${binary:Version}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version} | openoffice.org-gcj (=
${binary:Version} | openoffice.org-dev (= ${binary:Version} |
openoffice.org-gnome (= ${binary:Version} | openoffice.org-kde (=
${binary:Version} | openoffice.org-calc (= ${binary:Version},
openoffice.org-base-core (= ${binary:Version} | openoffice.org-base (=
${binary:Version}, openoffice.org-filter-binfilter (= ${binary:Version} |
openoffice.org-draw (= ${binary:Version}, openoffice.org-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.org (= ${binary:Version}),
${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
=== modified file 'control.debug.in'
--- a/control.debug.in 2009-04-17 18:40:12 +
+++ b/control.debug.in 2009-04-18 09:51:18 +
@@ -2,7 +2,7 @@
Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: openoffice.orgVER-core (= ${binary:Version} | openoffice.orgVER-gcj
(= ${binary:Version} | openoffice.orgVER-dev (= ${binary:Version} |
openoffice.orgVER-gnome (= ${binary:Version} | openoffice.orgVER-kde (=
${binary:Version} | openoffice.orgVER-calc (= ${binary:Version},
openoffice.orgVER-base-core (= ${binary:Version} | openoffice.orgVER-base (=
${binary:Version}, openoffice.orgVER-filter-binfilter (= ${binary:Version} |
openoffice.orgVER-draw (= ${binary:Version}, openoffice.orgVER-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.orgVER (= ${binary:Version},
${misc:Depends}
+Depends: openoffice.orgVER-core (= ${binary:Version} | openoffice.orgVER-gcj
(= ${binary:Version} | openoffice.orgVER-dev (= ${binary:Version} |
openoffice.orgVER-gnome (= ${binary:Version} | openoffice.orgVER-kde (=
${binary:Version} | openoffice.orgVER-calc (= ${binary:Version},
openoffice.orgVER-base-core (= ${binary:Version} | openoffice.orgVER-base (=
${binary:Version}, openoffice.orgVER-filter-binfilter (= ${binary:Version} |
openoffice.orgVER-draw (= ${binary:Version}, openoffice.orgVER-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.orgVER (= ${binary:Version}),
${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
./packages/openofficeorg/3.1/experimental r1505: more fixes to -dbgs new depends
revno: 1505
committer: Rene Engelhard
branch nick: experimental
timestamp: Sun 2009-04-19 20:33:42 +0200
message:
more fixes to -dbgs new depends
modified:
control
control.debug.in
=== modified file 'control'
--- a/control 2009-04-18 09:51:18 +
+++ b/control 2009-04-19 18:33:42 +
@@ -3396,7 +3396,7 @@
Section: debug
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Priority: extra
-Depends: openoffice.org-core (= ${binary:Version} | openoffice.org-gcj (=
${binary:Version} | openoffice.org-dev (= ${binary:Version} |
openoffice.org-gnome (= ${binary:Version} | openoffice.org-kde (=
${binary:Version} | openoffice.org-calc (= ${binary:Version},
openoffice.org-base-core (= ${binary:Version} | openoffice.org-base (=
${binary:Version}, openoffice.org-filter-binfilter (= ${binary:Version} |
openoffice.org-draw (= ${binary:Version}, openoffice.org-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.org (= ${binary:Version}),
${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}) | openoffice.org-gcj (=
${binary:Version}) | openoffice.org-dev (= ${binary:Version}) |
openoffice.org-gnome (= ${binary:Version}) | openoffice.org-kde (=
${binary:Version}) | openoffice.org-calc (= ${binary:Version}) |
openoffice.org-base-core (= ${binary:Version}) | openoffice.org-base (=
${binary:Version}) | openoffice.org-impress (= ${binary:Version}) |
openoffice.org-filter-binfilter (= ${binary:Version}) | openoffice.org-draw (=
${binary:Version}) | openoffice.org-writer (= ${binary:Version}) | python-uno
(= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) |
mozilla-openoffice.org (= ${binary:Version}) | openoffice.org-ogltrans (=
${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
=== modified file 'control.debug.in'
--- a/control.debug.in 2009-04-18 09:51:18 +
+++ b/control.debug.in 2009-04-19 18:33:42 +
@@ -2,7 +2,7 @@
Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: openoffice.orgVER-core (= ${binary:Version} | openoffice.orgVER-gcj
(= ${binary:Version} | openoffice.orgVER-dev (= ${binary:Version} |
openoffice.orgVER-gnome (= ${binary:Version} | openoffice.orgVER-kde (=
${binary:Version} | openoffice.orgVER-calc (= ${binary:Version},
openoffice.orgVER-base-core (= ${binary:Version} | openoffice.orgVER-base (=
${binary:Version}, openoffice.orgVER-filter-binfilter (= ${binary:Version} |
openoffice.orgVER-draw (= ${binary:Version}, openoffice.orgVER-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.orgVER (= ${binary:Version}),
${misc:Depends}
+Depends: openoffice.orgVER-core (= ${binary:Version}) | openoffice.orgVER-gcj
(= ${binary:Version}) | openoffice.orgVER-dev (= ${binary:Version}) |
openoffice.orgVER-gnome (= ${binary:Version}) | openoffice.orgVER-kde (=
${binary:Version}) | openoffice.orgVER-calc (= ${binary:Version}) |
openoffice.orgVER-base-core (= ${binary:Version}) | openoffice.orgVER-base (=
${binary:Version}) | openoffice.orgVER-impress (= ${binary:Version}) |
openoffice.orgVER-filter-binfilter (= ${binary:Version}) |
openoffice.orgVER-draw (= ${binary:Version}) | openoffice.orgVER-writer (=
${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (=
${binary:Version}) | mozilla-openoffice.orgVER (= ${binary:Version}) |
openoffice.orgVER-ogltrans (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
./packages/openofficeorg/3.1/experimental r1506: Inspector is not installed anymore in m10
revno: 1506 committer: Rene Engelhard branch nick: experimental timestamp: Sun 2009-04-19 20:59:11 +0200 message: Inspector is not installed anymore in m10 modified: rules === modified file 'rules' --- a/rules 2009-04-17 18:40:12 + +++ b/rules 2009-04-19 18:59:11 + @@ -2573,7 +2573,6 @@ chmod 644 $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/images/bg_table3.gif chmod 644 $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml chmod 644 $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml - chmod 644 `find $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/java/Inspector -type f | xargs` chmod 644 `find $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/java/EmbedDocument -type f | xargs` rm -f $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev-doc/LICENSE perl -pi -e 's,license.html,http://www.gnu.org/licenses/lgpl.html,' \
./packages/openofficeorg/3.1/experimental r1507: remove postinst/postrm of -gcj, let dh_nativejava -o do the job
revno: 1507 committer: Rene Engelhard branch nick: experimental timestamp: Sun 2009-04-19 22:22:16 +0200 message: remove postinst/postrm of -gcj, let dh_nativejava -o do the job removed: openoffice.org-gcj.postinst.in openoffice.org-gcj.postrm.in modified: changelog rules === modified file 'changelog' --- a/changelog 2009-04-17 18:40:12 + +++ b/changelog 2009-04-19 20:22:16 + @@ -19,12 +19,14 @@ - remove writer2latex remains as it a) is not a "bundled extension" anymore and b) is not in the code anymore either. Still available externally. + * debian/rules debian/openoffice.org-gcj.*post*: +- remove postinst/postrm of -gcj, let dh_nativejava -o do the job * debian/rules: - remove Python26 special-casing, we now have a generic patch for 2.4 and 2.6 - remove scsolver stuff, scsolver is gone from ooo-build - -- Rene Engelhard Fri, 17 Apr 2009 20:39:57 +0200 + -- Rene Engelhard Sun, 19 Apr 2009 21:38:52 +0200 openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low === removed file 'openoffice.org-gcj.postinst.in' --- a/openoffice.org-gcj.postinst.in2009-03-10 17:23:43 + +++ b/openoffice.org-gcj.postinst.in1970-01-01 00:00:00 + @@ -1,18 +0,0 @@ -#!/bin/sh - -# postinst script for openoffice.org-gcj - -THIS_PACKAGE=openoffice.org-gcj -THIS_SCRIPT=postinst - -set -e - -#INCLUDE_SHELL_LIB# - -if [ -x /usr/bin/rebuild-gcj-db ]; then - /usr/bin/rebuild-gcj-db || true -fi - -#DEBHELPER# - -exit 0 === removed file 'openoffice.org-gcj.postrm.in' --- a/openoffice.org-gcj.postrm.in 2009-03-10 17:23:43 + +++ b/openoffice.org-gcj.postrm.in 1970-01-01 00:00:00 + @@ -1,18 +0,0 @@ -#!/bin/sh - -# postrm script for openoffice.org-gcj - -THIS_PACKAGE=openoffice.org-gcj -THIS_SCRIPT=postrm - -set -e - -#INCLUDE_SHELL_LIB# - -if [ -x /usr/bin/rebuild-gcj-db ]; then - /usr/bin/rebuild-gcj-db || true -fi - -#DEBHELPER# - -exit 0 === modified file 'rules' --- a/rules 2009-04-19 18:59:11 + +++ b/rules 2009-04-19 20:22:16 + @@ -2889,6 +2889,9 @@ endif dh_installmime -s dh_installmenu -s +ifeq "$(BUILD_JARS_NATIVE)" "y" + dh_nativejava -popenoffice.org$(VER)-gcj -o +endif ifeq "$(USE_PYCENTRAL)" "y" dh_pycentral -ppython-uno else
Re: Processed: update
Hi, Debian Bug Tracking System wrote: > Processing commands for cont...@bugs.debian.org: > > > found 516784 1:3.0.1-10 > Bug#516784: Source package contains non-free IETF RFC/I-D > Bug marked as found in version 1:3.0.1-10. If you ever looked at the bug graph[1] you'd have noticed that this is a) fixed and will be fixed when 3.1 enters sid and b) you don't need to set a found for every version since unless a fixed/close is there the BTS knows the bug is not fixed there yet. Please stop setting every 3.0.1-x version. That's a given and won't change. It makes no sense to invest effort in repacking now since a) 3.0.1 will be replaced by 3.1.0 anyway at some time in sid b) squeeze will surely not release with 3.0.1 anyway. Grüße/Regards, René [1] http://bugs.debian.org/cgi-bin/version.cgi?info=1;absolute=0;fixed=1%3A3.1.0~ooo310m6-1;fixed=1%3A2.4.1%2Bdfsg-1;fixed=1%3A3.1.0~rc1-1;collapse=1;found=openoffice.org%2F1%3A3.0.1-2;found=openoffice.org%2F1%3A2.4.1-7;found=openoffice.org%2F1%3A3.0.1-4;found=openoffice.org%2F1%3A3.0.1-5;found=openoffice.org%2F1%3A3.0.1-8;found=openoffice.org%2F1%3A3.0.1-9;found=openoffice.org%2F1%3A3.0.1-10;package=openoffice.org, also linked from the bug page [2] Found in versions openoffice.org/1:3.0.1-2, openoffice.org/1:2.4.1-7, openoffice.org/1:3.0.1-4, openoffice.org/1:3.0.1-5, openoffice.org/1:3.0.1-8, openoffice.org/1:3.0.1-9, openoffice.org/1:3.0.1-10 Fixed in versions 1:3.1.0~ooo310m6-1, 1:2.4.1+dfsg-1, 1:3.1.0~rc1-1 > -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Exported PDF/A documents cannot be opened by some Acrobat Reader versions
Hi, Pier Zinato wrote: > Is the problem related to architecture x86_64? Probably not when you read .. > I have found a description of the same bug in: > https://bugs.launchpad.net/ubuntu/+source/openoffice.org/+bug/237678 > https://bugzilla.novell.com/show_bug.cgi?id=467181 this. > and I wander if the same problem as been already solved in Debian. Most probably no, given we use ooo-build and the Ubuntu packages are based on ours.. > Do you have documentation about this issue? Except the Novell bugzilla issue above (where it is filed at the correct place if it doesn't happen with Sun binaries) no. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#525092: [openoffice.org] clicking the new document button results in crash, selecting the type of document is ok
tag 525092 + moreinfo tag 525092 + unreproducible thanks Hi, Marc Graham wrote: > If i click the new doc button in writer and also in spreadsheet it crashes. Works here. > If i click the drop down menu and select the type of file its ok though. Works here, too. > Sorry, couldn't download dbg package as i'm on dial up connection. > > Sorry also that I'm such a newbie in case i've missed something important. I can't reproduce this in a i386 testing chroot. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#525238: openoffice.org-impress: Saving in powerpoint files causes loss of a freeform line
forwarded 525238 http://qa.openoffice.org/issues/show_bug.cgi?id=96208 thanks Hi, Paul Hartley wrote: > If I draw a freeform line (the Curve tool) and save the presentation as > a Powerpoint file (.ppt), I can still see this drawn line on the > presentation slide. If I close OpenOffice and re-open the saved > presentation, the drawn line is gone. This behavior is not > seen when saving as an .odp file. Sounds like http://qa.openoffice.org/issues/show_bug.cgi?id=96208 but for ppt - I added a comment and "confirmed" it. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#525245: openoffice.org: OO.o should recommend/suggest xfonts-mathml
found 525245 1:3.0.1-7 severity 525245 wishlist tag 525245 + moreinfo thanks Hi, Johannes Wiedersich wrote: > OO.o neither recommends nor suggests xfonts-mathml. Without that package > documents using the common Symbol font > (say for mathematical equations) won't display properly. Do you have examples? Maybe documents? Is that "alien" formats? Because OOo should use OpenSymbol, and that is even depended on (as you also need it for bullets etc.) > ii openoffice.org-base1:3.0.1-7~bpo50+1 OpenOffice.org office suite - > data > ii openoffice.org-calc1:3.0.1-7~bpo50+1 OpenOffice.org office suite - > spre > ii openoffice.org-core1:3.0.1-7~bpo50+1 OpenOffice.org office suite > archit > ii openoffice.org-draw1:3.0.1-7~bpo50+1 OpenOffice.org office suite - > draw > ii openoffice.org-filter- 1:2.4.1+dfsg-1Mobile Devices Filters for > OpenOff > ii openoffice.org-impress 1:3.0.1-7~bpo50+1 OpenOffice.org office suite - > pres > ii openoffice.org-java-co 1:3.0.1-7~bpo50+1 OpenOffice.org office suite Java > s > ii openoffice.org-math1:3.0.1-7~bpo50+1 OpenOffice.org office suite - > equa > ii openoffice.org-officeb 1:3.0.1-7~bpo50+1 OpenOffice.org Office Bean > ii openoffice.org-report- 1:2.4.1+dfsg-1OpenOffice.org Report Builder > exte > ii openoffice.org-writer 1:3.0.1-7~bpo50+1 OpenOffice.org office suite - > word Not that it's related, but mixup? (The dependencies afais are correct, though, except maybe for the report-builder extension, but I don't really want to add conflicts. I think the -report-builder package should say what it needs - and that's actually done with the OOo3 packages) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#525245: openoffice.org: OO.o should recommend/suggest xfonts-mathml
Hi, Johannes Wiedersich wrote: > Rene Engelhard wrote: > > Johannes Wiedersich wrote: > >> OO.o neither recommends nor suggests xfonts-mathml. Without that > >> package documents using the common Symbol font (say for > >> mathematical equations) won't display properly. > > > > Do you have examples? Maybe documents? Is that "alien" formats? > > Yes, AFAICT that mainly affects alien formats, but I attach a odt, that > is also affected. Hmm, ok. Will try the odt later, thanks. > The problem is _fixed_ by just installing xfonts-mathml and it's > recommends latex-xft-fonts. *and*? So it's sufficient to install xfonts-mathml? Or is it sufficient to install latex-xft-fonts? Or do you need both? Depending on the options you use for apt Recommends are not installed per default (and Suggests are not in any case), and people will eventually apt-get install it manually when they see the stuff in apts output. > I manually fixed quite a few conflicts via aptitude when upgrading to > the version from backports. I just installed 1:3.0.1-7~bpo50+1 to see if > the problem persists in the newer version. It affects _both_ lenny and > backports. OK, guessed that already. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#525245: openoffice.org: OO.o should recommend/suggest xfonts-mathml
Hi,
Johannes Wiedersich wrote:
> >> The problem is _fixed_ by just installing xfonts-mathml and it's
> >> recommends latex-xft-fonts.
^^
> >
> > *and*?
>
> And it is difficult to identify the missing package, since it is not
> given as {depends,recommends,suggests}.
Heh, actually that and was a introductory statement referring to the ^'ed
part above, not a question why this is bad :-)
> > So it's sufficient to install xfonts-mathml? Or is it sufficient to install
> > latex-xft-fonts? Or do you need both?
>
> - From the output of
>
> $ dpkg -L xfonts-mathml
>
> xfonts-mathml provides the files
> /usr/share/fonts/X11/Type1/Symbol.afm
> /usr/share/fonts/X11/Type1/Symbol.pfb
>
> that appear to fix it. I have not verified if uninstalling
> latex-xft-fonts breaks anything, but would not expect so.
OK.
Grüße/Regards,
René
--
.''`. René Engelhard -- Debian GNU/Linux Developer
: :' : http://www.debian.org | http://people.debian.org/~rene/
`. `' r...@debian.org | GnuPG-Key ID: 248AEB73
`- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.0.1/unstable r1463: recommend xfonts-mathml
revno: 1463
committer: Rene Engelhard
branch nick: unstable
timestamp: Thu 2009-04-23 13:26:14 +0200
message:
recommend xfonts-mathml
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-04-15 19:09:05 +
+++ b/changelog 2009-04-23 11:26:14 +
@@ -16,6 +16,7 @@
- update for new sections:
- -dbg -> debug, -l10n-* -> localization, -officebean -> java,
-base -> database, ttf-opensymbol -> fonts, *cli* -> cli-mono
+- make openoffice.org-common recommends xfonts-mathml (closes: #525245)
-- Rene Engelhard Wed, 15 Apr 2009 21:02:53 +0200
=== modified file 'control'
--- a/control 2009-04-15 19:09:05 +
+++ b/control 2009-04-23 11:26:14 +
@@ -115,7 +115,7 @@
Architecture: all
Depends: openoffice.org-style-galaxy, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
-Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
+Recommends: openoffice.org-style-tango, openoffice.org-style-crystal,
xfonts-mathml
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (=
2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer
(<< ${base-version}), openoffice.org-calc (<< ${base-version}),
openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<<
${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<<
${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-5),
dictionaries-common (<< 0.98.14)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org
(<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us,
openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base
(<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<<
2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
=== modified file 'control.in'
--- a/control.in2009-04-15 19:09:05 +
+++ b/control.in2009-04-23 11:26:14 +
@@ -264,9 +264,10 @@
Depends: openoffice.orgVER-style-galaxy,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
- openoffice.orgVER-style-hicontrast
+ openoffice.orgVER-style-hicontrast,
Recommends: openoffice.orgVER-style-tango,
- openoffice.orgVER-style-crystal
+ openoffice.orgVER-style-crystal,
+ xfonts-mathml
Conflicts: openoffice.org-debian-files,
openoffice.org-mimelnk,
openoffice.org2-common,
./packages/openofficeorg/3.1/experimental r1508: merge
revno: 1508
committer: Rene Engelhard
branch nick: experimental
timestamp: Thu 2009-04-23 13:30:58 +0200
message:
merge
modified:
changelog
control
control.in
revno: 1332.1.131
committer: Rene Engelhard
branch nick: unstable
timestamp: Thu 2009-04-23 13:26:14 +0200
message:
recommend xfonts-mathml
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-04-19 20:22:16 +
+++ b/changelog 2009-04-23 11:30:58 +
@@ -25,6 +25,8 @@
- remove Python26 special-casing, we now have a generic patch for 2.4 and
2.6
- remove scsolver stuff, scsolver is gone from ooo-build
+ * debian/control.in:
+- make openoffice.org-common recommends xfonts-mathml (closes: #525245)
-- Rene Engelhard Sun, 19 Apr 2009 21:38:52 +0200
=== modified file 'control'
--- a/control 2009-04-19 18:33:42 +
+++ b/control 2009-04-23 11:30:58 +
@@ -115,7 +115,7 @@
Architecture: all
Depends: openoffice.org-style-galaxy, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
-Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
+Recommends: openoffice.org-style-tango, openoffice.org-style-crystal,
xfonts-mathml
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (=
2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer
(<< ${base-version}), openoffice.org-calc (<< ${base-version}),
openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<<
${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<<
${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-5),
dictionaries-common (<< 0.98.14)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org
(<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us,
openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base
(<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<<
2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
=== modified file 'control.in'
--- a/control.in2009-04-17 18:40:12 +
+++ b/control.in2009-04-23 11:30:58 +
@@ -263,9 +263,10 @@
Depends: openoffice.orgVER-style-galaxy,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
- openoffice.orgVER-style-hicontrast
+ openoffice.orgVER-style-hicontrast,
Recommends: openoffice.orgVER-style-tango,
- openoffice.orgVER-style-crystal
+ openoffice.orgVER-style-crystal,
+ xfonts-mathml
Conflicts: openoffice.org-debian-files,
openoffice.org-mimelnk,
openoffice.org2-common,
Bug#525364: patch for ‘debian/copyright’
forwarded 525364 http://qa.openoffice.org/issues/show_bug.cgi?id=94276 close 525364 1:3.1.0~rc1-1 thanks Hi, Ben Finney wrote: > The attached patch bundle (against ‘3.0.1/unstable’ branch) addresses > the ‘debian/copyright’ portion of this bug. As already said debian/copyright got completely reworked in 3.1, fixing this, too. > It still remains to correct the address in the upstream source, > preferably in collaboration with upstream. For at least THIRDPARTYLICENSE.html, upstream claims it's done in 3.1, too: http://qa.openoffice.org/issues/show_bug.cgi?id=94276 Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.0.1/unstable r1464: Remove obsolete references to old FSF address. (Ben Finney)
revno: 1464 committer: Rene Engelhard branch nick: unstable timestamp: Fri 2009-04-24 09:55:55 +0200 message: Remove obsolete references to old FSF address. (Ben Finney) modified: changelog copyright revno: 1442.1.1 committer: Ben Finney branch nick: debian.devel timestamp: Tue 2009-03-24 15:26:41 +1100 message: Re-work each package synopsis to avoid self-reference. modified: changelog control.debug.in control.fonts.in control.gcj.in control.help.in control.in control.lang.in control.mediawiki.in control.minimizer.in control.mono.in control.mozilla.in control.ogltrans.in control.pdfimport.in control.postgresql.in control.presenter.in control.reportdesign.in control.sdk.in control.ure.in revno: 1442.1.2 committer: Ben Finney branch nick: descriptive-synopsis timestamp: Tue 2009-03-24 19:20:32 +1100 message: Refine package synopses with feedback from Rene. modified: control.in control.mono.in control.ure.in revno: 1442.1.3 committer: Ben Finney branch nick: copyright-reference timestamp: Thu 2009-04-23 20:43:05 +1000 message: Merge from ‘thread:descriptive-synopsis’. modified: broffice.org.postrm.in changelog control control.debug.in control.fonts.in control.in control.lang.in control.mono.in control.reportdesign.in control.sdk.in control.ure.in rules shell-lib.sh revno: 1442.2.1 committer: Ben Finney branch nick: descriptive-synopsis timestamp: Thu 2009-04-23 20:41:26 +1000 message: Merge from ‘thread:unstable’. modified: broffice.org.postrm.in changelog control control.debug.in control.fonts.in control.in control.lang.in control.mono.in control.reportdesign.in control.sdk.in control.ure.in rules shell-lib.sh revno: 1442.1.4 committer: Ben Finney branch nick: copyright-reference timestamp: Thu 2009-04-23 20:48:24 +1000 message: Remove obsolete reference to old FSF address. modified: changelog copyright revno: 1442.1.5 committer: Ben Finney branch nick: copyright-reference timestamp: Fri 2009-04-24 10:11:09 +1000 message: debian/copyright: Remove references to old FSF address. modified: changelog copyright === modified file 'changelog' --- a/changelog 2009-04-23 11:26:14 + +++ b/changelog 2009-04-24 07:55:55 + @@ -1,5 +1,6 @@ openoffice.org (1:3.0.1-11) UNRELEASED; urgency=low + [ Rene Engelhard ] * ooo-build - update (142ca02d3bfd7bb2ce4574348a499d1568dfb449) @@ -18,6 +19,11 @@ -base -> database, ttf-opensymbol -> fonts, *cli* -> cli-mono - make openoffice.org-common recommends xfonts-mathml (closes: #525245) + [ Ben Finney ] + * debian/copyright: ++ Remove obsolete references to old FSF address. + (partial resolution for Bug#525364) + -- Rene Engelhard Wed, 15 Apr 2009 21:02:53 +0200 openoffice.org (1:3.0.1-10) unstable; urgency=low === modified file 'copyright' --- a/copyright 2009-01-19 15:54:17 + +++ b/copyright 2009-04-24 00:11:09 + @@ -15,14 +15,14 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# + # Based in part on code from sash, Copyright (c) 1999 by David I. Bell # Permission has been granted to redistribute this code under the GPL. +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in ‘/usr/share/common-licenses/GPL-2’. + + Unless otherwise noted, all modifications and additions to OpenOffice.org found in this Debian package bear the following copyright and license terms: @@ -291,10 +291,11 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should ha
./packages/openofficeorg/3.1/experimental r1509: m11, remove unneeded ,
revno: 1509
committer: Rene Engelhard
branch nick: experimental
timestamp: Sat 2009-04-25 08:24:28 +0200
message:
m11, remove unneeded ,
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-23 11:30:58 +
+++ b/changelog 2009-04-25 06:24:28 +
@@ -1,8 +1,8 @@
-openoffice.org (1:3.1.0~rc2~ooo310m10-1) UNRELEASED; urgency=low
+openoffice.org (1:3.1.0~rc2-1) UNRELEASED; urgency=low
- * new upstream snapshot (OOO310_m10)
+ * OpenOffice.org 3.1.0 rc2 (OOO310_m11)
* ooo-build
-- update (ae7a99193fcfbbf5ca1bf305f97225f54d1f46c4)
+- update (43f5c40737796e18d399275bd6f65237e98f66c8)
- moves default-system-fpicker.diff into the common set
(closes: #523314)
@@ -28,7 +28,7 @@
* debian/control.in:
- make openoffice.org-common recommends xfonts-mathml (closes: #525245)
- -- Rene Engelhard Sun, 19 Apr 2009 21:38:52 +0200
+ -- Rene Engelhard Fri, 24 Apr 2009 23:51:06 +0200
openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low
=== modified file 'control.in'
--- a/control.in2009-04-23 11:30:58 +
+++ b/control.in2009-04-25 06:24:28 +
@@ -263,7 +263,7 @@
Depends: openoffice.orgVER-style-galaxy,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
- openoffice.orgVER-style-hicontrast,
+ openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
openoffice.orgVER-style-crystal,
xfonts-mathml
=== modified file 'rules'
--- a/rules 2009-04-19 20:22:16 +
+++ b/rules 2009-04-25 06:24:28 +
@@ -62,8 +62,8 @@
unexport LS_COLORS
MWS=OOO310
-MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e s/$(shell
echo $(MWS) | tr A-Z a-z)//)
-#MILESTONE=m10
+#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
+MILESTONE=m11
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-1
./packages/openofficeorg/3.0.1/unstable r1465: hrm, fix BUILD_KDE setting again, add missed control.kde.in, regenerate control, remove missing ,
revno: 1465
committer: Rene Engelhard
branch nick: unstable
timestamp: Sat 2009-04-25 15:30:20 +0200
message:
hrm, fix BUILD_KDE setting again, add missed control.kde.in, regenerate
control, remove missing ,
added:
control.kde.in
modified:
control
control.debug.in
control.in
rules
=== modified file 'control'
--- a/control 2009-04-23 11:26:14 +
+++ b/control 2009-04-25 13:30:20 +
@@ -3354,7 +3354,7 @@
Section: debug
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Priority: extra
-Depends: openoffice.org-core (= ${binary:Version} | openoffice.org-gcj (=
${binary:Version} | openoffice.org-dev (= ${binary:Version} |
openoffice.org-gnome (= ${binary:Version} | openoffice.org-kde (=
${binary:Version} | openoffice.org-calc (= ${binary:Version},
openoffice.org-base-core (= ${binary:Version} | openoffice.org-base (=
${binary:Version}, openoffice.org-filter-binfilter (= ${binary:Version} |
openoffice.org-draw (= ${binary:Version}, openoffice.org-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.org (= ${binary:Version}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}) | openoffice.org-gcj (=
${binary:Version}) | openoffice.org-dev (= ${binary:Version}) |
openoffice.org-gnome (= ${binary:Version}) | openoffice.org-kde (=
${binary:Version}) | openoffice.org-calc (= ${binary:Version}) |
openoffice.org-base-core (= ${binary:Version}) | openoffice.org-base (=
${binary:Version}) | openoffice.org-impress (= ${binary:Version}) |
openoffice.org-filter-binfilter (= ${binary:Version}) | openoffice.org-draw (=
${binary:Version}) | openoffice.org-writer (= ${binary:Version}) | python-uno
(= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) |
mozilla-openoffice.org (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
=== modified file 'control.debug.in'
--- a/control.debug.in 2009-04-23 10:41:26 +
+++ b/control.debug.in 2009-04-25 13:30:20 +
@@ -2,7 +2,7 @@
Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: openoffice.orgVER-core (= ${binary:Version} | openoffice.orgVER-gcj
(= ${binary:Version} | openoffice.orgVER-dev (= ${binary:Version} |
openoffice.orgVER-gnome (= ${binary:Version} | openoffice.orgVER-kde (=
${binary:Version} | openoffice.orgVER-calc (= ${binary:Version},
openoffice.orgVER-base-core (= ${binary:Version} | openoffice.orgVER-base (=
${binary:Version}, openoffice.orgVER-filter-binfilter (= ${binary:Version} |
openoffice.orgVER-draw (= ${binary:Version}, openoffice.orgVER-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.orgVER (= ${binary:Version},
${misc:Depends}
+Depends: openoffice.orgVER-core (= ${binary:Version}) | openoffice.orgVER-gcj
(= ${binary:Version}) | openoffice.orgVER-dev (= ${binary:Version}) |
openoffice.orgVER-gnome (= ${binary:Version}) | openoffice.orgVER-kde (=
${binary:Version}) | openoffice.orgVER-calc (= ${binary:Version}) |
openoffice.orgVER-base-core (= ${binary:Version}) | openoffice.orgVER-base (=
${binary:Version}) | openoffice.orgVER-impress (= ${binary:Version}) |
openoffice.orgVER-filter-binfilter (= ${binary:Version}) |
openoffice.orgVER-draw (= ${binary:Version}) | openoffice.orgVER-writer (=
${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (=
${binary:Version}) | mozilla-openoffice.orgVER (= ${binary:Version}),
${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
=== modified file 'control.in'
--- a/control.in2009-04-24 07:55:55 +
+++ b/control.in2009-04-25 13:30:20 +
@@ -264,7 +264,7 @@
Depends: openoffice.orgVER-style-galaxy,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
- openoffice.orgVER-style-hicontrast,
+ openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
openoffice.orgVER-style-crystal,
xfonts-mathml
=== added file 'control.kde.in'
--- a/control.kde.in1970-01-01 00:00:00 +
+++ b/control.kde.in2009-04-25 13:30:20 +
@@ -0,0 +1,39 @@
+Package: openoffice.orgVER-kde
+Architecture: %OOO_ARCHS%
+Depends: openoffice.orgVER-core (= ${binary:Version}),
+ openoffice.orgVER-style-crystal,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: konqueror,
+ kmail,
+ openoffice.orgVER-kab
+Section: kde
+Enhances: openoffice.orgVER
+Conflicts: openoffice.org2-kde (<< ${binary:Version})
+Provides: openoffice.org2-kde
+Replaces: openoffice.org2-kde (<< ${binary:Version})
+Description: full-featured office productivity suite -- KDE integration
+ OpenOffice.org is a full-featured offi
./packages/openofficeorg/3.1/experimental r1512: revert bogus reordering
revno: 1512
committer: Rene Engelhard
branch nick: experimental
timestamp: Mon 2009-04-27 08:15:17 +0200
message:
revert bogus reordering
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2009-04-27 04:56:09 +
+++ b/changelog 2009-04-27 06:15:17 +
@@ -71,6 +71,53 @@
-- Rene Engelhard Fri, 03 Apr 2009 14:35:15 +0200
+openoffice.org (1:3.0.1-9) unstable; urgency=high
+
+ [ Rene Engelhard ]
+ * debian/rules:
+- use libcurl4-gnutls-dev (closes: #521741, #391671)
+
+ [ Ben Finney ]
+ * debian/control*.in:
++ Re-work each package synopsis to avoid self-reference.
+ (Closes: Bug#520611)
+
+ -- Rene Engelhard Sun, 29 Mar 2009 23:00:35 +0200
+
+openoffice.org (1:3.0.1-8) unstable; urgency=high
+
+ [ Rene Engelhard ]
+ * ooo-build:
+- update (81a9da548b0e400b574bfe4e78b06b16982cd270), now in git
+ *without* ChangeLog...
+ * debian/rules:
+- fix saxon conditional. use internal saxon because system-saxon
+ breaks various filters
+- add arm to OOO_MOZILLA_ARCHS again as it FTBFSes on the lenny backport
+ otherwise because iceape-dev is not installed.
+- remove "openoffice" symlink, add "openoffice.org$(VER)" (closes:
#511232),
+ upstream has openoffice.org3 launcher in /usr/bin, too
+- build with java-gcj-compat on mipsel (and mips, too as IMHO it doesn't
+ make sense to build mips and mipsel with different JDKs) so that it
+ builds...
+ * debian/rules, debian/control.qa.in, debian/openoffice.org-qa-tools-*:
+- remove -qa-*, broken and unused anyway
+
+ [ Ben Finney ]
+ * debian/control*.in:
++ Replace deprecated ‘${Source-Version}’ with ‘${binary:Version}’ for
+ architecture-dependent packages.
++ Replace deprecated ‘${Source-Version}’ with ‘${source:Version}’ for
+ architecture-independent packages.
+ (Closes: Bug#520475)
++ more ${misc:Depends}
+ (Closes: Bug#519644)
++ Follow Lintian's recommendation to avoid dependency on a Debian ‘-1’
+ revision.
+ (Closes: Bug#520604)
+
+ -- Rene Engelhard Wed, 25 Mar 2009 19:20:05 +0100
+
openoffice.org (1:3.1.0~ooo310m6-1) experimental; urgency=low
* OpenOffice.org 3.1.0 development snapshot OOO310_m6
@@ -140,53 +187,6 @@
-- Rene Engelhard Wed, 18 Mar 2009 14:55:31 +0100
-openoffice.org (1:3.0.1-9) unstable; urgency=high
-
- [ Rene Engelhard ]
- * debian/rules:
-- use libcurl4-gnutls-dev (closes: #521741, #391671)
-
- [ Ben Finney ]
- * debian/control*.in:
-+ Re-work each package synopsis to avoid self-reference.
- (Closes: Bug#520611)
-
- -- Rene Engelhard Sun, 29 Mar 2009 23:00:35 +0200
-
-openoffice.org (1:3.0.1-8) unstable; urgency=high
-
- [ Rene Engelhard ]
- * ooo-build:
-- update (81a9da548b0e400b574bfe4e78b06b16982cd270), now in git
- *without* ChangeLog...
- * debian/rules:
-- fix saxon conditional. use internal saxon because system-saxon
- breaks various filters
-- add arm to OOO_MOZILLA_ARCHS again as it FTBFSes on the lenny backport
- otherwise because iceape-dev is not installed.
-- remove "openoffice" symlink, add "openoffice.org$(VER)" (closes:
#511232),
- upstream has openoffice.org3 launcher in /usr/bin, too
-- build with java-gcj-compat on mipsel (and mips, too as IMHO it doesn't
- make sense to build mips and mipsel with different JDKs) so that it
- builds...
- * debian/rules, debian/control.qa.in, debian/openoffice.org-qa-tools-*:
-- remove -qa-*, broken and unused anyway
-
- [ Ben Finney ]
- * debian/control*.in:
-+ Replace deprecated ‘${Source-Version}’ with ‘${binary:Version}’ for
- architecture-dependent packages.
-+ Replace deprecated ‘${Source-Version}’ with ‘${source:Version}’ for
- architecture-independent packages.
- (Closes: Bug#520475)
-+ more ${misc:Depends}
- (Closes: Bug#519644)
-+ Follow Lintian's recommendation to avoid dependency on a Debian ‘-1’
- revision.
- (Closes: Bug#520604)
-
- -- Rene Engelhard Wed, 25 Mar 2009 19:20:05 +0100
-
openoffice.org (1:3.0.1-7) unstable; urgency=high
* brown papaer bag release
./packages/openofficeorg/3.0.1/unstable r1466: fix typo; -11
revno: 1466 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-04-27 15:03:16 +0200 message: fix typo; -11 modified: changelog === modified file 'changelog' --- a/changelog 2009-04-24 07:55:55 + +++ b/changelog 2009-04-27 13:03:16 + @@ -1,11 +1,11 @@ -openoffice.org (1:3.0.1-11) UNRELEASED; urgency=low +openoffice.org (1:3.0.1-11) unstable; urgency=low [ Rene Engelhard ] * ooo-build -- update (142ca02d3bfd7bb2ce4574348a499d1568dfb449) +- update (7d3c81a7279d859007b8f91cf9e69775e9f5a7ef) * debian/control.in, debian/control.kde.in, debian/rules: -- disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve +- disable -kde and -kab as they're for KDE3 (closes: #523899). Improve BUILD_KDE conditional * debian/control.in, debian/broffice.org.postrm.in, debian/rules: - Standards-Version: 3.8.1. Fix DEB_BUILD_OPTIONS lang= parsing to actually @@ -24,7 +24,7 @@ + Remove obsolete references to old FSF address. (partial resolution for Bug#525364) - -- Rene Engelhard Wed, 15 Apr 2009 21:02:53 +0200 + -- Rene Engelhard Sat, 25 Apr 2009 15:31:49 +0200 openoffice.org (1:3.0.1-10) unstable; urgency=low
./packages/openofficeorg/3.1/experimental r1513: merge
revno: 1513 committer: Rene Engelhard branch nick: experimental timestamp: Mon 2009-04-27 15:34:49 +0200 message: merge modified: changelog revno: 1332.3.1 committer: Ben Finney branch nick: debian.devel timestamp: Tue 2009-03-24 15:26:41 +1100 message: Re-work each package synopsis to avoid self-reference. modified: changelog control.debug.in control.fonts.in control.gcj.in control.help.in control.in control.lang.in control.mediawiki.in control.minimizer.in control.mono.in control.mozilla.in control.ogltrans.in control.pdfimport.in control.postgresql.in control.presenter.in control.reportdesign.in control.sdk.in control.ure.in revno: 1332.3.2 committer: Ben Finney branch nick: descriptive-synopsis timestamp: Tue 2009-03-24 19:20:32 +1100 message: Refine package synopses with feedback from Rene. modified: control.in control.mono.in control.ure.in revno: 1332.3.3 committer: Ben Finney branch nick: copyright-reference timestamp: Thu 2009-04-23 20:43:05 +1000 message: Merge from ‘thread:descriptive-synopsis’. modified: broffice.org.postrm.in changelog control control.debug.in control.fonts.in control.in control.lang.in control.mono.in control.reportdesign.in control.sdk.in control.ure.in rules shell-lib.sh revno: 1332.4.1 committer: Ben Finney branch nick: descriptive-synopsis timestamp: Thu 2009-04-23 20:41:26 +1000 message: Merge from ‘thread:unstable’. modified: broffice.org.postrm.in changelog control control.debug.in control.fonts.in control.in control.lang.in control.mono.in control.reportdesign.in control.sdk.in control.ure.in rules shell-lib.sh revno: 1332.3.4 committer: Ben Finney branch nick: copyright-reference timestamp: Thu 2009-04-23 20:48:24 +1000 message: Remove obsolete reference to old FSF address. modified: changelog copyright revno: 1332.3.5 committer: Ben Finney branch nick: copyright-reference timestamp: Fri 2009-04-24 10:11:09 +1000 message: debian/copyright: Remove references to old FSF address. modified: changelog copyright revno: 1332.1.132 committer: Rene Engelhard branch nick: unstable timestamp: Fri 2009-04-24 09:55:55 +0200 message: Remove obsolete references to old FSF address. (Ben Finney) modified: changelog copyright revno: 1332.1.133 committer: Rene Engelhard branch nick: unstable timestamp: Sat 2009-04-25 15:30:20 +0200 message: hrm, fix BUILD_KDE setting again, add missed control.kde.in, regenerate control, remove missing , added: control.kde.in modified: control control.debug.in control.in rules revno: 1332.1.134 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-04-27 15:03:16 +0200 message: fix typo; -11 modified: changelog === modified file 'changelog' --- a/changelog 2009-04-27 06:15:17 + +++ b/changelog 2009-04-27 13:34:49 + @@ -7,7 +7,7 @@ (closes: #523314) * debian/control.in, debian/control.kde.in, debian/rules: -- disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve +- disable -kde and -kab as they're for KDE3 (closes: #523899). Improve BUILD_KDE conditional * debian/control.in, debian/broffice.org.postrm.in, debian/rules: - Standards-Version: 3.8.1. Fix DEB_BUILD_OPTIONS lang= parsing to actually
Bug#525633: openoffice.org: Edit menu get too wide and cannot fit to screen
tag 525633 + unreproducible tag 525633 + moreinfo thanks Hi, Márton Németh wrote: > The Edit menu gets too wide and it cannot fit on the screen after cutting a > bigger amount of text with line breaks (Shift+Enter) in it instead of > paragraph > break (Enter). > > Steps to reproduce: > 1. Open the attached document > 2. Select all text with Ctrl+A > 3. Cut the text to the clipboard with Ctrl+X > 4. Open the Edit menu > > Actual result: only the keyboard shortcuts are visible, the menu names are not Actually, no, it looks sane: See http://zyklop.dyndns.org/~rene/525633.png > Expected result: the undo history should not show so much text that it > causes the Edit menu to be unreadable.. It doesn't. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#489457: experimental does not solve stable
Hi, Con Kolivas wrote: > Wait. I don't understand how suggesting installing a package from the > experimental packages is meant to be a solution for the stable I didn't. The only thing I did was just to mark it as fixed in the 3.0 packages. If you look at the version graph (I fixed the version info right now) you see it'll still appear as not fixed for stable. > release. I have this same problem on 3 standard lenny installations on a) This bugs is closed with 3.0.0-1, which is not in experimental anymore, but followers of it are even in *testing* b) bugs get closed when the fixed package appears. It doesn't say that this is fixed in stable but says that it's fixed in the version it was closed with. It will still appear open for stable. c) it's not a (release-)critical bug, so I fear I will never get the approval to fix it in stable - expecially since we don't have a patch but just know that it works in 3.0. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#489457: notfixed 489457 in 3.0.0.1, closing 489457
# Automatically generated email from bts, devscripts version 2.10.35lenny3 notfixed 489457 3.0.0.1 # correct version close 489457 1:3.0.0-1 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#522022: ERROR: python-loader:: No module named pythonloader
Hi, Raphael Hertzog wrote: > So the problem only happens during upgrades. If python-uno is unpacked but > not configured, it will not work, you can easily reproduce the problem > by doing this: > rhert...@rivendell:~$ sudo dpkg --unpack > /var/cache/apt/archives/python-uno_1%3a3.0.1-11_i386.deb > (Lecture de la base de données... 235909 fichiers et répertoires déjà > installés.) > Préparation du remplacement de python-uno 1:3.0.1-11 (en utilisant > .../python-uno_1%3a3.0.1-11_i386.deb) ... > Dépaquetage de la mise à jour de python-uno ... > rhert...@rivendell:~$ sudo dpkg --unpack > /var/cache/apt/archives/openoffice.org-emailmerge_1%3a3.0.1-11_all.deb > (Lecture de la base de données... 235909 fichiers et répertoires déjà > installés.) > Préparation du remplacement de openoffice.org-emailmerge 1:3.0.1-11 (en > utilisant .../openoffice.org-emailmerge_1%3a3.0.1-11_all.deb) ... > Removing extension org.openoffice.legacy.mailmerge.py... > ERROR: python-loader:: No module named > pythonloader, traceback follows > no traceback available > > unopkg failed. > done. > Dépaquetage de la mise à jour de openoffice.org-emailmerge ... > > Either you pre-depend on python-uno or you ensure that python-uno is > functional when simply unpacked (and not configured). Or you stop removing Tell that our beloved new python policy guys with pycentral/pysupport, please. Where the stuff is only there after the packages' postinst ran. > the extension in the preinst and do everything in the postinst. No, it has to be removed in the preinst, because the postinst registers the *new* one, and the old one should be gone before the new one gets installed. Otherwise you might get interesting effects.. Looks like I need a Pre-Depends: on python-uno. sigh. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Bug#489457: experimental does not solve stable
Hi, Con Kolivas wrote: > Thanks for explaining that. That's a massive disappointment because it's an > absolute showstopper for oo.o and Japanese word processing. Furthermore, it's > purely a debian bug because the oo.o packages don't have this issue, only the > debian ones. I guess I have no choice but to break package management and > start installing random crap again. You don't need to; backports.org has a 3.0.1(!) backported for lenny. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#522022: ERROR: python-loader:: No module named pythonloader
Hi, Josselin Mouette wrote: > > Looks like I need a Pre-Depends: on python-uno. sigh. > > You need a Pre-Depends on whatever is used in the preinst. This is why > it is strongly discouraged to do anything funky in the preinst. If you > have stuff to deconfigure during upgrades, you need to do it, if > possible, in the prerm of the old package. "If possible" is the key here, I don't really feel good removing the extension and *then* deregister the extension, what I currently do is: - deregister in prerm - register in postinst - deregister in preinst on updates, then of course followed by the postinsts registration In this specific case this is even more interesting, since mailmerge.py normall is not an extension... Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/experimental r1514: typo
revno: 1514 committer: Rene Engelhard branch nick: experimental timestamp: Wed 2009-04-29 00:10:17 +0200 message: typo modified: rules === modified file 'rules' --- a/rules 2009-04-27 13:34:49 + +++ b/rules 2009-04-28 22:10:17 + @@ -492,7 +492,7 @@ endif ifeq "$(USE_PYSUPPORT)" "y" ifeq "$(PYMAJOR).$(PYMINOR)" "2.6" - BUILD_DEÜS += , python-support (>= 0.90.4) + BUILD_DEPS += , python-support (>= 0.90.4) else BUILD_DEPS += , python-support endif
Bug#526062: Openoffice.org 3 menu fonts 1 size larger than other GTK apps
found 526062 1:3.0.1-9 severity 526062 minor retitle 526062 Openoffice.org menu fonts 1 size larger than other GTK apps thanks Christopher David Desjardins wrote: > Package: openoffice.org-gtk > Version: 1:3.0.1-11 please specify a (correct) severity. normal is too high for this, if at all, "minor" applies for this. I am always astonished what people file bugs for... ;) > When I set my fonts in xfce4 settings manager, the menu fonts in Oh, XFCE. You know that XFCE just works by chance and this integration thing is intended for GNOME? That said, happens for me in GNOME too afais (iceweasel + OOo): http://zyklop.dyndns.org/~rene/526062.png Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/experimental r1515: override bogus missing-build-dependency-for-dh_-command dh_pysupport=python-support from lintian
revno: 1515 committer: Rene Engelhard branch nick: experimental timestamp: Wed 2009-04-29 00:39:08 +0200 message: override bogus missing-build-dependency-for-dh_-command dh_pysupport=python-support from lintian modified: source.lintian-overrides === modified file 'source.lintian-overrides' --- a/source.lintian-overrides 2009-01-15 06:42:02 + +++ b/source.lintian-overrides 2009-04-28 22:39:08 + @@ -1,1 +1,2 @@ openoffice.org source: missing-build-dependency-for-dh_-command dh_clideps=cli-common-dev +openoffice.org source: missing-build-dependency-for-dh_-command dh_pysupport=python-support
./packages/openofficeorg/3.1/experimental r1516: release rc2-1
revno: 1516 committer: Rene Engelhard branch nick: experimental timestamp: Thu 2009-04-30 00:54:52 +0200 message: release rc2-1 modified: changelog === modified file 'changelog' --- a/changelog 2009-04-27 13:34:49 + +++ b/changelog 2009-04-29 22:54:52 + @@ -1,4 +1,4 @@ -openoffice.org (1:3.1.0~rc2-1) UNRELEASED; urgency=low +openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low * OpenOffice.org 3.1.0 rc2 (OOO310_m11) * ooo-build @@ -28,7 +28,7 @@ * debian/control.in: - make openoffice.org-common recommends xfonts-mathml (closes: #525245) - -- Rene Engelhard Fri, 24 Apr 2009 23:51:06 +0200 + -- Rene Engelhard Sat, 25 Apr 2009 15:26:24 +0200 openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low
./packages/openofficeorg/3.0.1/unstable r1467: * debian/rules:
revno: 1467 committer: Rene Engelhard branch nick: unstable timestamp: Thu 2009-04-30 01:04:11 +0200 message: * debian/rules: - move python version setting before the python conditionals deciding whether to apply Python26 patchset or not, thanks Chris Cheney modified: changelog rules === modified file 'changelog' --- a/changelog 2009-04-27 13:03:16 + +++ b/changelog 2009-04-29 23:04:11 + @@ -1,3 +1,11 @@ +openoffice.org (1:3.0.1-12) UNRELEASED; urgency=low + + * debian/rules: +- move python version setting before the python conditionals deciding + whether to apply Python26 patchset or not, thanks Chris Cheney + + -- Rene Engelhard Thu, 30 Apr 2009 01:02:53 +0200 + openoffice.org (1:3.0.1-11) unstable; urgency=low [ Rene Engelhard ] === modified file 'rules' --- a/rules 2009-04-25 13:30:20 + +++ b/rules 2009-04-29 23:04:11 + @@ -455,6 +455,12 @@ ARCH_FLAGS += -O0 endif +# Build python depends from current python version +PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]") +PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]") +PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1") +PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())') + ifeq "$(BUILD_PYUNO)" "y" ifeq "$(USE_PYCENTRAL)" "y" BUILD_DEPS += , python-central (>= 0.5) @@ -951,12 +957,6 @@ # breaks. At least with 2 # CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS) -# Build python depends from current python version -PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]") -PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]") -PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1") -PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())') - CURDIR ?= $(shell pwd) ifeq ($(GCC_VERSION),)
./packages/openofficeorg/3.1/experimental r1517: * debian/rules:
revno: 1517 committer: Rene Engelhard branch nick: experimental timestamp: Thu 2009-04-30 01:06:41 +0200 message: * debian/rules: - move python version setting before the python conditionals deciding thanks Chris Cheney modified: changelog rules revno: 1332.1.135 committer: Rene Engelhard branch nick: unstable timestamp: Thu 2009-04-30 01:04:11 +0200 message: * debian/rules: - move python version setting before the python conditionals deciding whether to apply Python26 patchset or not, thanks Chris Cheney modified: changelog rules === modified file 'changelog' --- a/changelog 2009-04-29 22:54:52 + +++ b/changelog 2009-04-29 23:06:41 + @@ -1,3 +1,11 @@ +openoffice.org (1:3.1.0~rc2-2) UNRELEASED; urgency=low + + * debian/rules: +- move python version setting before the python conditionals deciding + thanks Chris Cheney + + -- Rene Engelhard Thu, 30 Apr 2009 01:02:53 +0200 + openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low * OpenOffice.org 3.1.0 rc2 (OOO310_m11) === modified file 'rules' --- a/rules 2009-04-28 22:10:17 + +++ b/rules 2009-04-29 23:06:41 + @@ -486,6 +486,12 @@ ARCH_FLAGS += -O0 endif +# Build python depends from current python version +PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]") +PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]") +PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1") +PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())') + ifeq "$(BUILD_PYUNO)" "y" ifeq "$(USE_PYCENTRAL)" "y" BUILD_DEPS += , python-central (>= 0.5) @@ -975,12 +981,6 @@ # breaks. At least with 2 # CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS) -# Build python depends from current python version -PYMAJOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]") -PYMINOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]") -PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]+1") -PYTHON_SITE:=debian/python-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())') - CURDIR ?= $(shell pwd) ifeq ($(GCC_VERSION),)
Bug#526292: openoffice.org: removal of java-gcj-compat
Hi, Matthias Klose wrote: > This package has a versioned dependency or build dependency on > java-gcj-compat*. The java-gcj-compat* packages will be removed > soonish, and provided by gcj-jre-headless, gcj-jre and gcj-jdk as > currently found in experimental. So the change would be to change the java-gcj-compat-dev to jdk-jdk. > Please change the dependencies/build dependencies to depend on > default-jre-headless, default-jre, default-jdk or default-jdk-builddep > instead. default-jdk-builddep should be used if the package builds > native code built with gcj. No, I think using default-jdk[-builddep] is broken (expecially as it currently uses gcj anyway, and on all archs except ia64/mips* I use OpenJDK) > Please usr /usr/lib/jvm/default-java instead of /usr/lib/jvm/java-gcj > for the packaging. No. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/experimental r1518: fix odk build breakage on archs building with gcj
revno: 1518 committer: Rene Engelhard branch nick: experimental timestamp: Mon 2009-05-04 09:50:47 +0200 message: fix odk build breakage on archs building with gcj modified: changelog control rules === modified file 'changelog' --- a/changelog 2009-04-29 23:06:41 + +++ b/changelog 2009-05-04 07:50:47 + @@ -1,8 +1,13 @@ openoffice.org (1:3.1.0~rc2-2) UNRELEASED; urgency=low + * ooo-build: +- update (a4a83b6ca4e29322a18e07adc73219091eee1704) + - forces OpenJDK javadoc even on gcj builds, fixes odk build breakage + * debian/rules: - move python version setting before the python conditionals deciding - thanks Chris Cheney + thanks Chris Cheney) +- remove arch specifier from openjdk build-dep -- Rene Engelhard Thu, 30 Apr 2009 01:02:53 +0200 === modified file 'control' --- a/control 2009-04-27 13:34:49 + +++ b/control 2009-05-04 07:50:47 + @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team Uploaders: Chris Halls , Rene Engelhard -Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), 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, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , 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 [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i3
Bug#526292: openoffice.org: removal of java-gcj-compat
Hi,
Rene Engelhard wrote:
> > This package has a versioned dependency or build dependency on
> > java-gcj-compat*. The java-gcj-compat* packages will be removed
> > soonish, and provided by gcj-jre-headless, gcj-jre and gcj-jdk as
> > currently found in experimental.
But not completely.
Where's e.g. aot-compile?
It's in java-gcj-compat-dev now:
$ dpkg -S `which aot-compile`
java-gcj-compat-dev: /usr/bin/aot-compile
It's in neither of those three packages - and (afais) in neither of
it's dependencies (gcj-X.Y-{jre,jdk,jre-headless}).
Or do you want every package building -gcj packages do be instantly
buggy because they a) build-depend on a not-existant package and
b) worse, force them to drop all -gcj packages?
If b), please state that clearly.
Grüße/Regards,
René
--
.''`. René Engelhard -- Debian GNU/Linux Developer
: :' : http://www.debian.org | http://people.debian.org/~rene/
`. `' r...@debian.org | GnuPG-Key ID: 248AEB73
`- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#526292: openoffice.org: removal of java-gcj-compat
Hi,
Rene Engelhard wrote:
> Where's e.g. aot-compile?
> It's in java-gcj-compat-dev now:
>
> $ dpkg -S `which aot-compile`
> java-gcj-compat-dev: /usr/bin/aot-compile
>
> It's in neither of those three packages - and (afais) in neither of
> it's dependencies (gcj-X.Y-{jre,jdk,jre-headless}).
Ah, libgcj-common.
Now to find out how to best adapt rules to still work on lenny and
the sid-when-this-will-be-uploaded.
Will do the fix when this has happened, as the 3.1.0 in experimental
is targetted to sid when it's released and tha still has
java-gcj-compat[-dev] right now.
Grüße/Regards,
René
--
.''`. René Engelhard -- Debian GNU/Linux Developer
: :' : http://www.debian.org | http://people.debian.org/~rene/
`. `' r...@debian.org | GnuPG-Key ID: 248AEB73
`- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/experimental r1519: merge
revno: 1519 committer: Rene Engelhard branch nick: experimental timestamp: Mon 2009-05-04 15:28:39 +0200 message: merge modified: changelog watch revno: 1332.1.136 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-05-04 15:25:21 +0200 message: * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de modified: changelog watch === modified file 'changelog' --- a/changelog 2009-05-04 07:50:47 + +++ b/changelog 2009-05-04 13:28:39 + @@ -8,6 +8,8 @@ - move python version setting before the python conditionals deciding thanks Chris Cheney) - remove arch specifier from openjdk build-dep + * debian/watch: move from ftp.stardiv.de (not master anymore) to +ftp.gwdg.de -- Rene Engelhard Thu, 30 Apr 2009 01:02:53 +0200 === modified file 'watch' --- a/watch 2007-09-11 18:35:28 + +++ b/watch 2009-05-04 13:25:21 + @@ -1,2 +1,2 @@ version=3 -opts=dversionmangle=s/\.dfsg\.\d+$// http://ftp.stardiv.de/pub/OpenOffice.org/stable/(\d.\d.\d)/OOo_(\d.\d.\d)_src_core\.tar\.bz2 +opts=dversionmangle=s/\.dfsg\.\d+$// http://ftp.gwdg.de/pub/openoffice/stable/(\d.\d.\d)/OOo_(\d.\d.\d)_src_core\.tar\.bz2
./packages/openofficeorg/3.0.1/unstable r1469: merge
revno: 1469 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-05-04 17:05:30 +0200 message: merge modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-04 13:25:21 + +++ b/changelog 2009-05-04 15:05:30 + @@ -3,6 +3,8 @@ * debian/rules: - move python version setting before the python conditionals deciding whether to apply Python26 patchset or not, thanks Chris Cheney +- fix GCC_VERSION handling to work again with OOo build calling + e.g. i486-linux-gnu-gcc * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de === modified file 'rules' --- a/rules 2009-04-29 23:04:11 + +++ b/rules 2009-05-04 15:05:30 + @@ -364,7 +364,10 @@ ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu" # use 32-bit compiler CC_PREFIX=sparc-linux-gnu- +else + CC_PREFIX=$(gcc -dumpmachine)- endif + ifeq (s390,$(findstring s390,$(OOO_ARCHS))) BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] endif @@ -1447,6 +1450,8 @@ mkdir -p $(CURDIR)/debian/usr/bin ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++ + ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)gcc + ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)g++ #ln -sf /usr/bin/$(CC_PREFIX)gcj-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcj #ln -sf /usr/bin/gij-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gij else
./packages/openofficeorg/3.1/experimental r1520: - fix GCC_VERSION handling to work again with OOo build calling
revno: 1520 committer: Rene Engelhard branch nick: experimental timestamp: Mon 2009-05-04 17:00:11 +0200 message: - fix GCC_VERSION handling to work again with OOo build calling e.g. i486-linux-gnu-gcc modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-04 13:28:39 + +++ b/changelog 2009-05-04 15:00:11 + @@ -8,6 +8,8 @@ - move python version setting before the python conditionals deciding thanks Chris Cheney) - remove arch specifier from openjdk build-dep +- fix GCC_VERSION handling to work again with OOo build calling + e.g. i486-linux-gnu-gcc * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de === modified file 'rules' --- a/rules 2009-05-04 07:50:47 + +++ b/rules 2009-05-04 15:00:11 + @@ -387,7 +387,10 @@ ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu" # use 32-bit compiler CC_PREFIX=sparc-linux-gnu- +else + CC_PREFIX=$(gcc -dumpmachine)- endif + ifeq (s390,$(findstring s390,$(OOO_ARCHS))) BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] endif @@ -1464,6 +1467,8 @@ mkdir -p $(CURDIR)/debian/usr/bin ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++ + ln -sf /usr/bin/$(CC_PREFIX)gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)gcc + ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/$(CC_PREFIX)g++ #ln -sf /usr/bin/$(CC_PREFIX)gcj-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcj #ln -sf /usr/bin/gij-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gij else
./packages/openofficeorg/3.0.1/unstable r1468: * debian/watch: move from ftp.stardiv.de (not master anymore) to
revno: 1468 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-05-04 15:25:21 +0200 message: * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de modified: changelog watch === modified file 'changelog' --- a/changelog 2009-04-29 23:04:11 + +++ b/changelog 2009-05-04 13:25:21 + @@ -3,6 +3,8 @@ * debian/rules: - move python version setting before the python conditionals deciding whether to apply Python26 patchset or not, thanks Chris Cheney + * debian/watch: move from ftp.stardiv.de (not master anymore) to +ftp.gwdg.de -- Rene Engelhard Thu, 30 Apr 2009 01:02:53 +0200 === modified file 'watch' --- a/watch 2007-09-11 18:35:28 + +++ b/watch 2009-05-04 13:25:21 + @@ -1,2 +1,2 @@ version=3 -opts=dversionmangle=s/\.dfsg\.\d+$// http://ftp.stardiv.de/pub/OpenOffice.org/stable/(\d.\d.\d)/OOo_(\d.\d.\d)_src_core\.tar\.bz2 +opts=dversionmangle=s/\.dfsg\.\d+$// http://ftp.gwdg.de/pub/openoffice/stable/(\d.\d.\d)/OOo_(\d.\d.\d)_src_core\.tar\.bz2
./packages/openofficeorg/3.1/experimental r1521: rc2 == final; use Suns tarballs
revno: 1521 committer: Rene Engelhard branch nick: debian timestamp: Mon 2009-05-04 22:43:27 +0200 message: rc2 == final; use Suns tarballs modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-04 15:00:11 + +++ b/changelog 2009-05-04 20:43:27 + @@ -1,7 +1,10 @@ -openoffice.org (1:3.1.0~rc2-2) UNRELEASED; urgency=low +openoffice.org (1:3.1.0-1) UNRELEASED; urgency=low + + * OpenOffice.org 3.1.0 final (no source changes to rc2) + * upload to unstable * ooo-build: -- update (a4a83b6ca4e29322a18e07adc73219091eee1704) +- update (05aab24c38a4f4ffe2649d116edc90c768aebab3) - forces OpenJDK javadoc even on gcj builds, fixes odk build breakage * debian/rules: === modified file 'rules' --- a/rules 2009-05-04 15:00:11 + +++ b/rules 2009-05-04 20:43:27 + @@ -64,8 +64,8 @@ MWS=OOO310 #MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//) MILESTONE=m11 -TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) -#TAG=$(MWS)_$(MILESTONE) +#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) +TAG=$(MWS)_$(MILESTONE) #OOO_BUILD_BRANCH=ooo-build-3-1 SOURCE_TREE=ooo-build/build/$(TAG) STAMP_DIR=debian/stampdir @@ -210,7 +210,7 @@ endif # "new" source split? This is to be n when to use # Suns tarballs. -WITH_SPLIT=y +WITH_SPLIT=n ENABLE_GRAPHITE=n USE_SYSTEM_GRAPHITE=y ALLOC=system
./packages/openofficeorg/3.1/experimental r1522: update ooo-build with DataAccess.xcu setting JDBC paths, remove changing jvmfwk3rc from rules and suggest libjtds-java, too
revno: 1522
committer: Rene Engelhard
branch nick: debian
timestamp: Tue 2009-05-05 00:56:55 +0200
message:
update ooo-build with DataAccess.xcu setting JDBC paths, remove changing
jvmfwk3rc from rules and suggest libjtds-java, too
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-05-04 20:43:27 +
+++ b/changelog 2009-05-04 22:56:55 +
@@ -4,8 +4,10 @@
* upload to unstable
* ooo-build:
-- update (05aab24c38a4f4ffe2649d116edc90c768aebab3)
+- update (190e433673712d33ce0d44c07ac519cd0d618fa1)
- forces OpenJDK javadoc even on gcj builds, fixes odk build breakage
+ - use 3.1s new feature of setting JDBC CLASSPATHs in DataAcess.xcu
+directly
* debian/rules:
- move python version setting before the python conditionals deciding
@@ -13,10 +15,13 @@
- remove arch specifier from openjdk build-dep
- fix GCC_VERSION handling to work again with OOo build calling
e.g. i486-linux-gnu-gcc
+- remove changing jvmfwk3rc for adding JDBC CLASSPATHs
* debian/watch: move from ftp.stardiv.de (not master anymore) to
ftp.gwdg.de
+ * debian/control.in:
+- also suggest libjtds-java
- -- Rene Engelhard Thu, 30 Apr 2009 01:02:53 +0200
+ -- Rene Engelhard Tue, 05 May 2009 00:54:48 +0200
openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low
=== modified file 'control.in'
--- a/control.in2009-04-27 13:34:49 +
+++ b/control.in2009-05-04 22:56:55 +
@@ -455,7 +455,7 @@
${misc:Depends}
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
- libmysql-java | libpg-java,
+ libmysql-java | libpg-java | libjtds-java,
openoffice.orgVER-gcj,
openoffice.orgVER-report-builder
Replaces: openoffice.orgVER-core (<< 2.0.1),
@@ -491,10 +491,11 @@
- SQLite
- MS SQL / Sybase SQL
- *.mdb (JET / MS Access)
- * libmysql-java | libpg-java: JDBC Drivers
+ * libmysql-java | libpg-java | libjtds-java: JDBC Drivers
for:
- MySQL
- PostgreSQL
+- MS SQL Server and Sybase
Package: openoffice.orgVER-style-crystal
Architecture: all
=== modified file 'rules'
--- a/rules 2009-05-04 20:43:27 +
+++ b/rules 2009-05-04 22:56:55 +
@@ -1945,12 +1945,6 @@
ln -sf /$(OOUREDIR)/lib/`basename $$i`
debian/uno-libs3/usr/lib/`basename $$i`; \
done
- # add MySQL and PostgreSQL JDBC drivers to OOos CLASSPATH
- sed -i -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/mysql.jar|' \
- -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/sapdbc.jar|' \
- -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/postgresql.jar|' \
- debian/ure/$(OOUREDIR)/lib/jvmfwk3rc
-
ifeq "$(BUILD_KDE)" "y"
mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-kde/$(OOBRANDDIR)/program
./packages/openofficeorg/3.1/experimental r1523: regenerate control
revno: 1523
committer: Rene Engelhard
branch nick: debian
timestamp: Tue 2009-05-05 00:57:46 +0200
message:
regenerate control
modified:
control
=== modified file 'control'
--- a/control 2009-05-04 07:50:47 +
+++ b/control 2009-05-04 22:57:46 +
@@ -221,7 +221,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Section: database
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends},
${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
-Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java, openoffice.org-gcj,
openoffice.org-report-builder
+Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libjtds-java, openoffice.org-gcj,
openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<<
1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-base (<< ${binary:Version}), openoffice.org-java,
openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (=
1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1),
openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (=
2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<<
${binary:Version}), openoffice.org-common (= 2.0.4-4)
Provides: openoffice.org2-base
@@ -242,10 +242,11 @@
- SQLite
- MS SQL / Sybase SQL
- *.mdb (JET / MS Access)
- * libmysql-java | libpg-java: JDBC Drivers
+ * libmysql-java | libpg-java | libjtds-java: JDBC Drivers
for:
- MySQL
- PostgreSQL
+- MS SQL Server and Sybase
Package: openoffice.org-style-crystal
Architecture: all
./packages/openofficeorg/3.1/experimental r1524: merge
revno: 1524 committer: Rene Engelhard branch nick: experimental timestamp: Tue 2009-05-05 01:32:39 +0200 message: merge modified: changelog rules revno: 1332.1.137 committer: Rene Engelhard branch nick: unstable timestamp: Mon 2009-05-04 17:05:30 +0200 message: merge modified: changelog rules revno: 1332.1.138 committer: Rene Engelhard branch nick: unstable timestamp: Tue 2009-05-05 01:30:17 +0200 message: - keep -kde/-kab enabled on lenny-backports modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-04 22:56:55 + +++ b/changelog 2009-05-04 23:32:39 + @@ -16,6 +16,7 @@ - fix GCC_VERSION handling to work again with OOo build calling e.g. i486-linux-gnu-gcc - remove changing jvmfwk3rc for adding JDBC CLASSPATHs +- keep -kde/-kab enabled on lenny-backports * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de * debian/control.in: === modified file 'rules' --- a/rules 2009-05-04 22:56:55 + +++ b/rules 2009-05-04 23:32:39 + @@ -281,6 +281,7 @@ LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10) SUITESPARSE_MIN_VERSION= (>= 3.1.0) USE_SYSTEM_JFREEREPORT=n + BUILD_KDE=y endif #
./packages/openofficeorg/3.0.1/unstable r1470: - keep -kde/-kab enabled on lenny-backports
revno: 1470 committer: Rene Engelhard branch nick: unstable timestamp: Tue 2009-05-05 01:30:17 +0200 message: - keep -kde/-kab enabled on lenny-backports modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-04 15:05:30 + +++ b/changelog 2009-05-04 23:30:17 + @@ -5,6 +5,7 @@ whether to apply Python26 patchset or not, thanks Chris Cheney - fix GCC_VERSION handling to work again with OOo build calling e.g. i486-linux-gnu-gcc +- keep -kde/-kab enabled on lenny-backports * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de === modified file 'rules' --- a/rules 2009-05-04 15:05:30 + +++ b/rules 2009-05-04 23:30:17 + @@ -262,6 +262,7 @@ BOOST_VERSION=1.34 LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10) SUITESPARSE_MIN_VERSION= (>= 3.1.0) + BUILD_KDE=y endif #
./packages/openofficeorg/3.0.1/unstable r1471: - build with -openssl flavour of curl on lenny-backports
revno: 1471 committer: Rene Engelhard branch nick: unstable timestamp: Tue 2009-05-05 01:56:45 +0200 message: - build with -openssl flavour of curl on lenny-backports modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-04 23:30:17 + +++ b/changelog 2009-05-04 23:56:45 + @@ -6,10 +6,11 @@ - fix GCC_VERSION handling to work again with OOo build calling e.g. i486-linux-gnu-gcc - keep -kde/-kab enabled on lenny-backports +- build with -openssl flavour of curl on lenny-backports * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de - -- Rene Engelhard Thu, 30 Apr 2009 01:02:53 +0200 + -- Rene Engelhard Tue, 05 May 2009 01:54:54 +0200 openoffice.org (1:3.0.1-11) unstable; urgency=low === modified file 'rules' --- a/rules 2009-05-04 23:30:17 + +++ b/rules 2009-05-04 23:56:45 + @@ -169,6 +169,7 @@ RUN_API_TESTS=n RUN_UNIT_TESTS=n USE_LIBCURL4=y +CURL_SECTYPE=gnutls USE_SYSTEM_DMAKE=y USE_LIBSUITESPARSE=y SUITESPARSE_MIN_VERSION= (>= 1:3.2.0-2) @@ -263,6 +264,7 @@ LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10) SUITESPARSE_MIN_VERSION= (>= 3.1.0) BUILD_KDE=y + CURL_SECTYPE=openssl endif # @@ -418,9 +420,9 @@ endif ifeq "$(USE_LIBCURL4)" "y" - BUILD_DEPS += , libcurl4-gnutls-dev + BUILD_DEPS += , libcurl4-$(CURL_SECTYPE)-dev else - BUILD_DEPS += , libcurl3-gnutls-dev + BUILD_DEPS += , libcurl3-$(CURL_SECTYPE)-dev endif ifeq "$(SYSTEM_OPENSSL)" "y"
./packages/openofficeorg/3.1/experimental r1525: merge
revno: 1525 committer: Rene Engelhard branch nick: experimental timestamp: Tue 2009-05-05 02:00:09 +0200 message: merge modified: changelog rules revno: 1332.1.139 committer: Rene Engelhard branch nick: unstable timestamp: Tue 2009-05-05 01:56:45 +0200 message: - build with -openssl flavour of curl on lenny-backports modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-04 23:32:39 + +++ b/changelog 2009-05-05 00:00:09 + @@ -17,6 +17,7 @@ e.g. i486-linux-gnu-gcc - remove changing jvmfwk3rc for adding JDBC CLASSPATHs - keep -kde/-kab enabled on lenny-backports +- build with -openssl flavour of curl on lenny-backports * debian/watch: move from ftp.stardiv.de (not master anymore) to ftp.gwdg.de * debian/control.in: === modified file 'rules' --- a/rules 2009-05-04 23:32:39 + +++ b/rules 2009-05-05 00:00:09 + @@ -177,6 +177,7 @@ RUN_API_TESTS=n RUN_UNIT_TESTS=n USE_LIBCURL4=y +CURL_SECTYPE=gnutls USE_SYSTEM_DMAKE=y USE_LIBSUITESPARSE=y SUITESPARSE_MIN_VERSION= (>= 1:3.2.0-2) @@ -282,6 +283,7 @@ SUITESPARSE_MIN_VERSION= (>= 3.1.0) USE_SYSTEM_JFREEREPORT=n BUILD_KDE=y + CURL_SECTYPE=openssl endif # @@ -449,9 +451,9 @@ endif ifeq "$(USE_LIBCURL4)" "y" - BUILD_DEPS += , libcurl4-gnutls-dev + BUILD_DEPS += , libcurl4-$(CURL_SECTYPE)-dev else - BUILD_DEPS += , libcurl3-gnutls-dev + BUILD_DEPS += , libcurl3-$(CURL_SECTYPE)-dev endif ifeq "$(SYSTEM_OPENSSL)" "y"
./packages/openofficeorg/3.1/experimental r1526: update depends/conflicts to match description.xml
revno: 1526
committer: Rene Engelhard
branch nick: experimental
timestamp: Tue 2009-05-05 02:35:14 +0200
message:
update depends/conflicts to match description.xml
modified:
changelog
control
control.presenter.in
control.reportdesign.in
=== modified file 'changelog'
--- a/changelog 2009-05-05 00:00:09 +
+++ b/changelog 2009-05-05 00:35:14 +
@@ -22,8 +22,10 @@
ftp.gwdg.de
* debian/control.in:
- also suggest libjtds-java
+ * debian/control.reportdesign.in, control.presenter.in:
+- update depends/conflicts to match description.xml
- -- Rene Engelhard Tue, 05 May 2009 00:54:48 +0200
+ -- Rene Engelhard Tue, 05 May 2009 02:32:48 +0200
openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-05-04 22:57:46 +
+++ b/control 2009-05-05 00:35:14 +
@@ -3295,8 +3295,8 @@
Package: openoffice.org-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>=
${base-version}), openoffice.org-java-common (>= ${base-version}),
${java-runtime-depends}, ${misc:Depends}
-Conflicts: openoffice.org-reportdesigner, openoffice.org-report-builder-bin
(>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>=
1:3.1.0~), openoffice.org-java-common (>= ${base-version}),
${java-runtime-depends}, ${misc:Depends}
+Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>=
${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
Enhances: openoffice.org-base
@@ -3349,7 +3349,7 @@
Conflicts: openoffice.org-presenter-screen
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
-Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6),
openoffice.org-impress (>= 1:3.0.0~bea300~dev300m6), ${misc:Depends}
+Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.1.0~),
openoffice.org-impress (>= 1:3.1.0~), ${misc:Depends}
Enhances: openoffice.org-impress
Description: OpenOffice.org Impress extension for a separate presenter's
console
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2009-04-27 13:34:49 +
+++ b/control.presenter.in 2009-05-05 00:35:14 +
@@ -5,7 +5,7 @@
Conflicts: openoffice.orgVER-presenter-screen
Provides: openoffice.orgVER-presenter-screen
Replaces: openoffice.orgVER-presenter-screen
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>=
1:3.0.0~bea300~dev300m6), openoffice.orgVER-impress (>=
1:3.0.0~bea300~dev300m6),
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.1.0~),
openoffice.orgVER-impress (>= 1:3.1.0~),
${misc:Depends}
Enhances: openoffice.orgVER-impress
Description: OpenOffice.org Impress extension for a separate presenter's
console
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2009-04-27 13:34:49 +
+++ b/control.reportdesign.in 2009-05-05 00:35:14 +
@@ -1,9 +1,9 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin
(>= ${base-version}), openoffice.org-java-common (>= ${base-version}),
${java-runtime-depends},
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin
(>= 1:3.1.0~), openoffice.org-java-common (>= ${base-version}),
${java-runtime-depends},
${misc:Depends}
-Conflicts: openoffice.org-reportdesigner, openoffice.orgVER-report-builder-bin
(>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>=
${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
Enhances: openoffice.orgVER-base
./packages/openofficeorg/3.1/experimental r1527: merge
revno: 1527 committer: Rene Engelhard branch nick: experimental timestamp: Wed 2009-05-06 00:08:03 +0200 message: merge modified: rules revno: 1332.1.140 committer: Rene Engelhard branch nick: unstable timestamp: Wed 2009-05-06 00:05:57 +0200 message: more lenny backport fixes (wrt kab) modified: rules === modified file 'rules' --- a/rules 2009-05-05 00:00:09 + +++ b/rules 2009-05-05 22:08:03 + @@ -283,6 +283,9 @@ SUITESPARSE_MIN_VERSION= (>= 3.1.0) USE_SYSTEM_JFREEREPORT=n BUILD_KDE=y +ifeq "$(BUILD_KDE)" "y" + ENABLE_KDEAB=y +endif CURL_SECTYPE=openssl endif @@ -1956,6 +1959,8 @@ done mv $(PKGDIR)-core/$(OOBRANDDIR)/program/kdefilepicker \ $(PKGDIR)-kde/$(OOBRANDDIR)/program +endif +ifeq "$(ENABLE_KDEAB)" "y" rm -rf $(PKGDIR)-kab mkdir -p -m755 $(PKGDIR)-kab/$(OODIR)/program for f in libkab*so; do \
./packages/openofficeorg/3.0.1/unstable r1472: more lenny backport fixes (wrt kab)
revno: 1472 committer: Rene Engelhard branch nick: unstable timestamp: Wed 2009-05-06 00:05:57 +0200 message: more lenny backport fixes (wrt kab) modified: rules === modified file 'rules' --- a/rules 2009-05-04 23:56:45 + +++ b/rules 2009-05-05 22:05:57 + @@ -264,6 +264,9 @@ LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10) SUITESPARSE_MIN_VERSION= (>= 3.1.0) BUILD_KDE=y +ifeq "$(BUILD_KDE)" "y" + ENABLE_KDEAB=y +endif CURL_SECTYPE=openssl endif @@ -2010,6 +2013,8 @@ done mv $(PKGDIR)-core/$(OOBRANDDIR)/program/kdefilepicker \ $(PKGDIR)-kde/$(OOBRANDDIR)/program +endif +ifeq "$(ENABLE_KDEAB)" "y" rm -rf $(PKGDIR)-kab mkdir -p -m755 $(PKGDIR)-kab/$(OODIR)/program for f in libkab*so; do \
Bug#471458: File Exporter Bug
Hi, Peter Aleit wrote: > I just had this with OpenOffice 3.0.0 and 3.0.1 on a machine running > Windows XP (32bit). Windows *sigh* ;) > The issue occured when I tried to save an .xml File. I've been working > with the very same .xml file for several days and never had any problems > with it. I have tried the following to work around the problem: > > Prior to the first time the bug occured I had the same .xml file opened > with UltraEdit 14.00b, but had the program closed before opening the > .xml File using OpenOffice 3.0.0 > > 1. Tried to save the .xml File with another name as .xml -> Fail. > 2. Copied the .xml File prior to opening it somewhere else and then > tried to save it as .xml with the same name -> Fail. > 3. Opened the another .xml file and tried to save it as .xml -> Fail. > 4. Opened the .xml File saved it as .ods, Then opened the .ods File and > tried to save it as .xml -> Fail on last step. > 5. Uninstalled OpenOffice 3.0.0 and reinstalled as version 3.0.1, then > tried to save the .xml after opening it with OpenOffice 3.0.1 -> Failed > on last step. > 6. Rebooted the computer and retried all of the above workaround > attempts -> all failed. > > Error Message in all case:"Error saving the document. Write Error." > > maybe this intel helps reproducing the issue. Please post your findings to the upstream issue (http://qa.openoffice.org/issues/show_bug.cgi?id=69993) so they can debug it using your new info. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Re: Backport "fix saxon conditional; use internal saxon" change to backports.org packages
Hi, Stuart Prescott wrote: > I have rebuilt the OOo packages from backports.org (1:3.0.1-7~bpo50+1), > changing only: > > SYSTEM_SAXON=n > > and my problems with the backports.org package go away. > > Can you see fit to making this change in any future uploads to bpo? (I have > my .debs now, but should there be another upload to bpo, I'd rather not have > to recompile it all again!) Yes. I already plan to do a backport of -11 which has that fix included. (it's fixed in "normal" packages since 1:3.0.1-8) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/unstable r1528: update Vcs-Bzr: for new branch for unstable
revno: 1528 committer: Rene Engelhard branch nick: unstable timestamp: Wed 2009-05-06 21:40:17 +0200 message: update Vcs-Bzr: for new branch for unstable modified: control control.in === modified file 'control' --- a/control 2009-05-05 00:35:14 + +++ b/control 2009-05-06 19:40:17 + @@ -7,7 +7,7 @@ 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], base-files (= 5) Standards-Version: 3.8.1 XS-Python-Version: current -Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental +Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable Vcs-Git: git://anongit.freedesktop.org/git/ooo-build/ooo-build Homepage: http://www.go-oo.org === modified file 'control.in' --- a/control.in2009-05-04 22:56:55 + +++ b/control.in2009-05-06 19:40:17 + @@ -52,7 +52,7 @@ 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.8.1 XS-Python-Version: @PYTHON_VERSION@ -Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental +Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable Vcs-Git: git://anongit.freedesktop.org/git/ooo-build/ooo-build Homepage: http://www.go-oo.org
./packages/openofficeorg/3.1/unstable r1529: 3.1.0-1 released
revno: 1529 committer: Rene Engelhard branch nick: unstable timestamp: Wed 2009-05-06 21:41:19 +0200 message: 3.1.0-1 released modified: changelog === modified file 'changelog' --- a/changelog 2009-05-05 00:35:14 + +++ b/changelog 2009-05-06 19:41:19 + @@ -1,10 +1,10 @@ -openoffice.org (1:3.1.0-1) UNRELEASED; urgency=low +openoffice.org (1:3.1.0-1) unstable; urgency=low * OpenOffice.org 3.1.0 final (no source changes to rc2) * upload to unstable * ooo-build: -- update (190e433673712d33ce0d44c07ac519cd0d618fa1) +- update (ed83f8ef25c224f80ded79eb91c845064b407421) - forces OpenJDK javadoc even on gcj builds, fixes odk build breakage - use 3.1s new feature of setting JDBC CLASSPATHs in DataAcess.xcu directly @@ -25,7 +25,7 @@ * debian/control.reportdesign.in, control.presenter.in: - update depends/conflicts to match description.xml - -- Rene Engelhard Tue, 05 May 2009 02:32:48 +0200 + -- Rene Engelhard Wed, 06 May 2009 00:08:13 +0200 openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low
./packages/openofficeorg/3.1/unstable r1530: add support for boost-defaults; allow flex again
revno: 1530 committer: Rene Engelhard branch nick: unstable timestamp: Thu 2009-05-07 08:43:31 +0200 message: add support for boost-defaults; allow flex again modified: changelog control control.in rules === modified file 'changelog' --- a/changelog 2009-05-06 19:41:19 + +++ b/changelog 2009-05-07 06:43:31 + @@ -1,3 +1,12 @@ +openoffice.org (1:3.1.0-2) UNRELEASED; urgency=low + + * debian/rules: +- add support for boost-defaults + * debian/control.in, debian/rules: +- allow flex again, bump build-dep for flex if we use gcc 4.4 for safety + + -- Rene Engelhard Thu, 07 May 2009 00:43:58 +0200 + openoffice.org (1:3.1.0-1) unstable; urgency=low * OpenOffice.org 3.1.0 final (no source changes to rc2) === modified file 'control' --- a/control 2009-05-06 19:40:17 + +++ b/control 2009-05-07 06:43:31 + @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team Uploaders: Chris Halls , Rene Engelhard -Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), 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, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , 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 , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390 arme
Re: Backport "fix saxon conditional; use internal saxon" change to backports.org packages
Hi, Stuart Prescott wrote: > > > SYSTEM_SAXON=n > [...] > > Yes. I already plan to do a backport of -11 which has that fix included. > > (it's fixed in "normal" packages since 1:3.0.1-8) > > Ahh wonderful. I had assumed that backporting newer versions was going to be > too much of a chore seeing how much the build system has changed recently and > with mono2 transitions etc. Actually, most times I am trying to make changes in such a way that it would not break the lenny backport. I have much ifeq's in debian/rules :) So the whole changes for e.g the mono2 transition only gets into effect when you are on ! lenny :) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/unstable r1531: update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7)
revno: 1531
committer: Rene Engelhard
branch nick: unstable
timestamp: Thu 2009-05-07 16:13:17 +0200
message:
update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7)
modified:
changelog
control.in
=== modified file 'changelog'
--- a/changelog 2009-05-07 06:43:31 +
+++ b/changelog 2009-05-07 14:13:17 +
@@ -4,8 +4,10 @@
- add support for boost-defaults
* debian/control.in, debian/rules:
- allow flex again, bump build-dep for flex if we use gcc 4.4 for safety
+ * debian/control.in:
+- update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7)
- -- Rene Engelhard Thu, 07 May 2009 00:43:58 +0200
+ -- Rene Engelhard Thu, 07 May 2009 16:09:49 +0200
openoffice.org (1:3.1.0-1) unstable; urgency=low
=== modified file 'control.in'
--- a/control.in2009-05-07 06:43:31 +
+++ b/control.in2009-05-07 14:13:17 +
@@ -281,7 +281,7 @@
openoffice.org-draw (<< ${base-version}),
openoffice.org-math (<< ${base-version}),
broffice.org (<< ${base-version}),
- openclipart-openoffice.org (<= 0.18+dfsg-5),
+ openclipart-openoffice.org (<= 0.18+dfsg-7),
dictionaries-common (<< 0.98.14)
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
./packages/openofficeorg/3.1/unstable r1532: regen control
revno: 1532
committer: Rene Engelhard
branch nick: unstable
timestamp: Thu 2009-05-07 16:18:15 +0200
message:
regen control
modified:
control
=== modified file 'control'
--- a/control 2009-05-07 06:43:31 +
+++ b/control 2009-05-07 14:18:15 +
@@ -116,7 +116,7 @@
Depends: openoffice.org-style-galaxy, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal,
xfonts-mathml
-Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (=
2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer
(<< ${base-version}), openoffice.org-calc (<< ${base-version}),
openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<<
${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<<
${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-5),
dictionaries-common (<< 0.98.14)
+Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (=
2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer
(<< ${base-version}), openoffice.org-calc (<< ${base-version}),
openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<<
${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<<
${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-7),
dictionaries-common (<< 0.98.14)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org
(<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us,
openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base
(<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<<
2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
Description: full-featured office productivity suite -- arch-independent files
./packages/openofficeorg/3.1/unstable r1533: actually add Files: section matching the upstream tarballs
revno: 1533 committer: Rene Engelhard branch nick: unstable timestamp: Thu 2009-05-07 16:43:41 +0200 message: actually add Files: section matching the upstream tarballs modified: changelog copyright === modified file 'changelog' --- a/changelog 2009-05-07 14:13:17 + +++ b/changelog 2009-05-07 14:43:41 + @@ -6,8 +6,10 @@ - allow flex again, bump build-dep for flex if we use gcc 4.4 for safety * debian/control.in: - update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7) + * debian/copyright: + - actually add Files: section matching the upstream tarballs - -- Rene Engelhard Thu, 07 May 2009 16:09:49 +0200 + -- Rene Engelhard Thu, 07 May 2009 16:41:06 +0200 openoffice.org (1:3.1.0-1) unstable; urgency=low === modified file 'copyright' --- a/copyright 2009-04-27 13:34:49 + +++ b/copyright 2009-05-07 14:43:41 + @@ -22,6 +22,10 @@ Copyright: Copyright 2002-2009 Sun Microsystems, Inc. License: LGPL-3 +Files: ooo-build/src/OOo*_src*.tar.bz2 +Copyright: Copyright 2002-2009 Sun Microsystems, Inc. +License: LGPL-3 + [ The OOo source ] Files: agg/source/*
Bug#512737: openoffice.org-kde: additional desktop files into /usr/share/templates for KDE desktop "create new"
Hi again, I just looked at this again. Rene Engelhard wrote: > Noèl Köthe wrote: > > drwxr-xr-x nk/nk 0 2009-01-23 10:11 templates/ > > -rw-r--r-- nk/nk 268 2009-01-23 10:11 > > templates/ooo-impress.desktop > > drwxr-xr-x nk/nk 0 2009-01-23 09:42 templates/.source/ > > -rw-r--r-- nk/nk 6305 2009-01-22 18:22 > > templates/.source/ooo-calc.ods > > -rw-r--r-- nk/nk 8993 2009-01-22 19:11 > > templates/.source/ooo-impress.odp > > -rw-r--r-- nk/nk 8063 2009-01-22 18:19 > > templates/.source/ooo-writer.odt Those can be taken from OOo directly for the files it already does use for Windows: r...@frodo:~/OpenOffice.org/DEV300/extras/source/shellnew$ ls soffice.html soffice.odg soffice.odp soffice.ods soffice.odt > Nice idea. The problem I see here is that OOo saves e.g. the document > language in the files. Which then - if you save en-Us versions - makes > you end up with language etc. set to en-US (bad for spellchecking e.g.) I wonder what those above do. But as they are used for the stuff in the Windows Explorer, too, it can't be that a problem there. Will try to do this (though it'll not be visible on sid as long as OOos KDE integration is for KDE3 and thus disabled completely - see #523899) and this would of course end up in -kde as it's KDE-only. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#330186: openoffice.org2: GTK/KDE file dialogs disabled by default
close 330186 1:3.1.0~rc2-1 forcemerge 330186 523314 thanks Hi, Jean Pierre Rupp wrote: > The default OpenOffice.org file dialog is confusing for the common user > who is used to the file open and save dialogs of the desktop environment > they are using. In my case the users are on GNOME 2.10 and they don't > feel comfortable with OpenOffice.org's file chooser dialogs. They find > it odd that they have to deal with different kinds of file chooser > dialogs in different applications. > > I myself find it odd that if I installed openoffice.org2-gnome I must > deal with this file chooser that does not integrate at all with the rest > of my applications. Even Mozilla Firefox now uses GNOME's file chooser > dialog (Deer Park Beta 1). This has been changed in 1:3.1.0~rc2-1, the native fpicker is now default. Forgot to close this bug but closed the other one. Closing this now and merging :) Regards, Rene -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#497589: openoffice.org: ogltrans on amd64
close 497589 1:3.1.0~ooo310m6-1 thanks Hi, Kyle Kearney wrote: > Is there a reason that the openoffice.org-ogltrans (the opengl > transitions for impress) is not available for 64 bit in testing or As said in my initial reply, it crashed at that time on amd64 ... > unstable (although it is in etch-backports)? If not, is it possible for > it to be packaged? Thanks. ... but now it's reenabled. (I forgot to close this bug in the changelog at the time). Doing now. :) Regards, Rene -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527558: openoffice.org-emailmerge: unopkg failed: ERROR: There is no such extension deployed: org.openoffice.legacy.mailmerge.py
Hi, Paul Menzel wrote: > while upgrading to openoffice.org 3.1.0-1 the following error was > displayed. > > Vorbereiten zum Ersetzen von openoffice.org-emailmerge 1:3.0.1-11 > (durch .../openoffice.org-emailmerge_1%3a3.1.0-1_all.deb) ... > > […] > ERROR: There is no such extension deployed: org.openoffice.legacy.mailmerge.py > > unopkg failed. > Removing extension org.openoffice.legacy.mailmerge.py... > ERROR: There is no such extension deployed: org.openoffice.legacy.mailmerge.py > > unopkg failed. > done. As said in the other bug you filedi for writer2latex, this is already a broken condition before the upgrade. org.openoffice.legacy.mailmerge.py should be registered when openoffice.org-emailmerge is installed. I think this was a side-effect of (filed by you!) http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=522022. Because OOo 3.1 had some restructuring which I needed to change some stuff in python-uno for... > Entpacke Ersatz für openoffice.org-emailmerge ... > […] And then it correctly installed and registered it: (at least according to unopkg): > -- Package-specific info: > Identifier: org.openoffice.legacy.mailmerge.py > URL: > vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages/tAEcp9_/mailmerge.py > is registered: yes > Media-Type: application/vnd.sun.star.uno-component;type=Python > Description: Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527556: openoffice.org-writer2latex: Remove package: ERROR: There is no such extension deployed: org.openoffice.da.writer2latex.oxt
tag 527556 + moreinfo
tag 527556 + unreproducible
thanks
Hi,
Paul Menzel wrote:
> upgrading to openoffice.org 3.1.0-1 today openoffice.org-writer2latex{u}
> was removed. The following error was displayed.
Well, you can keep it if you want. I bet you use aptitude and it just
removes it again because it got installed automatically because the
"openoffice.org" metapackage depending on it - which it doesn't do anymore :)
> Entferne openoffice.org-writer2latex ...
>
> ERROR: There is no such extension deployed: org.openoffice.da.writer2latex.oxt
>
> unopkg failed.
> Removing extension org.openoffice.da.writer2latex.oxt...
> ERROR: There is no such extension deployed: org.openoffice.da.writer2latex.oxt
>
> unopkg failed.
> done.
So obviously your install was broken before because
org.openoffice.da.writer2latex.oxt *IS* there before the upgrade.
on normal squeeze (or sid, fwiw):
# apt-get install openoffice.org
[...]
Setting up openoffice.org-writer2latex (0.5.0.2-4) ...
Adding extension
/usr/lib/openoffice/share/extension/install/writer2latex.oxt... done.
[...]
# /usr/lib/openoffice/program/unopkg list --shared
all deployed shared packages:
Identifier: org.openoffice.da.writer2latex.oxt
Version: 0.5.0.2
The prerm assumes that if you have the package installed you have the extension
registered - if not anything else was broken before that.
Please don't make package maintainers responsible for working around broken
systems before the upgrade.
Just checking for it being there and removing it only when it's not shown
in --list can open other can of worms, better fail early.
In neither way is this is a bug in writer2latex - (well, it might be one in the
global scope but you didn't paste the full upgrade log but just this which is
not exactly useful).
Grüße/Regards,
René
--
.''`. René Engelhard -- Debian GNU/Linux Developer
: :' : http://www.debian.org | http://people.debian.org/~rene/
`. `' r...@debian.org | GnuPG-Key ID: 248AEB73
`- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527596: openoffice.org: reports "javaldx failed!" in the console
close 527596 1:3.1.0~rc1-1 tag 527596 + moreinfo thanks Hi, Sergiy Kolesnikov wrote: > After upgrading to Lenny every openoffice.org application reports "javaldx > failed!", if started from the console. > > Solution: > $ rm .openoffice.org2/user/config/javasettings_Linux_x86.xml Or (re-) setting the right JVM in the Options. > The file will be recreated on the next start of any openoffice.org > application, and the error message will go away. Which JDK did you configure OOo to use in etch?. Might be that it changed patch between etch and lenny or completely was gone with the upgrade/ater you upgraded. So OOos Java framework doesn't find it anymore and you need to either set it in the options or delete the mentioned file and then re-set it (or let OOo set it), yes. So if you used sun-java5-jre and after the upgrade removed it and switched to sun-java6-jre, yes, you run into this situation. (see http://www.openoffice.org/issues/show_bug.cgi?id=83140) I tried a dist-upgrade from clean etch + java-gcj-compat + OOo to lenny and it didn't show a javaldy error neither in the upgrade nor in the upgraded system... OOo until 3.1 was not able to handle the condition itself that a JDK changed its path. Now it does... Marking this as fixed in 3.1... (will stay open for 2.4) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/unstable r1534: use ooo-build-3-1 branch
revno: 1534 committer: Rene Engelhard branch nick: unstable timestamp: Fri 2009-05-08 18:28:49 +0200 message: use ooo-build-3-1 branch modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-07 14:43:41 + +++ b/changelog 2009-05-08 16:28:49 + @@ -1,5 +1,9 @@ openoffice.org (1:3.1.0-2) UNRELEASED; urgency=low + * ooo-build: +- switch to ooo-build-3-1 branch (c88c771839b3b7fbd00086760638e869fe8821d9) + (based on ooo-build-3.1.0.0) + * debian/rules: - add support for boost-defaults * debian/control.in, debian/rules: === modified file 'rules' --- a/rules 2009-05-07 06:43:31 + +++ b/rules 2009-05-08 16:28:49 + @@ -66,7 +66,7 @@ MILESTONE=m11 #TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) TAG=$(MWS)_$(MILESTONE) -#OOO_BUILD_BRANCH=ooo-build-3-1 +OOO_BUILD_BRANCH=ooo-build-3-1 SOURCE_TREE=ooo-build/build/$(TAG) STAMP_DIR=debian/stampdir
./packages/openofficeorg/3.1/unstable r1535: make -emailmerge Pre-Depend on ${python:Depends}, python-uno
revno: 1535
committer: Rene Engelhard
branch nick: unstable
timestamp: Fri 2009-05-08 18:30:52 +0200
message:
make -emailmerge Pre-Depend on ${python:Depends}, python-uno
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-05-08 16:28:49 +
+++ b/changelog 2009-05-08 16:30:52 +
@@ -10,6 +10,8 @@
- allow flex again, bump build-dep for flex if we use gcc 4.4 for safety
* debian/control.in:
- update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7)
+- make -emailmerge Pre-Depend on ${python:Depends}, python-uno
+ (closes: #522022, #527558)
* debian/copyright:
- actually add Files: section matching the upstream tarballs
=== modified file 'control'
--- a/control 2009-05-07 14:18:15 +
+++ b/control 2009-05-08 16:30:52 +
@@ -373,7 +373,8 @@
Package: openoffice.org-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno, ${misc:Depends}
+Pre-Depends: ${python:Depends}, python-uno
+Depends: ${misc:Depends}
Enhances: openoffice.org-writer
Replaces: python-uno (<< 1:2.4.1-5)
Description: full-featured office productivity suite -- email mail merge
=== modified file 'control.in'
--- a/control.in2009-05-07 14:13:17 +
+++ b/control.in2009-05-08 16:30:52 +
@@ -642,8 +642,8 @@
Package: openoffice.orgVER-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno,
- ${misc:Depends}
+Pre-Depends: ${python:Depends}, python-uno
+Depends: ${misc:Depends}
Enhances: openoffice.orgVER-writer
Replaces: python-uno (<< 1:2.4.1-5)
Description: full-featured office productivity suite -- email mail merge
./packages/openofficeorg/3.1/unstable r1536: add /usr/share/template stuff for KDE
revno: 1536
committer: Rene Engelhard
branch nick: unstable
timestamp: Sat 2009-05-09 00:01:24 +0200
message:
add /usr/share/template stuff for KDE
added:
soffice-template.desktop.in
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in2009-04-15 09:33:39 +
+++ b/broffice.org.postrm.in2009-05-08 22:01:24 +
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
/usr/share/templates/soffice.odt.desktop
/usr/share/templates/soffice.ods.desktop
/usr/share/templates/soffice.odp.desktop
/usr/share/templates/soffice.odg.desktop"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2009-01-07 20:14:44 +
+++ b/broffice.org.preinst.in 2009-05-08 22:01:24 +
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
/usr/share/templates/soffice.odt.desktop
/usr/share/templates/soffice.ods.desktop
/usr/share/templates/soffice.odp.desktop
/usr/share/templates/soffice.odg.desktop"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2009-05-08 16:30:52 +
+++ b/changelog 2009-05-08 22:01:24 +
@@ -14,8 +14,11 @@
(closes: #522022, #527558)
* debian/copyright:
- actually add Files: section matching the upstream tarballs
+ * debian/rules, debian/broffice.org.{preinst,postrm}.in,
+soffice-template.desktop.in: add extra .desktop file
./packages/openofficeorg/3.1/unstable r1537: use cirrect icon
revno: 1537 committer: Rene Engelhard branch nick: unstable timestamp: Sat 2009-05-09 00:29:24 +0200 message: use cirrect icon modified: rules soffice-template.desktop.in === modified file 'rules' --- a/rules 2009-05-08 22:01:24 + +++ b/rules 2009-05-08 22:29:24 + @@ -1976,18 +1976,22 @@ cat debian/soffice-template.desktop.in \ | sed -e "s/@APP@/Writer/" \ | sed -e "s/@EXT@/odt/" \ + | sed -e "s/@TYPE@/text/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.odt.desktop cat debian/soffice-template.desktop.in \ | sed -e "s/@APP@/Calc/" \ | sed -e "s/@EXT@/ods/" \ + | sed -e "s/@TYPE@/spreadsheet/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.ods.desktop cat debian/soffice-template.desktop.in \ | sed -e "s/@APP@/Impress/" \ | sed -e "s/@EXT@/odp/" \ + | sed -e "s/@TYPE@/presentation/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.odp.desktop cat debian/soffice-template.desktop.in \ | sed -e "s/@APP@/Draw/" \ | sed -e "s/@EXT@/odg/" \ + | sed -e "s/@TYPE@/drawing/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop endif ifeq "$(ENABLE_KDEAB)" "y" === modified file 'soffice-template.desktop.in' --- a/soffice-template.desktop.in 2009-05-08 22:01:24 + +++ b/soffice-template.desktop.in 2009-05-08 22:29:24 + @@ -4,5 +4,5 @@ Comment[de]=Name der OpenOffice.org @a...@-datei eingeben: Type=Link URL=.source/soffi...@ext@ -Icon=openofficeorg3-oasis-text +icon=openofficeorg3-oas...@type@
Bug#527908: openoffice.org-core: (Lenny-Backports) depends KDE/Qt libs#
notfound 527908 1:3.0.1-11 found 527908 1:3.0.1-11~bpo50+1 thanks Hi again, Rene Engelhard wrote: > maxbugs wrote: > > Package: openoffice.org-core > > Version: 1:3.0.1-11 > > wrong. Wrong because -11 in sid does have no KDE integration enabled anymore at all so that the files causing this are not present at all in sid on any package :) (And the error condition leading to this bug is not present there either) > > (kdelibs4c2a, libqt3-mt). These are not required for other versions of > > openoffice.org-core and forces to install many KDE/Qt stuff. > > Will look. OK, I see what's wrong. Will build ~bpo590+2 and upload it (most probably on Monday) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: [paket openoffice.org-base] Application does not start
severity 527910 grave tag 527910 + moreinfo tag 527910 + unreproducible thanks Hi, Chris Hildebrandt wrote: > Package: paket openoffice.org-base what does Package mean? ;-) why do you repeat "paket" there causing this bug to first be filed in the unknown-package junk? (yes, "paket" is not a package in Debian) > Version: 1:3.1.0-1 > Severity: critical Bullshit. Read the description of package severities. (http://www.debian.org/Bugs/Developer#severities - and it's even linked from the "how to report bugs" pages for users, too) How does this break "the whole system"? Correct. It does not. So it's - if this is a bug at all in OOo - grave. > The application does not start with soffice -base or ooffice -base, > also acessing it from inside writer leads to crash - both without eny > error message. This problem was not present with all older versions in > Sid and Experimental. Just that there was no change at all in Base's code between rc2 and final and rc2 *was* in experimental. > --- System information. --- > Architecture: amd64 > Kernel: Linux 2.6.29-2.slh.8-sidux-amd64 > > Debian Release: squeeze/sid > 500 unstable sidux.com > 500 unstable ftp.de.debian.org > 500 unstable frickelplatz.de ^^ > 500 unstable debian-multimedia.org > 500 unstable art.sidux.com > 500 testing ftp.de.debian.org > 1 experimental ftp.de.debian.org No comment > --- Package information. --- > Depends (Version) | Installed > -+-== > openoffice.org-core (= 1:3.1.0-1) | 1:3.1.0-1 > openoffice.org-base-core (= 1:3.1.0-1) | 1:3.1.0-1 > libc6 (>= 2.2.5) | 2.9-11 > libgcc1 (>= 1:4.1.1) | 1:4.4.0-4 > libstdc++6 (>= 4.1.1) | 4.4.0-4 > ure (>= 1.5.0) | 1.5.0+OOo3.1.0-1 > default-jre | > OR java-gcj-compat | > OR openjdk-6-jre | > OR sun-java5-jre | > OR sun-java6-jre | 6-13-1 So you use Sun Java 6. Installed it and tried (I don't have non-free crap installed and just have java-gcj-compat and openjdk-6-jre here, with both it works) Still starts for me. (sun-java6 btw has #523330, maybe it's related)? At least here it's unreproducible. Please post more info or try on a sane system. Regards, Rene -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: [paket openoffice.org-base] Application does not start
{ why are you deleteing the Cc to that your conversation does not end up in
the buglog. it should }
Hi,
Chris Hildebrandt wrote:
> See above - thanks again.
> >> The application does not start with soffice -base or ooffice -base,
> >> also acessing it from inside writer leads to crash - both without eny
> >> error message. This problem was not present with all older versions in
> >> Sid and Experimental.
> >>
> >
> > Just that there was no change at all in Base's code between rc2 and final
> > and rc2 *was* in experimental.
> >
> >
> I have used the RC2 from Experimental before without any problems. I
> know that the code did not change, that's why I posted the bug here,
> it's probably packaging related.
The packaging didn't change much either, except moving some CLASSPATH settings
from jvmfwk3rc to the new config file for this - as it work here I do not
believe at all that this can be the cause:
(But if you want to try,
/usr/lib/openoffice/basis3.1/share/registry/data/org/openoffice/Office/DataAccess.xcu,
but I removed those packages it references, and Base still works. So that
really can't cause
it)
> If you feel a no comment is in place here, the sources are not related to the
> problem as far as I can see
Every external source can bring problems. Especially if it has different
packages than Debian.
> I thought that bug reports from people using Debian Sid are appreciated, but
> this was probably a misunderstanding.
Correct. Debian sid. Your sources are not Debian sid, it's a mixture of a loads
of different stuff.
> > So you use Sun Java 6. Installed it and tried (I don't have non-free
> > crap installed and just have java-gcj-compat and openjdk-6-jre here,
> > with both it works)
> >
> I can reproduce the problem with openjdk-6-jre, that's what I actually
> used before. I afterwards tried with sun's "crap" with same result,
> which motivated me to file this bug report.
I can't with neither.
> Same bug from several other Debian Sid users. All of them confirm the
> same. By the way, there is a process left open afterwards always:
Then that report would have been earlier, wouldn't there? 3.1.0 is in
sid since Thursday. And a person from the OOo project regularily using
Base and sid didn't yet complain either.
> $ ps axu | grep soffice | grep -v grep
> slam 13616 2.2 1.5 430240 49376 ?Sl 17:51 0:00
> /usr/lib/openoffice/program/soffice.bin -base -splash-pipe=6
>
> I also tried on a "sane" new install via testing netinstall iso with
> same result.
But then it's not a 100% sane system, because you mix testing and unstable ,
but admittedly much more saner than the other mix :)
> I hope this helps you to track the problem down.
I don't believe so.
Grüße/Regards,
René
--
.''`. René Engelhard -- Debian GNU/Linux Developer
: :' : http://www.debian.org | http://people.debian.org/~rene/
`. `' r...@debian.org | GnuPG-Key ID: 248AEB73
`- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: [paket openoffice.org-base] Application does not start
Hi again, Rene Engelhard wrote: > > Same bug from several other Debian Sid users. All of them confirm the > > same. By the way, there is a process left open afterwards always: > > $ ps axu | grep soffice | grep -v grep > > slam 13616 2.2 1.5 430240 49376 ?Sl 17:51 0:00 > > /usr/lib/openoffice/program/soffice.bin -base -splash-pipe=6 Sorry, forget to answer this: This is the OOo app, which didn't exit properly. ( I have -splash-pipe=5, though...) Maybe you had the quickstarter running anyway, then did a upgrade and wonder that OOo doesn't start? Which indeed might not work, but is not supported either. Did you try to quit all OOos/the quickstarter and/or kill all soffice.bin processes? Does this problem only affect Base or also other modules? Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527954: openoffice.org-impress: Segmentation fault while converting ppt to PDF
Hi, Nelson A. de Oliveira wrote: > Package: openoffice.org-impress > Version: 1:3.1.0-1 > Severity: normal > > Hi! > > While converting a ppt file to PDF OpenOffice gives a segmentation fault here. > gdb output is attached. > Unfortunately I can't make the ppt file publicly available (but I can send it > privately or put it somewhere if needed; size is 21MB). yes, please, send per mail. Do I also have the permission to give it to people who actually would debug it (Novell/Sun) - of course keeping non-public if you wish)? Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: [paket openoffice.org-base] Application does not start
Hi, Chris Hildebrandt wrote: > the issue is independend from upgrading or fresh install. No, it does > not work after killing the processes. Hrm. > Yes, the problem does affect openoffice.org-base only, all other modules > did and do work fine. OK. > By the way, the sun-java6 bug mentioned before is not related. Yes, we foound at already out when you said it didn't work with OpenJDK either :) > I use amd64, do you think it could be architecture related? Well, I tried in on amd64, too, so... (If you had i386 I'd have needed to try it in a i386 chroot, but my main system is amd64) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: [openoffice.org-base] openoffice.org-base doesn 't start
found 527910 1:3.1.0~rc2-1 thanks Hi, Thomas Florek wrote: > Package: openoffice.org-base > Version: 1:3.1.0-1 > > --- Please enter the report below this line. --- > I am one of the sid users mentioned by Chris Hildebrandt who noticed ^ ux. > this bug too and even before him (pls see > http://sidux.com/index.php?name=PNphpBB2&file=viewtopic&p=124277#124277) > I confirm Chris' report and would like to add that this bug appeared But also on sidux... With (at least) a sidux kernel. As said already in my reply to Chris, I can not reproduce this on my sid box. > already in rc2 from experimental. If necessary I 'll give further > information. Please do. > One more thing: > I recommend you, Rene, whose contributions as Debian developer we all > and I personally deeply esteem, to avoid in future in your comments > words like "bullshit" or "crap". I wouldn 't like to elaborate this > matter further. Sorry, severity "critical" *is+ bullshit for a bug like this. I simply hate it when people file bugs with inflated severity. Especially for RC bugs. And non-free software is evil :) - > "crap" (but I was in a bad mood when writing my mai due to the "critical" severity, yes, I could have avoided that) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: openoffice.org-base: oobase does not start
Hi, Torsten Wohlfarth wrote: > As the other reporters told, openoffice base does not start. > It doesn't matter, if i start with oobase or from a running other aplication. > No error-message in terminal, but a running soffice.bin process. What exactly does a "me, too" message without any additional info bring? Correct, nothing. Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: [paket openoffice.org-base] Application does not start
tag 527910 - unreproducible thanks Hi, Chris Hildebrandt wrote: > the issue is independend from upgrading or fresh install. No, it does OK, I just logged in into a fresh chrot + apt-get installed OOo and OpenJDK. Yes, it doesn't start :/ Now to find out why it works in my normal sid... Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#414398: Processed: Does this bug still exist?
reassign 414398 openoffice.org-dictionaries close 414398 thanks Debian Bug Tracking System wrote: > Processing commands for cont...@bugs.debian.org: > > > reassign 414398 openoffice.org > Bug#414398: openoffice.org-hyphenation-en-gb: o'clock hyphenated as o'c-lock > Warning: Unknown package 'openoffice.org-hyphenation-en-gb' > Bug reassigned from package `openoffice.org-hyphenation-en-gb' to > `openoffice.org'. OK, openoffice.org-hyphenation-en-gb got removed LNG ago due to license issues. I'd close the bug then EXCEPT that I am not sure what is correct hyphenation for o'clock? none? o'-clock like OOo with openoffice.org-hyphenation-en-us on lenny does? Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527910: [paket openoffice.org-base] Application does not start
Hi, Mindaugas Rucys wrote: > I confirm this bug (Linux kernel 2.6.29-2-686, openoffice.org-base > > 1:3.1.0-1, Debian version squeeze/sid). I asked some Debian guys on IRC yesterday and the status there is that some had that problem too and some have not. Not very sophisticated :/ > My observations: > When I open data sources (F4) I can access to all .ods databases, > biblio database but when I click to tables from any mysql(jdbc) database > I get message: > "The connection to data source could not be > established. > The connection to the external data source could not be > established. No SDBC driver was found for the given URL." How is that related to this bug? This sounds more like JDBC Problems (where I did change something between rc2-1 and 1:3.1.0, yes, I added the config snippets mentioned at http://wiki.services.openoffice.org/wiki/Base/New_features_in_3_1#New_configuration_setting_for_pre-specifying_per-driver_classpaths Or does the console then also show some error? > I can open all .odb files, for mysql databases I can access database So you can start Base? Then it's wrong in this bug, this bug is about not being able to start Base *at all*. > Properties ( test class - OK, test connection - "The connection could > not be established") but I can't access database Connection Type - any ^ > result or error message. ^^ please rephrase this in a sentence I understand.. > File - New - Database - crash. Yep. With "terminate called after throwing an instance of 'com::sun::star::loader::CannotActivateFactoryException" Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/unstable r1538: more GCC_VERSION handling fixes
revno: 1538 committer: Rene Engelhard branch nick: unstable timestamp: Wed 2009-05-13 10:24:16 +0200 message: more GCC_VERSION handling fixes modified: changelog rules === modified file 'changelog' --- a/changelog 2009-05-08 22:01:24 + +++ b/changelog 2009-05-13 08:24:16 + @@ -6,6 +6,7 @@ * debian/rules: - add support for boost-defaults +- more fixes for GCC_VERSION setting * debian/control.in, debian/rules: - allow flex again, bump build-dep for flex if we use gcc 4.4 for safety * debian/control.in: === modified file 'rules' --- a/rules 2009-05-08 22:29:24 + +++ b/rules 2009-05-13 08:24:16 + @@ -394,7 +394,7 @@ # use 32-bit compiler CC_PREFIX=sparc-linux-gnu- else - CC_PREFIX=$(gcc -dumpmachine)- + CC_PREFIX=$(shell gcc -dumpmachine)- endif ifeq (s390,$(findstring s390,$(OOO_ARCHS))) @@ -1002,8 +1002,10 @@ ifeq ($(GCC_VERSION),snapshot) BUILD_PATH = /usr/lib/jvm/java-gcj/bin:/usr/lib/gcc-snapshot/bin:$$PATH BUILD_LD_LIBRARY_PATH = /usr/lib/gcc-snapshot/lib:$$LD_LIBRARY_PATH + BUILD_DEPS += , gcc-snapshot else BUILD_PATH = /usr/lib/jvm/java-gcj/bin:$(CURDIR)/debian/usr/bin:$$PATH + BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION) endif endif BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
Bug#528487: Please update to the recent openoffice.org version
retitle 528487 please re-enable -kde reassign 528487 openoffice.org # until this is ported to KDE4 tag 528487 + wontfix thanks Hi, Hans wrote: > this is no real bug, more a wish. It would be nice, if you could build a new > package which depends on the latest openoffice.org version. openoffice.org-kde is disabled, which you - if you would have read the changelog - would have seen: openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low [...] * debian/control.in, debian/control.kde.in, debian/rules: - disable -kde and -kab as they're for KDE3 (closes: #523899). Improve BUILD_KDE conditional [...] -- Rene Engelhard Sat, 25 Apr 2009 15:26:24 +0200 Complain at the KDe people (who filed #523899 and which I had a long discussion with, they don't want KDE3 stuff in squeeze) It actually even was removed from sid now because it's not built anymore: $ rmadison openoffice.org-kde openoffice.org-kde | 2.0.4.dfsg.2-7etch6 | oldstable | amd64, i386, powerpc, sparc openoffice.org-kde | 1:2.4.1+dfsg-1 |stable | amd64, armel, i386, ia64, mips, mipsel, powerpc, s390, sparc openoffice.org-kde | 1:3.0.1-9 | testing | amd64, armel, i386, ia64, mips, mipsel, powerpc, s390, sparc rengelh...@lxrengelhard:~$ > In case of wrong (old) dependencies, the package wants to uninstall. Correct. The package does not exist anymore. completely. Nothing to update there. Let it uninstall. Or use stable if you can't live with such changes happening. > IMO this is just a versions problem, not a real bug. Maybe it is possible, > just to change the entry in openoffice.org-kde > to the latest version of openoffice.org and rebuild??? No, because openoffice.org-kde is not separate. It gets built out of the OOo source package directly with the "normal" OOo build. And that is disabled - and probably will until that gets ported for KDE4. Whenever that will be (I see no progress at all on this) Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#527954: openoffice.org-impress: Segmentation fault while converting ppt to PDF
Hi, Nelson A. de Oliveira wrote: > While converting a ppt file to PDF OpenOffice gives a segmentation fault here. > gdb output is attached. Hrm. Doesn't here. (Neither with Debians version nor with vanilla OOo). Grüße/Regards, René -- .''`. René Engelhard -- Debian GNU/Linux Developer : :' : http://www.debian.org | http://people.debian.org/~rene/ `. `' r...@debian.org | GnuPG-Key ID: 248AEB73 `- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73 -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
./packages/openofficeorg/3.1/unstable r1539: make -common conflict against -core having another basisX.Y than -common and introduce new BASIS_VERSION variable
revno: 1539
committer: Rene Engelhard
branch nick: unstable
timestamp: Thu 2009-05-14 14:28:01 +0200
message:
make -common conflict against -core having another basisX.Y than -common and
introduce new BASIS_VERSION variable
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-05-13 08:24:16 +
+++ b/changelog 2009-05-14 12:28:01 +
@@ -7,12 +7,14 @@
* debian/rules:
- add support for boost-defaults
- more fixes for GCC_VERSION setting
+- introduce new BASIS_VERSION variable
* debian/control.in, debian/rules:
- allow flex again, bump build-dep for flex if we use gcc 4.4 for safety
* debian/control.in:
- update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7)
- make -emailmerge Pre-Depend on ${python:Depends}, python-uno
(closes: #522022, #527558)
+- make -common conflict against -core having another basisX.Y than -common
* debian/copyright:
- actually add Files: section matching the upstream tarballs
* debian/rules, debian/broffice.org.{preinst,postrm}.in,
=== modified file 'control.in'
--- a/control.in2009-05-08 16:30:52 +
+++ b/control.in2009-05-14 12:28:01 +
@@ -283,6 +283,8 @@
broffice.org (<< ${base-version}),
openclipart-openoffice.org (<= 0.18+dfsg-7),
dictionaries-common (<< 0.98.14)
+ openoffice.orgVER-core (<< ${basis-version}),
+ openoffice.orgVER-core (>= ${basis-version}.99)
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files,
=== modified file 'rules'
--- a/rules 2009-05-13 08:24:16 +
+++ b/rules 2009-05-14 12:28:01 +
@@ -24,6 +24,7 @@
HELP_L10N_VIRTUAL_VERSION:=3.1
#VER:=3
OOVER:=3.1
+BASIS_VERSION:=$(OOVER)
PACKAGES := $(shell dh_listpackages)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@ -40,7 +41,7 @@
PKGDIR:=debian/openoffice.org$(VER)
OODIRNAME=openoffice$(VER)
OOBRANDDIR:=usr/lib/$(OODIRNAME)
-OOBASISDIR:=$(OOBRANDDIR)/basis$(OOVER)
+OOBASISDIR:=$(OOBRANDDIR)/basis$(BASIS_VERSION)
OOSDKDIR:=$(OOBASISDIR)/sdk
OOUREDIR:=usr/lib/ure
# compatability
@@ -3043,6 +3044,7 @@
-Nopenoffice.org$(VER)-sdbc-postgresql -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
-V'base-version=$(BASE_VERSION)' \
+ -V'basis-version=$(BASIS_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
