Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv26183/debian
Modified Files:
changelog control control.in
Log Message:
* substitute g++-3.0 [!powerpc] conditionals with dpkg-dev (<< 1.10)
because some people still have g++-3.0 installed on their sid boxes -
thanks Sebastien Bacher for reporting and Adam Conrad for the hint
* tell why the urgency is medium and change system neon changelog entry
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- changelog 18 May 2004 16:36:45 -0000 1.323
+++ changelog 19 May 2004 14:08:26 -0000 1.324
@@ -1,5 +1,6 @@
openoffice.org (1.1.1-2.3pre) unstable; urgency=medium
+ * Urgency because of several FTBFSes and security-bug in neon..
* New patches:
- print-resolution-generic: improve generic printer, resolution [MM]
- build-arch-flags: support ARCH_FLAGS to change compiler flags
@@ -30,12 +31,15 @@
+ add libneon23-dev | g++-3.0 [!powerpc] [RE]
+ add libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [!powerpc] [RE]
+ add libcupsys2-dev [RE]
+ + substitute g++-3.0 [!powerpc] conditionals with dpkg-dev (<< 1.10)
+ because some people still have g++-3.0 installed on their sid boxes -
+ thanks Sebastien Bacher for reporting and Adam Conrad for the hint [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]
+ - build with secuity-fixed system-neon on sid [RE]
- remove .orig files that would (probably) otherwise get into install
set (closes: #247781) [CH, RE]
- build with system STLport; do not create useless stlport-home, just
@@ -60,7 +64,7 @@
* debian/openintro_debian.xcf.uu: modified for better text and Debian logo
alignment [MK]
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 18 May 2004 15:40:11 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 19 May 2004 16:01:08 +0200
openoffice.org (1.1.1-2) unstable; urgency=high
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- control.in 18 May 2004 16:34:22 -0000 1.135
+++ control.in 19 May 2004 14:08:26 -0000 1.136
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
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],
libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 4.6.2-1) | g++-3.0
[!powerpc], libcupsys2-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.8), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | dpkg-dev (<< 1.10),
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
| dpkg-dev (<< 1.10), libdb3++-dev | libdb++-dev | dpkg-dev (<< 1.10),
libaudio-dev | nas-dev, xlibs-static-pic | dpkg-dev (<< 1.10), 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) |
dpkg-devi (<< 1.10), libmyspell-dev (>= 1:3.1-1) | dpkg-dev (<< 1.10),
libaltlinuxhyph-dev |
dpkg-dev (<< 1.10), libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev |
xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | dpkg-dev (<< 1.10),
libneon23-dev | dpkg-dev (<< 1.10), libstlport4.6-dev (>= 4.6.2-1) | dpkg-dev
(<< 1.10), libcupsys2-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)
Standards-Version: 3.6.1
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- control 18 May 2004 16:34:22 -0000 1.168
+++ control 19 May 2004 14:08:26 -0000 1.169
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
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],
libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 4.6.2-1) | g++-3.0
[!powerpc], libcupsys2-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.8), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | dpkg-dev (<< 1.10),
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
| dpkg-dev (<< 1.10), libdb3++-dev | libdb++-dev | dpkg-dev (<< 1.10),
libaudio-dev | nas-dev, xlibs-static-pic | dpkg-dev (<< 1.10), 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) |
dpkg-devi (<< 1.10), libmyspell-dev (>= 1:3.1-1) | dpkg-dev (<< 1.10),
libaltlinuxhyph-dev |
dpkg-dev (<< 1.10), libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev |
xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | dpkg-dev (<< 1.10),
libneon23-dev | dpkg-dev (<< 1.10), libstlport4.6-dev (>= 4.6.2-1) | dpkg-dev
(<< 1.10), libcupsys2-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)
Standards-Version: 3.6.1
