CVS:oo-deb/debian changelog,1.417.2.18,1.417.2.19 control.in,1.164.2.6,1.164.2.7 rules,1.253.2.7,1.253.2.8
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv9164/debian
Modified Files:
Tag: OPENOFFICE_ORG_1_1_4
changelog control.in rules
Log Message:
libwpd8 is now in sid, use it
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.417.2.18
retrieving revision 1.417.2.19
diff -u -d -r1.417.2.18 -r1.417.2.19
--- changelog 20 Mar 2005 13:38:28 -0000 1.417.2.18
+++ changelog 20 Mar 2005 22:56:24 -0000 1.417.2.19
@@ -2,9 +2,12 @@
* Modified patches:
- writerperfect-source-filter-oodocumenthandler-cxx.diff:
- #include <string.h>
+ #include <string.h> [RE]
* debian/control.in:
- - really tighten depends...
+ - really tighten depends... [RE]
+ - Build-Depend on libwpd8-dev [RE]
+ * debian/rules:
+ - --with-system-libwpd [RE]
-- Rene Engelhard <rene@debian.org> Sun, 20 Mar 2005 14:35:16 +0100
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.164.2.6
retrieving revision 1.164.2.7
diff -u -d -r1.164.2.6 -r1.164.2.7
--- control.in 20 Mar 2005 13:38:33 -0000 1.164.2.6
+++ control.in 20 Mar 2005 22:56:44 -0000 1.164.2.7
@@ -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: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, 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, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev, 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, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev, render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>= 4.6.2-1), libcupsys2-dev, kdelibs4-dev | ubuntu-artwork, libgnomevfs2-dev, libstartup-notification0-dev, libebook-dev, lsb-release, libwpd8-dev
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), libidn11 (<< 0.5.2-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.253.2.7
retrieving revision 1.253.2.8
diff -u -d -r1.253.2.7 -r1.253.2.8
--- rules 25 Feb 2005 12:12:16 -0000 1.253.2.7
+++ rules 20 Mar 2005 22:56:45 -0000 1.253.2.8
@@ -67,7 +67,8 @@
--enable-fontconfig \
--with-stlport4-home=$(STLPORT_HOME) \
--with-python=/usr/bin/python \
- --enable-libsn
+ --enable-libsn \
+ --with-system-libwpd
DEBHELPER_OPTIONS=
ifneq "$(DIST)" "Ubuntu"
Reply to: