Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv25438/debian
Modified Files:
README changelog control control.in rules
Log Message:
- build with system libneon23 on sid
(in NEW, available from people.debian.org/~rene/openoffice.org/neon)
- minor README beautifications/fixes
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- rules 20 Apr 2004 16:17:15 -0000 1.199
+++ rules 22 Apr 2004 06:40:31 -0000 1.200
@@ -123,8 +123,8 @@
CONFIGURE_FLAGS+= --with-system-myspell
USE_SYSTEM_DB=y
CONFIGURE_FLAGS+= --with-system-db --with-db-version=$(D) \
- --with-system-altlinuxhyph --with-system-curl
- #CONFIGURE_FLAGS+= --with-system-neon
+ --with-system-altlinuxhyph --with-system-curl \
+ --with-system-neon
PATCHSET=Debian
PYTHON=/usr/bin/python
PYMAJOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- control.in 20 Apr 2004 16:03:00 -0000 1.130
+++ control.in 22 Apr 2004 06:40:31 -0000 1.131
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp |
gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev
| g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc],
libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev |
xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev |
xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) |
g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc],
libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev |
xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc]
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp |
gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev
| g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc],
libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev |
xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev |
xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) |
g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc],
libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev |
xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc],
libneon23-dev | g++-3.0 [!powerpc]
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4)
Standards-Version: 3.6.1
Index: README
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/README,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- README 20 Apr 2004 15:29:13 -0000 1.32
+++ README 22 Apr 2004 06:40:31 -0000 1.33
@@ -29,7 +29,8 @@
$DEB_BUILD_OPTIONS under pbuilder (this has no effect on speed,
though because the cache does not persist in pbuilder)
- -Pn - run n processes in parallel in dmake -equivalent to
MAKEFLAGS=-jn.
+ -Pn - run n processes in parallel in dmake -equivalent to
+ MAKEFLAGS=-jn.
There are still some projects which fail, see IssueZilla #9443
-PPn - enable n projects to be built in parallel (-P flag to build.pl).
@@ -61,20 +62,24 @@
Building Woody backports
------------------------
-The package scripts are designed to run slighly differently when building on
Woody (i386):
-Instead of requiring lots of extra libraries to be backported (such as
libfreetype), we
-use OOo's internal versions of the libraries instead. This means the
resulting packages
-have no extra runtime dependencies that must be satisfied when installing on a
Woody system.
+The package scripts are designed to run slighly differently when building on
+Woody (i386):
+Instead of requiring lots of extra libraries to be backported (such as
+libfreetype), we use OOo's internal versions of the libraries instead. This
+means the resulting packages have no extra runtime dependencies that must be
+satisfied when installing on a Woody system.
-To build on Woody, you need to install these packages from non-woody sources:
+To build on Woody, you need to install these packages from non-woody sources
+(These are only build-time dependencies):
- - dmake and debhelper from the woody section of the Debian OpenOffice.org
mirrors
- - a backport of xlstproc, version 1.30 or above. This is only a build-time
dependency.
+ - dmake and debhelper from the woody section of the Debian OpenOffice.org
+ mirrors
+ - a backport of xlstproc, version 1.30 or above.
-Then, you should install these packages. They satisfy the alternative build
dependencies
-which 'apt-get build-dep' will not install automatically for you:
+Then, you should install the following packages. They satisfy the alternative
+build dependencies which 'apt-get build-dep' will not install automatically
for you:
- - gcc-3.0 gimp-1.2 xlibs-dev
+ - gcc-3.0 gimp1.2 xlibs-dev
After you have installed those packages, use 'dpkg-checkbuilddeps' to get a
list of the remaining required dependencies, which can all be satisfied from
@@ -91,7 +96,8 @@
DEB_BUILD_OPTIONS. You will also need libcrimson-java, libxalan-java, and
libxalan2-java, in addition to the standard build dependencies.
-We are working on adding support for other JDKs to OOo. See this issue for
progress:
+We are working on adding support for other JDKs to OOo. See this issue for
+progress:
http://www.openoffice.org/issues/show_bug.cgi?id=10477
The targets that are built during the package build
@@ -104,7 +110,8 @@
libstlport tree, fix some file permissions.
configure - Run configure in config_office. This creates the settings file
- in the build root, which is sourced by the other targets in
tcsh.
+ in the build root, which is sourced by the other targets in
+ tcsh.
bootstrap - Bootstrap the solver environment, by building these projects:
dmake, external, xml2cmp, sal, vos, soltools.
@@ -116,8 +123,8 @@
This is the install set that is distributed by upstream in
tar.gz format.
-setupins - For all other languages, build just the 'setup.ins', which is
used to
- generate language packs by our scripts.
+setupins - For all other languages, build just the 'setup.ins', which is
+ used to generate language packs by our scripts.
setup - Run OOo network install from the instsetoo directory,
installing to debian/tmp
@@ -169,8 +176,8 @@
execute:
debian/rules builduntil-transex3
-buildprj - Build only one a particular project. Set PRJ to the name
of
- the project:
+buildprj - Build only one a particular project. Set PRJ to the name
+ of the project:
debian/rules buildprj PRJ=tools
Build system file layout
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- changelog 20 Apr 2004 16:20:12 -0000 1.305
+++ changelog 22 Apr 2004 06:40:31 -0000 1.306
@@ -9,18 +9,20 @@
the xlibs-split, remove unneccessary xlibs-pic (>= 4.2.1-6) piece
since it is a metapackage and we already have xlibs-static-pic there [RE]
- do not require python-dev on woody [RE]
+ - add libneon23-dev | g++-3.0 [!powerpc] [RE]
* debian/rules:
- add support for building using KDE icon set, use
DEB_BUILD_OPTIONS=kdeicons [CH]
- build with system-python only on sid, woody's default python is too
old [RE]
+ - build with system-neon on sid [RE]
* debian/scripts/vars:
- add KDE icon locations [CH]
* debian/README:
- add a section about how to build the Woody backport [CH]
- document DEB_BUILD_OPTIONS=kdeicons [CH]
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 20 Apr 2004 17:58:47 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 22 Apr 2004 08:29:46 +0200
openoffice.org (1.1.1-2) unstable; urgency=high
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- control 20 Apr 2004 16:00:55 -0000 1.163
+++ control 22 Apr 2004 06:40:31 -0000 1.164
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp |
gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev
| g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc],
libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev |
xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev |
xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) |
g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc],
libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev |
xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc]
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.8), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp |
gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev
| g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0 [!powerpc],
libaudio-dev | nas-dev, xlibs-static-pic | g++-3.0 [!powerpc], libx11-dev |
xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev |
xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) |
g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc],
libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev |
xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc],
libneon23-dev | g++-3.0 [!powerpc]
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4)
Standards-Version: 3.6.1
