./packages/openofficeorg/3.0/experimental r1176: merge from 2.4 branch
------------------------------------------------------------
revno: 1176
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-07-17 01:32:03 +0200
message:
merge from 2.4 branch
modified:
changelog
control
control.in
copyright
------------------------------------------------------------
revno: 1022.1.139
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-07-15 02:44:55 +0200
message:
merge xutils removal
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.140
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-07-15 03:25:07 +0200
message:
Standards-Version: 3.8.0
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.141
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-07-17 01:13:58 +0200
message:
wrap "Debian package authors:" line to please lintian
modified:
changelog
copyright
=== modified file 'changelog'
--- a/changelog 2008-07-16 14:58:37 +0000
+++ b/changelog 2008-07-16 23:32:03 +0000
@@ -2,7 +2,7 @@
* OpenOffice.org development milestone 25 (DEV300_m25)
* ooo-build:
- - update (r13247)
+ - update (r13256)
* debian/rules:
- Add SYSTEM_LUCENE conditional but don't enable it yet
(liblucene2-java is in contrib...)
@@ -22,8 +22,12 @@
- -style-andromeda is back (contains the "Classic" theme)
* debian/rules, debian/control.mono.in: update for cli_types.dll split due
to the three layer OOo; Section: libs to fix override disparity
+ * debian/control.in:
+ - Standards-Version: 3.8.0 (already following it)
+ * debian/copyright:
+ - wrap "Debian package authors:" line to please lintian
- -- Rene Engelhard <rene@debian.org> Wed, 16 Jul 2008 14:44:22 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 17 Jul 2008 01:30:03 +0200
openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-07-16 14:58:37 +0000
+++ b/control 2008-07-16 23:32:03 +0000
@@ -5,7 +5,7 @@
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) [i386 powerpc sparc mips mipsel armel s390 m68k 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) , 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
+Standards-Version: 3.8.0
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0/experimental
Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/trunk
=== modified file 'control.in'
--- a/control.in 2008-07-14 20:48:12 +0000
+++ b/control.in 2008-07-16 23:32:03 +0000
@@ -51,7 +51,7 @@
bc
%BUILD_DEPS%
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0/experimental
Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/trunk
=== modified file 'copyright'
--- a/copyright 2008-06-10 08:42:51 +0000
+++ b/copyright 2008-07-16 23:32:03 +0000
@@ -1,7 +1,8 @@
Package: OpenOffice.org
Obtained from: http://download.go-oo.org/DEV300
Upstream authors: The OpenOffice.org and go-oo.org teams
-Debian package authors: Peter Novodvorsky, Jan Palic, Chris Halls, Rene Engelhard
+Debian package authors: Peter Novodvorsky, Jan Palic, Chris Halls,
+ Rene Engelhard
Debian copyright(s)/license(s):
Modifications and additions are free software; you can redistribute them
Reply to: