CVS:oo-deb/debian control.in,1.142.2.6.2.6,1.142.2.6.2.7 rules,1.214.2.14.2.11,1.214.2.14.2.12
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6211
Modified Files:
Tag: OPENOFFICE_ORG680
control.in rules
Log Message:
* add files in ooo-build to scripts/setperms
* readd kdelibs4-dev build-dep, move dmake dep to Debian only until updated in
Ubuntu
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.6
retrieving revision 1.142.2.6.2.7
diff -u -d -r1.142.2.6.2.6 -r1.142.2.6.2.7
--- control.in 20 Jan 2005 22:03:37 -0000 1.142.2.6.2.6
+++ control.in 21 Jan 2005 22:46:49 -0000 1.142.2.6.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], zlib1g-dev, 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, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, libpng12-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-dev, lsb-release %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%
+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], zlib1g-dev, 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, evolution-data-server-dev, libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, kdelibs4-dev, lsb-release %Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev% %Debian=dmake (>= 4.3-1
)%
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-1)
Standards-Version: 3.6.1
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.11
retrieving revision 1.214.2.14.2.12
diff -u -d -r1.214.2.14.2.11 -r1.214.2.14.2.12
--- rules 20 Jan 2005 22:03:37 -0000 1.214.2.14.2.11
+++ rules 21 Jan 2005 22:46:51 -0000 1.214.2.14.2.12
@@ -68,6 +68,7 @@
--with-system-zlib --with-system-freetype --with-system-jpeg \
--without-fonts --enable-fontconfig \
--with-system-mozilla \
+ --with-system-nas \
--with-ant-home=/usr/share/ant --disable-crashdump \
--with-system-python --disable-binfilter \
--disable-epm --without-myspell-dicts \
@@ -215,7 +216,6 @@
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
- chmod u+x ooo-build/configure ooo-build/bin/[a-z]* ooo-build/patches/apply.pl
cd ooo-build ; ../ooo-build/configure $(CONFIGURE_FLAGS)
touch $@
Reply to: