CVS:oo-deb/debian control,1.149,1.150 control.in,1.116,1.117

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv30850

Modified Files:
	control control.in 
Log Message:
*sigh* forgot to change the 0pre3 I did for testing back to 0pre1; doing now...

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- control	28 Jan 2004 21:20:44 -0000	1.149
+++ control	28 Jan 2004 21:22:14 -0000	1.150
@@ -4,7 +4,7 @@
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
 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, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
+Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre1)
 Standards-Version: 3.5.6
 
 Package: openoffice.org

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- control.in	28 Jan 2004 21:20:44 -0000	1.116
+++ control.in	28 Jan 2004 21:22:14 -0000	1.117
@@ -4,7 +4,7 @@
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
 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, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev
-Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3)
+Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre1)
 Standards-Version: 3.5.6
 
 Package: openoffice.org