Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv2566
Modified Files:
MANIFEST.i386 MANIFEST.powerpc MANIFEST.s390 MANIFEST.sparc
changelog control control.in openoffice.org-bin.install rules
Log Message:
- remove libcurl.so from MANIFEST.* and -bin.install
- --with-system-curl; mention it in the changelog
- add libcurl2-dev | libcurl-dev to Build-Depends:
Index: MANIFEST.s390
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.s390,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MANIFEST.s390 12 Dec 2003 16:40:10 -0000 1.19
+++ MANIFEST.s390 22 Dec 2003 21:31:51 -0000 1.20
@@ -165,7 +165,6 @@
usr/lib/openoffice/program/libcppuhelpergcc3.so.3
usr/lib/openoffice/program/libcppuhelpergcc3.so.3.1.0
usr/lib/openoffice/program/libctl645l3.so
-usr/lib/openoffice/program/libcurl.so
usr/lib/openoffice/program/libdate645l3.so
usr/lib/openoffice/program/libdba645l3.so
usr/lib/openoffice/program/libdbase645l3.so
Index: MANIFEST.i386
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.i386,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- MANIFEST.i386 12 Dec 2003 16:40:10 -0000 1.27
+++ MANIFEST.i386 22 Dec 2003 21:31:51 -0000 1.28
@@ -206,7 +206,6 @@
usr/lib/openoffice/program/libcppuhelpergcc3.so.3
usr/lib/openoffice/program/libcppuhelpergcc3.so.3.1.0
usr/lib/openoffice/program/libctl645li.so
-usr/lib/openoffice/program/libcurl.so
usr/lib/openoffice/program/libdate645li.so
usr/lib/openoffice/program/libdba645li.so
usr/lib/openoffice/program/libdbase645li.so
Index: MANIFEST.sparc
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.sparc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MANIFEST.sparc 12 Dec 2003 16:40:10 -0000 1.8
+++ MANIFEST.sparc 22 Dec 2003 21:31:51 -0000 1.9
@@ -165,7 +165,6 @@
usr/lib/openoffice/program/libcppuhelpergcc3.so.3
usr/lib/openoffice/program/libcppuhelpergcc3.so.3.1.0
usr/lib/openoffice/program/libctl645ls.so
-usr/lib/openoffice/program/libcurl.so
usr/lib/openoffice/program/libdate645ls.so
usr/lib/openoffice/program/libdba645ls.so
usr/lib/openoffice/program/libdbase645ls.so
Index: control.in
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- control.in 21 Dec 2003 20:07:37 -0000 1.111
+++ control.in 22 Dec 2003 21:31:52 -0000 1.112
@@ -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.13), 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-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
(libx11-dev, libsm-dev, libxt-dev. libxext-dev. libice-dev), libsane-dev
+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.13), 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-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
(libx11-dev, libsm-dev, libxt-dev. libxext-dev. libice-dev), libsane-dev,
libcurl2-dev | libcurl-dev
Standards-Version: 3.5.6
Package: openoffice.org
Index: rules
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- rules 21 Dec 2003 20:07:37 -0000 1.176
+++ rules 22 Dec 2003 21:31:52 -0000 1.177
@@ -52,7 +52,8 @@
--with-system-zlib \
--with-system-db --with-db-version=$(D) \
--with-system-nas \
- --with-system-sane
+ --with-system-sane \
+ --with-system-curl
# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
# JDK at /absolute/path/to/jdk.
@@ -104,7 +105,6 @@
ifneq (gcc-2.9,$(findstring gcc-2.9,$(shell readlink /usr/bin/gcc)))
_CC:=gcc
CXX:=g++
- #USE_SYSTEM_STLPORT=y
USE_SYSTEM_STLPORT=n
#CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
USE_FONTCONFIG=y
Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- changelog 21 Dec 2003 20:07:37 -0000 1.249
+++ changelog 22 Dec 2003 21:31:51 -0000 1.250
@@ -5,20 +5,21 @@
when building with it available [RE]
- sensible-browser: call sensible-browser for external programs
(HTTP/HTTPS/FTP) (closes: #222625) [RE]
- - system-db: build with system libdb3 [RE]
- - systen-nas: build with system libaudio [RE]
- nswrapper-mozilla-not-netscape: run mozilla in nswrapper.sh, not
netscape, patch taken from SuSE [RE]
+ - system-db: build with system libdb3 [RE]
+ - systen-nas: build with system libaudio [RE]
- system-sane: build with system sane.h [RE]
- system-freetype: merged patch; use sytem freetype and fix for freetype
2.1.7 [RE]
+ - system-curl: build with system curl [RE]
* Modified patches:
- - config-switches.diff: add --with-system-{db,nas,freetype,sane} [RE]
+ - config-switches.diff: add --with-system-{db,nas,freetype,sane,curl} [RE]
* debian/rules:
- Fix uudecode/encoding of OpenSymbol font [CH]
- select DebianWoody patchset for builds on woody [CH]
- --with-system-db --with-system-nas --with-system-freetype (except on
- woody), --with-system-sane
+ woody), --with-system-sane, --with-system-curl
* debian/control.in:
- Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
support now (thanks to Ozgur Murat Homurlu) [CH]
@@ -31,6 +32,10 @@
libice-dev) for not requiring xlibs-dev when it is only a
metapackage (as in X > 4.3.0-0pre1v5) [RE]
+ add libsane-dev [RE]
+ * debian/MANIFEST.*:
+ - remove curl and db pieces [RE]
+ * debian/openoffice.org*.install:
+ - remove curl and db pieces [RE]
* debian/openoffice.org-bin.config:
- ask prelink question only if prelink is installed, thanks nobse [RE]
* debian/openoffice.org-bin.templates.master:
@@ -38,7 +43,7 @@
* ooo-build/patches/OOO_1_1_0/apply:
- add a second patchset, DebianWoody [CH, RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 21 Dec 2003 16:11:59 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 22 Dec 2003 20:32:53 +0100
openoffice.org (1.1.0-3) unstable; urgency=low
Index: openoffice.org-bin.install
===================================================================
RCS file:
/home/halls/cvs/debian-openoffice/oo-deb/debian/openoffice.org-bin.install,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- openoffice.org-bin.install 11 Dec 2003 16:44:32 -0000 1.18
+++ openoffice.org-bin.install 22 Dec 2003 21:31:52 -0000 1.19
@@ -47,7 +47,6 @@
usr/lib/openoffice/program/libcppu.so.3.1.0
usr/lib/openoffice/program/libcppuhelpergcc3.so.3.1.0
usr/lib/openoffice/program/libctl645l[ips3].so
-usr/lib/openoffice/program/libcurl.so
usr/lib/openoffice/program/libdate645l[ips3].so
usr/lib/openoffice/program/libdba645l[ips3].so
usr/lib/openoffice/program/libdbase645l[ips3].so
Index: MANIFEST.powerpc
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/MANIFEST.powerpc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- MANIFEST.powerpc 12 Dec 2003 16:40:10 -0000 1.31
+++ MANIFEST.powerpc 22 Dec 2003 21:31:51 -0000 1.32
@@ -165,7 +165,6 @@
usr/lib/openoffice/program/libcppuhelpergcc3.so.3
usr/lib/openoffice/program/libcppuhelpergcc3.so.3.1.0
usr/lib/openoffice/program/libctl645lp.so
-usr/lib/openoffice/program/libcurl.so
usr/lib/openoffice/program/libdate645lp.so
usr/lib/openoffice/program/libdba645lp.so
usr/lib/openoffice/program/libdbase645lp.so
Index: control
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- control 21 Dec 2003 20:07:37 -0000 1.143
+++ control 22 Dec 2003 21:31:51 -0000 1.144
@@ -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.13), 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-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
(libx11-dev, libsm-dev, libxt-dev. libxext-dev. libice-dev), libsane-dev
+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.13), 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-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev,
xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev |
(libx11-dev, libsm-dev, libxt-dev. libxext-dev. libice-dev), libsane-dev,
libcurl2-dev | libcurl-dev
Standards-Version: 3.5.6
Package: openoffice.org
