Index: debian/control =================================================================== --- debian/control (.../anbe-198-copyright) (revision 1847) +++ debian/control (.../anbe-199-control) (revision 1847) @@ -6,7 +6,7 @@ Andres Mejia , Russ Allbery Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers -Build-Depends: debhelper (>= 7), sed (>> 3.0), libxext6, bzip2, +Build-Depends: debhelper (>= 7), libxext6, bzip2, libc6-dev-i386 [amd64], lib32gcc1 [amd64], lib32z1 [amd64], ia32-libs (>= 20090804) [amd64] Standards-Version: 3.8.4 @@ -17,8 +17,6 @@ Pre-Depends: libc6-i386 (>= 2.9-18) Depends: nvidia-kernel-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends} Suggests: nvidia-settings, nvidia-kernel-source (>= ${nvidia:Version}) -Conflicts: nvidia-glx-src -Replaces: nvidia-glx-src Description: NVIDIA binary driver 32bit libs These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, TV-out and @@ -34,8 +32,6 @@ Architecture: i386 amd64 Depends: nvidia-kernel-${nvidia:Version}, x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends} Suggests: nvidia-settings, nvidia-kernel-source (>= ${nvidia:Version}) -Conflicts: nvidia-glx-src, nvidia-glx-dev (<< 1.0.8774-5) -Replaces: nvidia-glx-src Description: NVIDIA binary Xorg driver These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. @@ -168,11 +164,9 @@ Package: nvidia-kernel-source Section: non-free/kernel Architecture: i386 amd64 -Depends: debhelper (>= 7), make, sed (>> 3.0), quilt (>= 0.46-7~), +Depends: debhelper (>= 7), make, quilt (>= 0.46-7~), module-assistant, ${misc:Depends} -Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts -Conflicts: nvidia-kernel-src -Replaces: nvidia-kernel-src +Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package, devscripts Description: NVIDIA binary kernel module source This package builds the NVIDIA Xorg binary kernel module needed by nvidia-glx. The drivers provide optimized hardware acceleration Index: debian/changelog =================================================================== --- debian/changelog (.../anbe-198-copyright) (revision 1847) +++ debian/changelog (.../anbe-199-control) (revision 1847) @@ -12,6 +12,9 @@ * nvidia-kernel-source: bump debhelper dependency to 7 to match module packaging templates * merge debian.binary/copyright with debian/copyright.in + * debian/control: + - drop versioned Depends/Build-Depends satisfied in lenny + - drop Conflicts/Replaces for packages existing before lenny only -- Andreas Beckmann Sun, 11 Apr 2010 12:23:16 +0200