./packages/openofficeorg/3.0/experimental r1154: (pseudo-)merge of 2.4 branch
------------------------------------------------------------
revno: 1154
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-07-06 23:28:19 +0200
message:
(pseudo-)merge of 2.4 branch
modified:
changelog
cli-uno-bridge.installcligac
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.119
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-07-02 22:14:21 +0200
message:
reenable Java for armel
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.120
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-07-03 05:11:47 +0200
message:
add gcj-4.3 builddep for armel only only when needed
modified:
rules
------------------------------------------------------------
revno: 1022.1.121
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-07-06 23:03:44 +0200
message:
fix for CLI policy
added:
libuno-cli-basetypes1.0-cil.installcligac
libuno-cli-cppuhelper1.0-cil.installcligac
libuno-cli-types1.1-cil.installcligac
libuno-cli-ure1.0-cil.installcligac
renamed:
libuno-cil.installcligac.in => cli-uno-bridge.installcligac
libuno-cil.overrides.lintian => cli-uno-bridge.lintian-overrides
modified:
changelog
control
control.mono.in
rules
cli-uno-bridge.installcligac
cli-uno-bridge.lintian-overrides
------------------------------------------------------------
revno: 1022.1.122
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-07-06 23:09:34 +0200
message:
split mailmerge.py into -emailmerge
added:
openoffice.org-emailmerge.control.bug
openoffice.org-emailmerge.postinst.in
openoffice.org-emailmerge.preinst.in
openoffice.org-emailmerge.prerm.in
openoffice.org-emailmerge.script.bug
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.123
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-07-06 23:11:59 +0200
message:
regenerate control
modified:
control
------------------------------------------------------------
revno: 1022.1.124
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-07-06 23:17:18 +0200
message:
update Replaces:
modified:
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-07-06 21:02:59 +0000
+++ b/changelog 2008-07-06 21:28:19 +0000
@@ -33,13 +33,7 @@
- BUILD_ONLY_EN_US=y
- remove spellchecking symlink and specify the new configure options for
specifying dictionary/hyphenation/thesauri paths.
- - reenable Java for armel, gcj-4.3 OOM reportedly fixed. Add build-dep
- on gcj-4,3 (>= 4.3.1-2) for armel
* debian/rules, debian/control.in:
- - split emailmerge out into an own package. Don't make -writer depend on
- python-uno anymore so that -writer (and openoffice.org) still can be
- installed when python-uno is not installable (like at python-defaults
- changes)
- make openoffice.org-core Pre-Depend on ure (>= 1.4+OOo3.0.0~)
(unfortunately ure didn't update it's version although 3.0.0 needs new
symbols) and update dh_makeshlibs to add a corresponding shlibs
@@ -65,15 +59,28 @@
* debian/control.in:
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
- * debian/openoffice.org-emailmerge*: unopkg add --shared mailmerge.py
- to register mailmerge.py as it otherwise doesn't seem to work
- (closes: #488875)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 06 Jul 2008 23:18:26 +0200
+
+openoffice.org (1:2.4.1-4.5pre) unstable; urgency=medium
+
+ * debian/rules:
+ - reenable Java for armel, gcj-4.3 OOM reportedly fixed. Add build-dep
+ on gcj-4,3 (>= 4.3.1-2) for armel
* debian/rules, debian/control.mono.in, debian/*.installcligac: split
cli_*dll in various subpackages to make the packages CLI policy compliant.
Rename libuno-cil to cli-uno-bridge. Move the files in libuno*-cil to
/usr/lib/cli/uno
+ * debian/rules, debian/control.in:
+ - split emailmerge out into an own package. Don't make -writer depend on
+ python-uno anymore so that -writer (and openoffice.org) still can be
+ installed when python-uno is not installable (like at python-defaults
+ changes)
+ * debian/openoffice.org-emailmerge*: unopkg add --shared mailmerge.py
+ to register mailmerge.py as it otherwise doesn't seem to work
+ (closes: #488875)
- -- Rene Engelhard <rene@debian.org> Wed, 02 Jul 2008 21:54:49 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 06 Jul 2008 23:08:20 +0200
openoffice.org (1:2.4.1-4) unstable; urgency=medium
=== modified file 'cli-uno-bridge.installcligac'
--- a/cli-uno-bridge.installcligac 2008-07-04 13:33:34 +0000
+++ b/cli-uno-bridge.installcligac 2008-07-06 21:28:19 +0000
@@ -1,1 +1,1 @@
-/usr/lib/openoffice/basis3.0/program/cli_uno_bridge.dll
+/usr/lib/openoffice/program/cli_uno_bridge.dll
=== modified file 'control'
--- a/control 2008-07-03 08:21:43 +0000
+++ b/control 2008-07-06 21:28:19 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc, graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , gcj-4.3 (>= 4.3.1-2) [armel] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [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] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc, graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 6.0.7~) , gcj-4.3 (>= 4.3.1-2) [armel] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [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] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -392,9 +392,9 @@
Package: openoffice.org-emailmerge
Architecture: all
-Depends: python, python-uno
+Depends: ${python:Depends}, python-uno
Enhances: openoffice.org-writer
-Replaces: python-uno (<< 1:3.0.0~)
+Replaces: python-uno (<< 1:2.4.1-5)
Description: E-Mail Mailmerge component for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2008-06-24 01:20:37 +0000
+++ b/control.in 2008-07-06 21:28:19 +0000
@@ -627,9 +627,9 @@
Package: openoffice.orgVER-emailmerge
Architecture: all
-Depends: python, python-uno
+Depends: ${python:Depends}, python-uno
Enhances: openoffice.orgVER-writer
-Replaces: python-uno (<< 1:3.0.0~)
+Replaces: python-uno (<< 1:2.4.1-5)
Description: E-Mail Mailmerge component for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'rules'
--- a/rules 2008-07-04 20:19:16 +0000
+++ b/rules 2008-07-06 21:28:19 +0000
@@ -433,8 +433,7 @@
ifeq "$(USE_PYCENTRAL)" "y"
BUILD_DEPS += , python-central (>= 0.5)
endif
- BUILD_DEPS += , python-dev (>= 2.4)
- WRITER_PYUNO_DEP = python-uno (>= $(BASE_VERSION))
+ BUILD_DEPS += , python-dev (>= 2.4) [$(OOO_ARCHS)]
DBG_DBG_SUGGESTS+= , python-dbg
else
BUILD_DEPS += , python
Reply to: