./packages/openofficeorg/2.4/unstable r1028: also build-conflict against nvidia-glx-legacy-dev
------------------------------------------------------------
revno: 1028
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-03-19 14:16:11 +0100
message:
also build-conflict against nvidia-glx-legacy-dev
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-03-19 09:29:36 +0000
+++ b/changelog 2008-03-19 13:16:11 +0000
@@ -6,8 +6,9 @@
depend on unotools (closes: #471633)
* debian/control.in:
- remove obsolete libsndfile1-dev builddep
+ - also build-conflict against nvidia-glx-legacy-dev
- -- Rene Engelhard <rene@debian.org> Wed, 19 Mar 2008 10:19:59 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 19 Mar 2008 14:15:36 +0100
openoffice.org (1:2.4.0~rc6-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-03-18 20:26:24 +0000
+++ b/control 2008-03-19 13:16:11 +0000
@@ -4,7 +4,7 @@
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxtst-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , g++-4.3 [s390], gcc-4.3 [s390] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libboost-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm s390 amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm s390 amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386 powerpc sparc mips mipsel arm s390 amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm armel s390 amd64 ppc64 ia64]
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4/experimental
=== modified file 'control.in'
--- a/control.in 2008-03-18 20:26:24 +0000
+++ b/control.in 2008-03-19 13:16:11 +0000
@@ -50,7 +50,7 @@
gperf [%OOO_ARCHS%],
libpq-dev [%OOO_ARCHS%]
%BUILD_DEPS%
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4/experimental
Reply to: