diff -urN debian.old/changelog debian/changelog --- debian.old/changelog 2007-08-17 23:56:22.000000000 +0200 +++ debian/changelog 2007-08-18 07:24:33.000000000 +0200 @@ -1,3 +1,13 @@ +linux-restricted-modules-2.6.20 (2.6.20.5-16.30) feisty-security; urgency=low + + * Add nvidia-glx-new.*.in to debian/ so that the link and modules for the latest + driver can be added separately from the legacy drivers. + * Add libnvidia-wfb.so.$$this_ver to nvidia-glx-new in debian/rules + * Add libwfb.so as a link to libnvidia-wfb.so.$$this_ver in + debian/nvidia-glx-new.links.in and in debian/nvidia-glx-new.links.amd64.in + + -- Alberto Milone (tseliot) Sat, 18 Aug 2007 07:18:00 +0200 + linux-restricted-modules-2.6.20 (2.6.20.5-16.29) feisty-security; urgency=low * madwifi update to 0.9.3.1: diff -urN debian.old/changelog~ debian/changelog~ --- debian.old/changelog~ 1970-01-01 01:00:00.000000000 +0100 +++ debian/changelog~ 2007-08-18 07:24:15.000000000 +0200 @@ -0,0 +1,1582 @@ +linux-restricted-modules-2.6.20 (2.6.20.5-16.30) feisty-security; urgency=low + + * Add nvidia-glx-new.*.in to debian/ so that the link and modules for the latest + driver can be added separately from the legacy drivers. + * Add libnvidia-wfb.so.$$this_ver to nvidia-glx-new in debian/rules + * Add libwfb.so as a link to libnvidia-wfb.so.$$this_ver in + debian/nvidia-glx-new.links.in and in debian/nvidia-glx-new.links.amd64.in + + -- Alberto Milone (tseliot) Sat, 18 Aug 2007 07:18:00 +0200 + +linux-restricted-modules-2.6.20 (2.6.20.5-16.29) feisty-security; urgency=low + + * madwifi update to 0.9.3.1: + CVE-2006-7180 - http://madwifi.org/changeset/1760 + CVE-2006-7177 - http://madwifi.org/changeset/1818 + CVE-2006-7178 - http://madwifi.org/changeset/1818 + CVE-2006-7179 - http://madwifi.org/changeset/1762 + + -- Tim Gardner Fri, 25 May 2007 10:24:28 -0600 + +linux-restricted-modules-2.6.20 (2.6.20.5-16.28) feisty-security; urgency=low + + * ABI bump for -16. + + -- Phillip Lougher Wed, 23 May 2007 19:53:52 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.5-15.20) feisty; urgency=low + + * ABI bump for -15. + + -- Colin Watson Fri, 13 Apr 2007 13:37:30 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.19) feisty; urgency=low + + * debian/linux-restricted-modules-common.modprobe: Add line for nvidia_new, + so that it does not get autoloaded on boot. (LP: #105593) + + -- Martin Pitt Thu, 12 Apr 2007 07:50:30 +0000 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.18) feisty; urgency=low + + * Fix typo in last change to really fix ppc build failure. + + -- Ben Collins Tue, 10 Apr 2007 18:06:52 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.17) feisty; urgency=low + + * Do not do ath supported for powerpc64-smp. Fixes FTBFS on ppc. + + -- Ben Collins Tue, 10 Apr 2007 12:18:32 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.16) feisty; urgency=low + + * Change nvidia back to 9631, add epoch for nvidia-glx packages. + * Add nvidia-news package at version 9755. This is the path of least + surprise. + * Add module alias override patch from Johan Kiviniemi + . + + -- Ben Collins Tue, 10 Apr 2007 00:16:00 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.4-14.15) feisty; urgency=low + + * ABI bump for -14. + + -- Colin Watson Thu, 5 Apr 2007 12:46:12 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.4-13.14) feisty; urgency=low + + * Don't fail if debian/d-i/{modules,firmware}/$(DEB_HOST_ARCH) doesn't + exist. + + -- Colin Watson Mon, 2 Apr 2007 09:29:17 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.4-13.13) feisty; urgency=low + + * Build generic flavour udebs for i386 (LP: #85362). + * Ship debian/control.stub as debian/control, and build the real control + file on the fly with the udebs for just the current architecture. This + is nasty, I know, but kernel-wedge can't consolidate the multiple + stanzas for nic-restricted-*-generic-di and debhelper doesn't like there + being more than one stanza for a given package name. + + -- Colin Watson Mon, 2 Apr 2007 01:31:28 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.4-13.12) feisty; urgency=low + + * madwifi: Update to v0.9.3. + * ABI bump for -13. + + -- Ben Collins Wed, 21 Mar 2007 22:10:24 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.3-12.11) feisty; urgency=low + + * ABI bump for -12 + + -- Ben Collins Sun, 18 Mar 2007 00:20:23 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.3-11.10) feisty; urgency=low + + * Bump ABI for -11. + + -- Ben Collins Thu, 15 Mar 2007 08:41:26 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.3-10.9) feisty; urgency=low + + * ABI bump to -10. + * Update ATI driver to 8.34.8 + + -- Ben Collins Mon, 12 Mar 2007 12:01:06 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.2-9.8) feisty; urgency=low + + * ABI bump to -9. + + -- Ben Mon, 26 Feb 2007 12:01:12 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.2-8.7) feisty; urgency=low + + * Fix vmware post inst/rm. + + -- Ben Collins Sat, 17 Feb 2007 18:30:08 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.2-8.6) feisty; urgency=low + + * ABI bump for -8.14 + * Update ATI driver to 8.33.6. + + -- Ben Collins Mon, 12 Feb 2007 14:58:39 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-7.5) feisty; urgency=low + + * Fix vmware kernel module post inst/rm calls for depmod. + * ABI bump for -7.12 + + -- Ben Collins Mon, 5 Feb 2007 10:43:56 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.4) feisty; urgency=low + + * Beat me with a stick. + * Fix the powerpc build, finally. + + -- Ben Collins Mon, 5 Feb 2007 06:30:09 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.3) feisty; urgency=low + + * madwifi: Switch ppc and others to elf-hal, like i386/x86_64/ia64. + + -- Ben Collins Mon, 5 Feb 2007 03:50:22 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.2) feisty; urgency=low + + * Add madwifi-0.9.3-wip patch, taken from svn trunk. Should fix atheros + crashes. + + -- Ben Collins Sun, 4 Feb 2007 12:24:04 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.1) feisty; urgency=low + + * ABI bump for 2.6.20-6.7 + * Version match with kernel ABI. + + -- Ben Collins Tue, 9 Jan 2007 20:21:58 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6) feisty; urgency=low + + * ABI bump for 2.6.20-5.7 + + -- Ben Collins Sat, 6 Jan 2007 12:01:38 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-5) feisty; urgency=low + + * ABI bump for 2.6.20-4.5. + + -- Ben Collins Wed, 3 Jan 2007 21:04:07 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-4) feisty; urgency=low + + * vmware-server: Add server(amd64,i386) and server-bigiron(i386) flavours. + * vmware-tools: Add server(amd64,i386) flavours. + * Add build-dep for server/server-bigiron headers. + * ABI bump for 2.6.20-3 + + -- Ben Collins Mon, 18 Dec 2006 18:03:37 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-3) feisty; urgency=low + + * Revert ATI kernel module build to use syscall entries. Had to add i386 and + amd64 versions of these deprecated macros. + + -- Ben Collins Mon, 18 Dec 2006 11:37:04 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-2) feisty; urgency=low + + * Disable vmdesched on x86_64. Fixes FTBFS. + + -- Ben Collins Sun, 17 Dec 2006 00:06:12 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-1) feisty; urgency=low + + * Bump and first release for 2.6.20-2. + + -- Ben Collins Sun, 10 Dec 2006 21:11:08 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.3-2) feisty; urgency=low + + * Bump ABI to -7. + * Add lowlatency target for x86 and x86_64. + + -- Ben Collins Wed, 29 Nov 2006 09:05:06 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.3-1) feisty; urgency=low + + * Update ATI drivers to 8.31.5. + + -- Ben Collins Tue, 21 Nov 2006 21:30:36 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.2-2) feisty; urgency=low + + * ati: Fix typo which caused xorg modules to not be installed on amd64. + + -- Ben Collins Tue, 21 Nov 2006 20:51:54 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.2-1) feisty; urgency=low + + * Upgrade nvidia drivers to 1.0-9629 + + -- Ben Collins Mon, 20 Nov 2006 19:34:15 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.1-1) feisty; urgency=low + + * First release for 2.6.19. + + [madwifi] + + * Remove includes for linux/config.h + * Fix irq handler declarations + * Disable -Werror, since some crypto functions produce warnings due to being + obsolete. + + [vmware-player] + + * CHECKSUM_HW -> CHECKSUM_COMPLETE + + [ltmodem] + + * Fix irq handler declarations + * Remove includes for linux/config.h + + [ati] + + * Update driver to 8.29.6. Now uses a single shar for both x86 and x86_64. + * Reworked build setup for new packaging. + + [nvidia] + + * Fix irq handler declarations + * Remove includes for linux/config.h + + [fritz] + + * Remove includes for linux/config.h + * Fix irq handler declarations + + -- Ben Collins Wed, 1 Nov 2006 13:46:06 -0500 + +linux-restricted-modules-2.6.17 (2.6.17.5-11) edgy; urgency=low + + * nvidia/nvidia-glx-config: Use modprobe with -i when checking for the + nvidia module, since it will not load before xorg.conf gets changed. + Closes: LP#66908 + + -- Martin Pitt Thu, 19 Oct 2006 15:36:24 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.5-10) edgy; urgency=low + + * Introduce /sbin/lrm-video to do detection of the current Xorg driver, + and load the right (nvidia/nvidia_legacy/fglrx or none) module. + * Remove the modprobe hack that was used for the above, and replace with + a much simpler modprobe.d snippet that just calls the above script. + * Make nvidia-glx, nvidia-glx-legacy, and xorg-driver-fglrx depend on + linux-restricted-modules-common to get the above script when wanted. + * Disable building and shipping madwifi for powerpc64-smp, since we don't + have a powerpc64 binary blob provided by upstream (yet, here's hoping). + * Fix the clean target to get rid of vmware-player-kernel-modules.postrm. + + -- Adam Conrad Mon, 9 Oct 2006 15:36:47 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.5-9) edgy; urgency=low + + * Use the /.../I GNU extension to sed to match and replace + case-insensitively instead of using /usr/bin/tr, otherwise people with + /usr on a separate partition won't get the fglrx module loaded. + + -- Scott James Remnant Wed, 4 Oct 2006 10:03:48 +0100 + +linux-restricted-modules-2.6.17 (2.6.17.5-8) edgy; urgency=low + + * Don't allow the fglrx module to be loaded if it's not used in + xorg.conf + + -- Scott James Remnant Tue, 3 Oct 2006 10:30:01 +0100 + +linux-restricted-modules-2.6.17 (2.6.17.5-7) edgy; urgency=low + + * Fix FTBFS on powerpc, s/powerpc-smp,/powerpc-smp/ in debian/rules. + + -- Adam Conrad Tue, 3 Oct 2006 13:27:50 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.5-6) edgy; urgency=low + + * Add powerpc64-smp target on powerpc. + - Malone #63197 + + -- Ben Collins Sun, 1 Oct 2006 12:11:00 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-5) edgy; urgency=low + + * ABI bump to -10. + + -- Ben Collins Tue, 26 Sep 2006 10:20:26 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-4) edgy; urgency=low + + * ABI bump to -9 + + -- Tollef Fog Heen Fri, 22 Sep 2006 13:49:43 +0200 + +linux-restricted-modules-2.6.17 (2.6.17.5-3) edgy; urgency=low + + * Temporary fixup for default acx111 v16 and v17 firmware. Set default to + 1.2.1.34. Next time the .orig.tar.gz is recreated, remove the default + symlinks, and we'll always generate them in the rules file. + + -- Ben Collins Tue, 19 Sep 2006 12:17:37 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-2) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-8.21. + + -- Ben Collins Mon, 18 Sep 2006 11:02:00 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-1) edgy; urgency=low + + * ABI bump. + * Include vmware-player modules. vmware-server modules coming soon. + * Rework package names based on recent kernel changes. + * Add vmware-player vmmon and vmnet kernel modules. These are from + vmware-player 1.0.2. + + -- Ben Collins Wed, 30 Aug 2006 13:00:06 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.4-1) edgy; urgency=low + + * Repack the orig with the correct nvidia-legacy package for amd64, this + time including 32-bit libraries. Revert the previous change to cope. + + -- Adam Conrad Wed, 30 Aug 2006 19:01:32 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.3-2) edgy; urgency=low + + * Adjust some static strings in debian/rules to cope with nvidia changing + the filename for the amd64 nvidia-legacy package, resolving amd64 FTBFS. + + -- Adam Conrad Wed, 30 Aug 2006 11:09:14 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.3-1) edgy; urgency=low + + * Update fglrx to new upstream 8.28.8, required to support edgy's Xorg 7.1: + - Include links in xorg-driver-fglrx for the new libfglrx_tvout library. + - Include binaries from /usr/sbin and manpages from /usr/share/man/man8. + * Update non-legacy NVIDIA driver to new upstream 1.0.8774 and legacy NVIDIA + driver to new upstream 1.0.7184, both required for Xorg 7.1 support. + * Bump xserver-xorg-core dependencies to (>= 1:1.1.1) for the above changes. + + -- Adam Conrad Tue, 29 Aug 2006 22:16:27 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.2-1) edgy; urgency=low + + * ipw3945: Update ipw3945d to 1.7.22. + * madwifi: Remove legacy and ng drivers. Replace with stock madwifi-ng 0.9.2 + driver. + * dvb: Added dvb firmware. + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-6.17. + + -- Ben Collins Wed, 9 Aug 2006 14:37:41 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.1-6) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-5.9. + + -- Colin Watson Sat, 15 Jul 2006 18:42:13 +0100 + +linux-restricted-modules-2.6.17 (2.6.17.1-5) edgy; urgency=low + + * Provides: xserver-xorg-video instead of xserver-xorg-driver. + + -- Fabio M. Di Nitto Thu, 13 Jul 2006 13:58:25 +0200 + +linux-restricted-modules-2.6.17 (2.6.17.1-4) edgy; urgency=low + + * debian/nvidia-glx.dirs.in: Add missing /usr/lib32/nvidia to fix ia32-libs + installation breakage when nvidia-glx is installed (otherwise the + libGL.so.1.2 diversion points into a nonexisting directory). + + -- Martin Pitt Thu, 13 Jul 2006 10:36:35 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-3) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-4.5. + + -- Ben Collins Fri, 30 Jun 2006 14:54:34 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-2) edgy; urgency=low + + * Work around buggy binutils by not stripping pre-build nvidia libs. + + -- Ben Collins Thu, 29 Jun 2006 18:14:21 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-1) edgy; urgency=low + + * 2.6.17 kernel, glad to meet ya. + * s/ia32-libs/libc6-i386/ on amd64 build-deps. + * Use gcc on non-hppa, instead of gcc-4.0. + * ATI + - Add patch to fix no_iommu missing error. + - Add patch to rework the makefile, since it's targets were clashing + somehow with kbuil built-in targets. + * Nvidia + - Update legacy driver to 7182 + * Fritz + - Disable fcpcmcia and fcpcmcia_cs. No longer build, no longer supported. + + -- Ben Collins Tue, 27 Jun 2006 21:05:50 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.11-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-24. + + -- Ben Collins Fri, 9 Jun 2006 15:36:34 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.11-1) dapper; urgency=low + + * Update non-legacy NVIDIA driver to 1.0.8762, legacy still at 1.0.7174: + - Added support for QuadroFX 4500 X2, FX 5500, FX 3500, and FX 1500. + - Confirmed that it fixes dual DVI connections, which weren't working + at all in the last driver, on any card (closes: launchpad.net/42258) + - Confirmed that this new version can drive several laptops sporting + 5x00go chipsets that both the previous drivers refused to work with. + * Update fglrx to 8.25.18, now claiming to "officially" support Xorg 7.0: + - Add support for FireGL V7350, V7300, V7200, V5200, V3400, V3350, V2200. + - Confirmed that running two simultaneous Xservers no longer hardlocks. + - Fixes segfaults on Xserver init with several of the new X1xxx cards. + - Confirmed fix for shutdown hangs on at least two different machines. + - Confirmed fix for hangs on VT switch on my ATI Radeon Mobility M300. + * Make nvidia-glx and xorg-driver-fglrx provide xserver-xorg-driver, so + people can remove all their other drivers and streamline their systems. + * Only build ltmodem on the 386 kernel, as it's been shown to not behave + on SMP kernels, causing kernels to panic (closes: launchpad.net/46685) + * Mangle the *modnames structs in madwifi-ng, fixing the internal module + system, so the driver isn't stillborn (closes: launchpad.net/47137) + + -- Adam Conrad Mon, 29 May 2006 02:30:08 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.10-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-23. + + -- Ben Collins Thu, 18 May 2006 12:31:19 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.10-1) dapper; urgency=low + + * Add madwifi-ng support + + -- Matthew Garrett Tue, 16 May 2006 13:45:04 +0100 + +linux-restricted-modules-2.6.15 (2.6.15.9-4) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-22. + + -- Adam Conrad Mon, 8 May 2006 11:42:20 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-3) dapper; urgency=low + + * Add patch from madwifi upstream to fix usage of the pm_message_t type + on recent kernels (version 2.6.11 and higher), which eliminates some + compiler warnings, and may make suspend/resume happier with madwifi. + * Brown paper bag fix: add a missing semicolon in the build-udebs rule. + + -- Adam Conrad Mon, 24 Apr 2006 00:29:32 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-2) dapper; urgency=low + + * Mangle the build-udebs target in debian/rules to conditionalise it to + only try to copy the bits we want when we have them, fixing the build + failure introduced on powerpc when I added ipw3945d to the nic udeb. + + -- Adam Conrad Sun, 23 Apr 2006 23:49:22 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-1) dapper; urgency=low + + * Update fglrx to 8.24.8, which includes support for the Radeon X1n00 series + and the Mobility Radeon X1n00 series cards (closes: launchpad.net/39924) + * Include the binary-only ipw3945 daemon to go with the driver that has been + added to the latest Ubuntu kernel series (closes: launchpad.net/36684) + * Include a modprobe.d file for ipw3945 that loads the ipw3945d daemon when + the module is loaded, and kills it off before the module is unloaded. + * Add the above ipw3945d hacks to the nic-restricted-modules udebs for d-i. + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-21. + + -- Adam Conrad Sat, 22 Apr 2006 02:23:52 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.8-1) dapper; urgency=low + + * Update non-legacy NVIDIA driver to 1.0.8756, legacy still at 1.0.7174: + - Drop patches 001 through 006, all incorporated in the new version. + - Includes improved power management support, and support for all the + latest/shiniest NVIDIA hardware, (closes: launchpad.net/{38637,35628}) + * Fix whitespace in fglrx rules file (closes: launchpad.net/{32576,23250}) + * Stop having nvidia-glx-enable add the nvidia kernel modules to the end + of /etc/modules, since it is properly autoloaded by the X server. This + stops us breaking /etc/modules as a bonus (closes: launchpad.net/27579) + + -- Adam Conrad Mon, 10 Apr 2006 14:51:39 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.7-4) dapper; urgency=low + + * Test for /sbin/lrm-manager in our init script, for the case where we + have been removed, rather than purged (closes: launchpad.net/36705) + * Call ld with the '-d' switch in lrm-manager, to assign space in the + final ltmodem object for common symbols (closes: launchpad.net/37321) + * Install the missing libnvidia-cfg.so.1 (closes: launchpad.net/34912) + * Kernel ABI bump for linux-source-2.6.15 2.6.15-20. + + -- Adam Conrad Wed, 5 Apr 2006 14:15:27 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.7-3) dapper; urgency=low + + * Incorporate patch by Robert Love and Dan Williams needed for WPA support + in NetworkManager 0.6.0, backported to madwifi-old by Johan Kiviniemi. + * nvidia-glx (but not -legacy) needs to conflict with nvidia-xconfig, as + we've recently absorbed that binary as well (closes: launchpad.net/6600) + + -- Adam Conrad Sat, 18 Mar 2006 04:36:08 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.7-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-19. + + -- Ben Collins Mon, 20 Mar 2006 16:21:45 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.7-1) dapper; urgency=low + + * Update to fglrx 8.23.7, including support for a wide range of desktop + and mobile Radeon X800 and X850 series video cards, as well as FSAA. + * Freshen AVM Fritz drivers to the latest upstream builds (still 3.11) + * Kernel ABI bump for linux-source-2.6.15 2.6.15-18. + + -- Adam Conrad Fri, 10 Mar 2006 11:51:14 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.6-3) dapper; urgency=low + + * Stop using the hideous "mangle TLS symlinks on boot" hack, which was + second-guessing our linker (which appears to do the right thing anyway) + - Removed the init script and /etc/default fragment from nvidia-glx + - Install TLS libraries directly to /usr/lib/tls and /usr/lib32/tls. + * Make nvidia-glx-config use /var/lib/x11 instead of /var/lib/xfree86. + * These changes fix launchpad.net/33456 and launchpad.net/{32878,29234} + + -- Adam Conrad Tue, 7 Mar 2006 14:21:22 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.6-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-17. + + -- Ben Collins Fri, 3 Mar 2006 07:30:19 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.6-1) dapper; urgency=low + + * Update fglrx to 8.22.5 (UVF exception granted by mdz) which, among + other things, finally claims to "officially" support kernel 2.6.15. + * Drop ati/patches/fglrx-2.6.15.patch, which is no longer necessary. + * Add proper symlinks and shlibs for the new libfglrx_dm library. + * Add .so symlinks to xorg-driver-fglrx-dev for the libraries we ship. + * Kernel ABI bump for linux-source-2.6.15 2.6.15-16. + + -- Adam Conrad Tue, 21 Feb 2006 17:51:20 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.5-2) dapper; urgency=low + + * Change boot-time message. + + -- Scott James Remnant Wed, 8 Feb 2006 14:54:08 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.5-1) dapper; urgency=low + + * Change maintainer to the Ubuntu Kernel Team, in an attempt to do a + soft transition from sole maintenance to handing over to Ben and Co. + * Update fglrx to version 8.21.7, which claims to support OpenGL 2.0. + * Adjust for the corrected SONAMEs (thanks, ATI!) of libfglrx_gamma.so.1 + and libfglrx_pp.so.1 (used to be libfglrx_pp.1 and libfglrx_gamma.1) + * Drop ati/patches/panel_fglrx_pp_proto.patch, fixed in upstream source. + * nvidia-glx conflicts with nvidia-settings, as we now ship that binary + ourselves directly from upstream sources (Closes launchpad.net/27040) + * Add nvidia/patches/003_NVIDIA_kernel-1.0-8178-change_page_attr.patch, + resolving crashes with some broken implementations of change_page_attr() + * Add nvidia/patches/004_NVIDIA_kernel-1.0-8178-gcc-4.1_fix.patch, making + the compiler tests more robust in the face of recent GCC 4.x changes. + * Add nvidia/patches/005_NVIDIA_kernel-1.0-8178-2.6.15-git8.patch, fixing + a build failure with certain versions of the linux source (not ours) + * Add nvidia/patches/006_NVIDIA_kernel-1.0-8178-PAT_fix.patch, which + makes us fall back to using MTRRs if our CPU does not support PAT. + * Kernel ABI bump for linux-source-2.6.15 2.6.15-15. + + -- Adam Conrad Wed, 8 Feb 2006 20:20:16 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.4-4) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-14. + + -- Ben Collins Wed, 25 Jan 2006 23:17:24 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.4-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-13 (Look Adam!! I got it + right the first time!!). + + -- Ben Collins Thu, 19 Jan 2006 17:47:14 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.4-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-12. + + -- Adam Conrad Fri, 13 Jan 2006 16:20:42 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.4-1) dapper; urgency=low + + * Include a config file, /etc/default/linux-restricted-modules-common, + allowing users to disable link-on-boot for individual drivers, thus + making it easier to keep linux-restricted-modules installed while also + installing updates from 3rd parties (like those nvidia or ati provide) + * Update non-legacy NVIDIA driver to 1.0.8174, legacy still at 1.0.7174: + - Drop incorporated patches (AGP_kernel_BUG.patch and broken_paths.patch) + - Carry forward unfixed patches (pm_fixes.patch and vm_insert_page.patch) + - Add libgtk2.0-dev to our build-deps to get proper GTKish dependencies + for the nvidia-settings binary, which is installed to nvidia-glx. + * Mangle fglrx sources and how we build them to make things actually work: + - Rearrange basedir of fglrx patches and unpack target in debian/rules to + not require individual patch calls in debian/rules for each new patch + - Very carefully edit libGL.so.1.2 (x3) with a hex editor (original files + are saved in the tarball as .orig, for comparison) to point at the new + path at /usr/lib{,32}/dri instead of /usr/X11R6/lib{,64}/modules/dri + - Add a shlibs file for xorg-driver-fglrx to cover the two shared libs + that we ship in that package (libfglrx_pp.1 and libfglrx_gamma.1) + - Apply fglrx-2.6.15.patch, which should make fglrx happy on new kernels. + * Update ltmodem drivers to 8.31+2.6-alk-8: + - Works around some broken versions of wvdial which fail if they are + unable to change baud rate (which makes no sense with softmodems) + - Drop our patch to compile correctly on 2.6.15, incorporated upstream. + * Fix acx/readme.txt to use the correct module parameter (firmware_ver=XXX) + + -- Adam Conrad Thu, 5 Jan 2006 23:01:48 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.3-5) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-11. + + -- Ben Collins Wed, 4 Jan 2006 07:36:57 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-4) dapper; urgency=low + + * Really bump the ABI this time. + + -- Ben Collins Tue, 27 Dec 2005 17:22:49 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-10. + * No more amd64-k8-smp. + * Fix acx/readme.txt (fixed in diff, needs to be fixed in .orig.tar.gz + someday). + + -- Ben Collins Tue, 27 Dec 2005 11:48:22 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-2) dapper; urgency=low + + * Another kernel ABI bump, this time for linux-source-2.6.15 2.6.15-9. + * NOTE/WARNING: Yes, there is a fix for fglrx DRI, but I'm intentionally + not enabling it until fglrx on 2.6.15 is fixed somewhat, since enabling + DRI causes every machine I've seen so far to kernel panic constantly. + + -- Adam Conrad Wed, 21 Dec 2005 05:19:08 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.3-1) dapper; urgency=low + + * Include new firmware for acx100 USB, acx100 PCI and acx111 PCI to match + the layout that our shiny new driver expects to see, courtesy of BenC. + * Update non-legacy NVIDIA driver to 1.0.8174, legacy still at 1.0.7174. + - Install /usr/bin/nvidia-settings, /usr/bin/nvidia-xconfig, and their + manpages in nvidia-glx. nvidia-xconfig is provided to allow you to + create sample configs and customise your xorg.conf should you want to, + however, it's recommended most people don't use it as it conflicts + with how we currently configure X (nvidia-glx-config), and with how + we plan to do it in the future (re-seed debconf and re-run dexconf) + - Add NVIDIA_kernel-1.0-7174-global_flush_tlb.patch to work around + tickling buggy behaviour in global_flush_tlb on some amd64 kernels. + - Add NVIDIA_kernel-1.0-8174-pm_fixes.patch to fix power management + support in line with changes in the kernel as of version 2.6.14. + - Add NVIDIA_kernel-1.0-8174-broken_paths.patch to resolve a failure + to find the correct version of the kernel header tree built against. + - Add NVIDIA_kernel-1.0-8174-vm_insert_page.patch, adding support for + the new vm_insert_page() kernel interface introduced in 2.6.15-rc5. + - Add NVIDIA_kernel-1.0-8174-AGP_kernel_BUG.patch, resolving a situation + where the nvidia module can throw a kernel BUG on some AGP systems. + * Update ATI fglrx driver to version 8.20.8, now with PowerPlay support. + - Add panel_fglrx_pp_proto.patch to bring back the fglrx_pp_proto.h + header that seems to have mysteriously gone missing from this update. + - NOTE: This driver still DOES NOT correctly support kernel 2.6.15, + which is what we are shipping. If you use it, your system WILL crash, + very likely while in use, definitely when shutting down. We are + hoping to get this issue resolved upstream as soon as we possibly can. + * Another kernel ABI bump, this time for linux-source-2.6.15 2.6.15-8. + + -- Adam Conrad Tue, 13 Dec 2005 15:04:42 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.2-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-7 + + -- Ben Collins Tue, 6 Dec 2005 12:29:22 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.2-2) dapper; urgency=low + + * Make lrm-manager check for ld_static before running it; kernel-wedge + makes it hard for nic-restricted-modules-* to depend on + binutils-static-udeb, but for the moment I've just set the latter's + priority so that it will usually be there. + * d-i doesn't have /boot/System.map-*. If that isn't there but udpkg is (a + sanity check), just run 'depmod -a -q'. + + -- Colin Watson Mon, 5 Dec 2005 23:22:25 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.2-1) dapper; urgency=low + + * Update ltmodem drivers with Aleksey Kondratenko's hacked sources from + linmodems.technion.ac.il, which actually build on modern kernels. + * Add ltmodem/patches/pci_id.patch to locally define the PCI ID for the + PCI_DEVICE_ID_ATT_L56XMF device, which went away in recent 2.6.15-rcX. + * Fix generation of xorg-driver-fglrx-dev's deps to make it installable. + + -- Adam Conrad Mon, 5 Dec 2005 17:36:33 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.1-2) dapper; urgency=low + + * Brown paper bag fix: s,#/bin/sh,#!/bin/sh, in postinst (Ubuntu #20350) + + -- Adam Conrad Fri, 2 Dec 2005 15:18:04 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.1-1) dapper; urgency=low + + * Update madwifi driver to the trunk of the "madwifi-old" branch in the + madwifi.org SVN. Not sure if "madwifi-ng" is yet stable enough to trust. + * Stop cleaning away the postinst of linux-restricted-modules-common during + clean, so we actually get the init script migration from the last upload. + * Restore buildability on powerpc by changing KARCH from ppc to powerpc + and exporting TARGET=powerpc-be-eabi while doing madwifi's split-modules. + * Give nvidia-glx, nvidia-glx-legacy, and xorg-driver-fglrx versioned deps + on xserver-xorg-core (>= 1:0.99.0-1), since we use the new Xorg paths. + * Kernel ABI bump to 2.6.15-6 for linux-source-2.6.15_2.6.15-6.8. + + -- Adam Conrad Thu, 1 Dec 2005 18:35:31 +1100 + +linux-restricted-modules-2.6.15 (2.6.15-1) dapper; urgency=low + + * First linux-restricted-modules upload for Dapper's 2.6.15 kernel series. + * Update NVIDIA driver (non-legacy) to 1.0.7676, legacy still at 1.0.7174. + - Add NVIDIA_kernel-1.0-7174-bigram.patch, resolving an issue with the + legacy driver's inability to load on systems with 4GB of RAM or more. + - Add NVIDIA_kernel-1.0-7174-register_ioctl32.patch to get the legacy + driver to actually load on modern kernels, rather than erroring out. + - Add NVIDIA_kernel-1.0-7676-IOMMU-SWIOTLB.patch, resolving an issue + where the nvidia driver can trigger a kernel BUG() on amd64 systems + using either the IOMMU or the SWIOTLB. + - Add NVIDIA_kernel-1.0-{7174,7676}-change_page_attr.patch, working + around differing implementations of the change_page_attr() interface. + - Add NVIDIA_kernel-1.0-{7174,7676}-no-execute-page.patch, resolving + issues with amd64 system that don't support no-execute page protection. + * Update ATI fglrx driver to version 8.19.10, using the Xorg 6.9.0 loader. + - Drop ati/patches/fglrx-2.6.12-x86-64.patch, incorporated upstream + * Move a LOT of files around to accomodate two fundamental changes: + - Xorg has eliminated X11R6, and files now go to /usr/lib/{,xorg} + - firmware from /lib/hotplug/firmware/$FW-$KV to /lib/firmware/$KV/$FW + * Autogenerate debian/control better than we already did, by removing all + kernel versions and ABI versions from debian/control and have them + specified in debian/rules instead. + * Autogenerate d-i/kernel-versions as well, using the above mechanism. + * Drop linux-restricted-modules-nvidia-legacy package, and instead ship + the nvidia_legacy module in the main linux-restricted-modules package. + * Make nvidia-glx-legacy employ a modprobe.d hack to have the above work. + * Attempt to document which hardware is supported in nvidia-glx versus + nvidia-glx-legacy in the package descriptions. + * Stop using crazy *_minor versioning scheme, and just have the oddball + packages use a scheme of UpstreamVer+SourceVer (ie: 1.0.7676+2.6.15-1) + * Change the logic we use for diversions to divert lib32 stuff on arches + that MAY have lib32 directories, rather than testing for one on disk. + This eliminates weird issues seen when we're installed before ia32-libs. + * Move LRM init script from S15 to S07 in accordance with Scott's master + plan for faster boot times in dapper. + + -- Adam Conrad Wed, 30 Nov 2005 23:13:32 +1100 + +linux-restricted-modules-2.6.12 (2.6.12.4-14) dapper; urgency=low + + * Add a --kver=KERNEL_VERSION option to lrm-manager, so it can be asked to + act on specific kernel versions (handy for invocation in our postinst) + * Add --help to lrm-manager to document the fact that we now have two args. + * Replace "lrm-manager; depmod" with "lrm-manager --kver=@@KVERSION@@" in + the linux-restricted-modules and lrm-nvidia-legacy postinst scripts. + * Remove the touch --date call from lrm-manager. Since we're not running + depmod on boot anymore, this hack is no longer necessary. + + -- Adam Conrad Wed, 9 Nov 2005 23:01:12 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-13) dapper; urgency=low + + * Restore lrm-manager's depmod usage, but make both the init script and the + postinst use "lrm-manager --quick", so the previous changes still achieve + their goals, while the nic-restricted-modules postinst continues to work. + + -- Adam Conrad Wed, 9 Nov 2005 22:13:57 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-12) dapper; urgency=low + + * After installing, upgrading or removing any package we ship that + contains modules run depmod against the symbols and version of the + kernel that we ship them for. + * Drop support for lrm-manager to run depmod, as this would run it for + the current kernel rather than the installing one. Run depmod + yourself now. + + -- Scott James Remnant Wed, 9 Nov 2005 19:23:03 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-11) breezy; urgency=low + + * Enable atheros in debian-installer, by making lrm-manager the postinst + for nic-restricted-modules (fails gracefully if ld_static isn't around) + + -- Adam Conrad Tue, 11 Oct 2005 19:40:36 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-10) breezy; urgency=low + + * Increment all those evil *_minor versions yet again. + + -- Adam Conrad Tue, 11 Oct 2005 12:14:22 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-9) breezy; urgency=low + + * Mount the volatile tmpfs with mode 0755 + + -- Matt Zimmerman Mon, 10 Oct 2005 18:00:46 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.4-8) breezy; urgency=low + + * Have lrm-manager touch everything in /lib/modules/"$KVER"/volatile/ to + a timestamp one day in the future, to account for possible timestamp + and timezone skews, so the later call to depmod --quick will work. + * Shrink the nic-restricted-modules udeb to only contain madwifi. Even + if we don't end up using this in the installer, the udeb was HUGE and + needed to be shrunk, so lowmem installs can extract it without dying. + * Remove the volatile mount and directory on removal/purge. (#16310) + + -- Adam Conrad Wed, 5 Oct 2005 14:53:12 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-7) breezy; urgency=low + + * Increment *_minor. + + -- Colin Watson Fri, 23 Sep 2005 13:01:21 +0100 + +linux-restricted-modules-2.6.12 (2.6.12.4-6) breezy; urgency=low + + * Fix the ABI versioning for the avm-fritz-firmware-2.6.12 stuff. Oops. + + -- Adam Conrad Fri, 23 Sep 2005 19:55:22 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-5) breezy; urgency=low + + * Kernel ABI bump from -8- to -9- for all kernel module packages and udebs. + * Fix FTBFS on architectures that aren't building nvidia packages. + * Make sure nvidia-legacy-kernel-source actually ships files, and refresh + the outdated nvidia*kernel-source debian directory while we're in there. + * Adjust some more to the new reality that libGL now lives in /usr/lib + and /usr/lib32, rather than /usr/X11R6/lib{,32} (should fix bug #15473) + + -- Adam Conrad Fri, 23 Sep 2005 15:01:39 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-4) breezy; urgency=low + + * Re-work the nvidia-glx/nvidia-glx-legacy split to make all our debian/* + files autogenerated in debian/rules, so we can do clever things, like get + the right directories and package names in maintainer scripts and such. + * Make sure that diversions are happening, and are owned by the correct + packages, to avoid overwrite errors (as seen in Ubuntu bug #15962) + * Remove old broken diversions made by the preinst of the first uploads + of the nvidia-glx-legacy packages, so we don't get diversion conflicts. + * Stop having nvidia-glx-legacy replace nvidia-glx, as this is hideously + broken and incorrect, and dpkg will take interesting shortcuts with + Conflicts/Provides/Replaces triplets that can lead to diversions blowing + up when we try to install one and we already have the other installed. + * Make nvidia-glx-legacy-dev conflict with nvidia-glx-dev to ensure that + the latter is always deconfigured before the former is (pre)installed. + * Fix up some instances where files weren't being installed to the -legacy + packages, like the TLS libraries and nvidia-glx-config (Ubuntu #15828) + * Fix the clean target to actually clean all the *legacy* generated files. + * Build-dep on libstdc++5, rather than hardcoding our library dependencies. + * Put myself in the maintainer field, may god have mercy on my soul. + + -- Adam Conrad Tue, 20 Sep 2005 18:17:15 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-3) breezy; urgency=low + + * Really add xorg-driver-fglrx Depends: libstdc++5 + + -- Fabio M. Di Nitto Mon, 19 Sep 2005 14:50:45 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.4-2) breezy; urgency=low + + * Fix build-deps for SCC architectures. + * And another *_minor dance, of course. + + -- LaMont Jones Fri, 16 Sep 2005 17:43:56 -0600 + +linux-restricted-modules-2.6.12 (2.6.12.4-1) breezy; urgency=low + + * New tarball to remove madwifi cruft (Ubuntu Bugzilla #15592) + * Do the *_minor dance + + -- Matt Zimmerman Fri, 16 Sep 2005 15:46:03 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.3-6) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Fix xorg-driver-fglrx-dev Depends: + (Closes: #15561) + + * Make nvidia-glx{,-legacy} Conflicts with xorg-driver-fglrx since all of + them provides diversion for libGL and they can't be installed at the same + time. + + -- Fabio M. Di Nitto Fri, 16 Sep 2005 09:31:08 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-5) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * fglrx-control /usr/X11R6/bin -> /usr/bin transition. + + -- Fabio M. Di Nitto Fri, 16 Sep 2005 06:41:47 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-4) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * readd ati minors in version generation. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 14:00:34 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-3) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * The "When can we get root and chroots?" ;) aka B-D ia32-libs on amd64. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 13:27:37 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-2) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Fix (AGAIN) nvidia-legacy install target for amd64. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 11:03:33 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-1) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Reimport madwifi patches to build on ppc. + + * Readd patch fglrx-2.6.12-x86_64.diff still required to build on amd64. + + * Fix nvidia-legacy install target for amd64. + + Changes by Daniel Stone: + + * Bump to new fglrx upstream version 8.16.20. + + Adds support for mobile chipsets which were previously only supported in + 8.13 and not 8.14. + + Switches to version built against DRI protocol 5.0.0, making it usable + with our current server (closes: Ubuntu#13538). Since this is built for + a server using dlloader, relink fglrx_drv.so -> fglrx_drv.o and + libfglrxdrm.so -> libfglrxdrm.a. + + Remove fglrx-2.6.12-new-agpgart.diff, fglrx-2.6.12-inter_module_get.diff + and fglrx-2.6.12-x86_64.diff, since the new upstream version already + supports 2.6.12. + + Remove fglrx-2.6-agpgart.diff, which has already been applied upstream. + + Add fglrx-panel-style.diff, which removes the call to force the style fo + the Windows style, as it is no longer built in to our version of Qt. + + Add dependency on libstdc++5, since the DRI modules are built against + that version (closes: Ubuntu#14255). + + Revert change from 2.6.12.1-2. ati_base_xorg_version is now 6.8.0 + instead of 6_8_0. ati_xorg_package_version no longer exists. + + Move utilities to /usr/bin (closes: Ubuntu#14383). + * Add nvidia legacy driver support, which is currently just the old driver + version (1.0-7174) (closes: Ubuntu#14210). Since it still uses the + 'nvidia' kernel module, ship + linux-restricted-modules-2.6.12-*-nvidia-legacy. Add + nvidia-glx{,-dev}-legacy and nvidia-kernel-source-legacy. + * Remove support for multiple nvidia driver versions, as they do not seem to + be releasing any ia64 drivers any more (i.e. no more support for 5336). + * Call lrm-manager from postinst, and use ld-static in lrm-manager, instead + of ld (closes: Ubuntu#14115, Ubuntu#13952). + * Fix clean target: remove nic-restricted-*. + * Add ltmodem licence to debian/copyright (closes: Ubuntu#13830). + * Remove nonsensical 'Provides: xserver' from nvidia-glx. + * Change dependencies on xserver-xorg to -core, and nvidia's xserver-common + dependency to one of -xorg-core, -xorg, or -xfree86; having xserver-common + installed is no guarantee that we'll have a working server which supports + the nvidia driver. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 09:55:59 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-12) breezy; urgency=low + + * Man, this package is bringing out the worst in me. Let's try to + get the minor's and stuff working this time. + + -- Ben Collins Tue, 30 Aug 2005 23:22:59 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-11) breezy; urgency=low + + * Increment *_minor + + -- Ben Collins Tue, 30 Aug 2005 20:54:03 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-10) breezy; urgency=low + + * Bump kernel ABI. + + -- Ben Collins Tue, 30 Aug 2005 17:21:20 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-9) breezy; urgency=low + + * Increment *_minor + + -- Matt Zimmerman Mon, 29 Aug 2005 13:40:00 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-8) breezy; urgency=low + + * Skip depmod invocation if lrm-manager is invoked with --quick + * Invoke lrm-manager with --quick in the init script + + -- Matt Zimmerman Mon, 29 Aug 2005 11:29:04 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-7) breezy; urgency=low + + * Add LSB status messages to init script + + -- Matt Zimmerman Mon, 29 Aug 2005 11:23:55 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-6) breezy; urgency=low + + * hppa, ia64, sparc fixes. + + -- LaMont Jones Fri, 26 Aug 2005 14:53:48 -0600 + +linux-restricted-modules-2.6.12 (2.6.12.2-5) breezy; urgency=low + + * And remember to update all the minor revisions for the binary packages. + + -- Adam Conrad Sun, 21 Aug 2005 21:17:18 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.2-4) breezy; urgency=low + + * Fix dependencies for nvidia-glx{,-dev} for the xorg -> mesa transition. + + -- Adam Conrad Sun, 21 Aug 2005 19:02:34 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.2-3) breezy; urgency=low + + * Bump Kernel ABI. + + -- Fabio M. Di Nitto Fri, 19 Aug 2005 07:38:23 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-2) breezy; urgency=low + + * Always divert the libGL.so.* files, else installing ia32-libs after + xorg-driver-fglrx will fail. + + -- Tollef Fog Heen Mon, 15 Aug 2005 14:42:51 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-1) breezy; urgency=low + + * Fritz drivers: + - Update fritz drivers. + - Add fritz drivers for amd64. + - Remove fcpnp driver, which FTBFS, not supported anymore. + - Fix linking of pcmcia_cs module. + * Increment *_minor. + + -- Matthias Klose Thu, 11 Aug 2005 12:18:46 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.1-8) breezy; urgency=low + + * Ensure that KERNELPATH is passed to the madwifi Makefile + + -- Matt Zimmerman Sun, 7 Aug 2005 21:58:47 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-7) breezy; urgency=low + + * Use the faster depmod -A rather than depmod -a + * Fix handling of module names + * Simplify and automate determining which objects make up each module + * Simplify lrm-manager not to require hardcoded lists of objects + * Use /lib/modules/$VER/volatile rather than .../kernel/drivers/volatile + * Increment *_minor + * Add versioned dependencies on linux-restricted-modules-common + * Don't install all of madwifi in volatile, only ath_hal + * Temporarily disable fcpcmcia_cs; it needs more fiddling to work with + the new scheme + + -- Matt Zimmerman Thu, 4 Aug 2005 20:44:01 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-6) breezy; urgency=low + + * Increment all of the minor revisions + + -- Matt Zimmerman Thu, 4 Aug 2005 08:41:00 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-5) breezy; urgency=low + + * Ensure .ko extension for volatile modules + * Update Section to match overrides (restricted/misc) + + -- Matt Zimmerman Wed, 3 Aug 2005 22:25:03 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-4) breezy; urgency=low + + * Fix fglrx version numbering + + -- Matt Zimmerman Wed, 3 Aug 2005 20:13:56 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-3) breezy; urgency=low + + * Get things building again after -2 + + -- Matt Zimmerman Wed, 3 Aug 2005 18:15:22 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-2) breezy; urgency=low + + * Use 6.8.0 rather than 6_8_0 as the xorg base version, as previous versions + did. This change was not documented, so I don't know why it was made, + and underscores are not valid in package version numbers. Hopefully + doesn't break anything. + + -- Matt Zimmerman Wed, 3 Aug 2005 16:41:39 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-1) breezy; urgency=low + + * New upstream releases. + * New object linking infrastructure + + -- Matt Zimmerman Wed, 3 Aug 2005 11:25:35 -0700 + +linux-restricted-modules-2.6.10 (2.6.10.6-1) breezy; urgency=low + + * Update fglrx to 8.12.10, released today. + + Patch to build with 2.6.10 is no longer necessary. + * Reset atiminor to 0ubuntu1; bump minor for everything else. + + -- Daniel Stone Fri, 8 Apr 2005 16:00:19 +1000 + +linux-restricted-modules-2.6.10 (2.6.10.5-1) hoary; urgency=low + + * Update nVidia driver to 1.0-7174, and remove agpgart patch (which has been + merged). + * Reset nvidiaminor to 0ubuntu1; bump minor for everything else. + * Clean up nvidia-glx.examples (generated file). + + -- Daniel Stone Sat, 2 Apr 2005 12:42:49 +1000 + +linux-restricted-modules-2.6.10 (2.6.10.4-1) hoary; urgency=low + + * New NVIDIA upstream release (1.0-7167) + agpart patch. + + * Double bump *_minor to allow all the nice guys that have done testing + for us, to upgrade and be in sync with archive. + + -- Fabio M. Di Nitto Thu, 31 Mar 2005 18:49:31 +0200 + +linux-restricted-modules-2.6.10 (2.6.10.3-8) hoary; urgency=low + + * Bump *_minor. + + -- Fabio M. Di Nitto Tue, 15 Mar 2005 17:44:06 +0100 + +linux-restricted-modules-2.6.10 (2.6.10.3-7) hoary; urgency=low + + * Update for 2.6.10-5. + * Bump *_minor. + * Remove unneeded binary modules from nvidia-kernel-source (closes: + Ubuntu#6785). + + -- Daniel Stone Tue, 15 Mar 2005 22:20:05 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-6) hoary; urgency=low + + * Update AVM copyright text. + * Bump *_minor. + + -- Matthias Klose Sun, 13 Mar 2005 20:07:37 +0100 + +linux-restricted-modules-2.6.10 (2.6.10.3-5) hoary; urgency=low + + * Update for 2.6.10-4. + * Bump *_minor. + + -- LaMont Jones Mon, 21 Feb 2005 20:46:28 -0700 + +linux-restricted-modules-2.6.10 (2.6.10.3-4) hoary; urgency=low + + * Update for 2.6.10-3. + * Bump *_minor. + + -- Colin Watson Tue, 8 Feb 2005 10:42:03 +0000 + +linux-restricted-modules-2.6.10 (2.6.10.3-3) hoary; urgency=low + + * Change --with-kernel-dir to --with-kernel for ltmodem. + * Bump *_minor. + + -- Daniel Stone Thu, 27 Jan 2005 13:27:43 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-2) hoary; urgency=low + + * Bump *_minor. + + -- Daniel Stone Tue, 25 Jan 2005 05:20:01 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-1) hoary; urgency=low + + * Include ltmodem source. + * Make x{org,free86}-driver-fglrx install an Xsession.d file which sets + LIBGL_DRIVER_PATH=/usr/X11R6/lib/modules/dri:/usr/X11R6/lib32/modules/dri + on directories where fglrx is set up with lib and lib64, so 32-bit GL apps + can still work. + + -- Daniel Stone Thu, 20 Jan 2005 11:30:12 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.2-2) hoary; urgency=low + + * Change fglrx-control's Depends to be xorg-driver-fglrx | + xfree86-driver-fglrx. + * Kill off fglrx-driver altogether, and have x{org,free86}-driver-fglrx + Conflicts/Replaces/Provides it; ditto fglrx-driver-dev (closes: + Ubuntu#5630). + * Divert /usr/lib32/libGL.so.* as well in + xorg-driver-fglrx/xfree86-driver-fglrx (closes: Ubuntu#5627). + * Synchronise xorg-driver-fglrx.links* to xfree86-driver-fglrx. + * Update nvidia-glx-config help text (closes: Ubuntu#5320). + * Bump *_minor. + + -- Daniel Stone Tue, 18 Jan 2005 14:30:04 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.2-1) hoary; urgency=low + + * Update fglrx driver to 8.8.25 (new Catalyst series); this version adds + support for X.Org and amd64. Update Build-Depends accordingly; split + fglrx-driver into xfree86-driver-fglrx and xorg-driver-fglrx, and + fglrx-driver-dev into xfree86-driver-fglrx-dev, and xorg-driver-fglrx-dev. + The original packages are retained as dummy packages. Bump versions + accordingly. Change 'grafics' to 'graphics' in ati/*.desktop. Add + 8.08-kernel-2.6.10.patch, an official ATI patch to deal with changed + pci_*() semantics in 2.6.10. Update list of supported cards. Add libGL + diversions for fglrx. + * Fix dependencies between l-r-m-2.6.10-2-power* and l-i-2.6.10-2-power*; this + fix seems to have got lost in a previous revision. + * Change l-r-m -> avm-fritz-firmware from Depends to Recommends. + * Bump nvidia_minor, ati_minor, avm_minor. + + -- Daniel Stone Sat, 8 Jan 2005 05:10:17 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.1-1) hoary; urgency=low + + * Reupload with unpacked avm tarball. + * Bump nvidia_minor, ati_minor, avm_minor. + + -- Matthias Klose Sat, 15 Jan 2005 21:21:15 +0100 + +linux-restricted-modules-2.6.10 (2.6.10-6) hoary; urgency=low + + * Add AVM ISDN drivers (as uuencoded tarball, unpack them for the next upload + of an .orig tarball). + * Bump nvidia_minor and ati_minor. + + -- Matthias Klose Sat, 15 Jan 2005 17:37:18 +0100 + +linux-restricted-modules-2.6.10 (2.6.10-5) hoary; urgency=low + + * Fix minor numbers + + -- LaMont Jones Thu, 13 Jan 2005 17:04:24 -0700 + +linux-restricted-modules-2.6.10 (2.6.10-4) hoary; urgency=low + + * Update for 2.6.10-2-*. + + -- Daniel Stone Thu, 13 Jan 2005 21:21:11 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-3) hoary; urgency=low + + * ati/patches/agpgart_be.patch: add fglrx kernel patch to reflect changed + function name in 2.6.10. + + -- Daniel Stone Sat, 8 Jan 2005 04:57:20 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-2) hoary; urgency=low + + * Bump nvidiaminor and atiminor. + + -- Daniel Stone Sat, 8 Jan 2005 02:02:51 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-1) hoary; urgency=low + + * Update to 2.6.10. + * Update madwifi driver to current CVS, to build with 2.6.10. + * Add two nVidia patches from Thomas Vander (see nvnews.net) to fix + compilation against 2.6.10 for 6629; 5111 (the current latest on ia64) + does not work with .10. + * Change Maintainer field to myself. + * Add /etc/default/nvidia-glx and /etc/init.d/nvidia-glx to nvidia-glx's + conffiles. + + -- Daniel Stone Thu, 6 Jan 2005 01:19:18 +1100 + +linux-restricted-modules-2.6.9 (2.6.9-11) hoary; urgency=low + + * [arch]-style dependencies don't work in the binary package parts of + debian/control. Use substvars instead. + + -- Colin Watson Sun, 26 Dec 2004 02:17:38 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-10) hoary; urgency=low + + * Forgot to bump nvidiaminor and ati_minor in debian/rules. + + -- Colin Watson Fri, 24 Dec 2004 13:28:44 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-9) hoary; urgency=low + + * debian/nvidia-glx.postrm.in: Fix /usr/X11R6/lib32/libGL.so.1 diversion + removal. + + -- Colin Watson Fri, 24 Dec 2004 01:00:59 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-8) hoary; urgency=low + + * Sanitise powerpc l-r-m -> l-i dependencies. + * Fix nvidia-glx sed scripts to catch all the @@VERSION@@ substitutions. + * Divert /usr/X11R6/lib32 GL modules when installing nvidia-glx (closes: + Ubuntu#2500). + * Remove previous patches to nvidia-glx and sync back with Debian patches + from new Debian 6629 packages, fixing segfaults (closes: Ubuntu#4640). + * Create nic-restricted-modules udeb, containing the Atheros driver. + + -- Daniel Stone Sat, 11 Dec 2004 22:29:55 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-7) hoary; urgency=low + + * Create udebs: + - debian/d-i/: Incorporate linux-kernel-restricted-di-2.6 version 0.3. + - debian/control: Move to debian/control.stub; kernel-wedge will + generate the real control file. + - debian/control.stub: Build-depend on kernel-wedge. + - debian/rules: Update to copy /lib/modules and /lib/hotplug/firmware to + a temporary tree and generate udebs from them. + * debian/d-i/kernel-versions: Remove superfluous build-dependency fields. + * debian/d-i/firmware/: Add amd64 and powerpc nic-restricted-firmware + packages. + + -- Colin Watson Tue, 14 Dec 2004 18:40:37 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-6) hoary; urgency=low + + * Bump nvidiaminor and atiminor in debian/rules; this must be done every + revision! + * Add Build-Depends on libxinerama-dev. + + -- Daniel Stone Sat, 11 Dec 2004 13:16:57 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-5) hoary; urgency=low + + * Fix kernel boot failure on powerpc: l-r-m-2.6.9-1-powerpc[-smp] now + depends on linux-image-2.6.9-1-powerpc, not on -power3 + + -- Martin Pitt Sat, 11 Dec 2004 12:11:32 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-4) hoary; urgency=low + + * Really add libxxf86vm-dev B-D; the last upload only added libxtst-dev. + + -- Daniel Stone Fri, 10 Dec 2004 17:12:15 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-3) hoary; urgency=low + + * Add libxxf86vm-dev Build-Depends. + + -- Daniel Stone Fri, 10 Dec 2004 13:58:35 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-2) hoary; urgency=low + + * Add Build-Depends on libxtst-dev and libxxf86misc-dev, fixing i386 FTBFS. + * Temporarily remove ia64 from the nvidia-* architecture list until I get it + building properly on halley, which involves splitting the patch system. + + -- Daniel Stone Fri, 10 Dec 2004 12:58:03 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-1) hoary; urgency=low + + * Updated to 2.6.9. + * Add nvidia-glx 1.0.6629 (i386/amd64), and nvidia-glx 1.0.5336 (ia64). + + Added two patches from zander in nVidia forums to fix several issues + with 6629 (nvidia/patches). + * Add fglrx 3.14.6 (still only for XFree86 4.3.0/X.Org 6.7.0). + + Add fglrx-kernel-source, for people building their own kernels. + * Updated madwifi to CVS from 20041124, and enable building on amd64 and + powerpc (closes: Ubuntu#3010). + + New linux-restricted-modules-2.6.9-1-power{3,4,pc}{,-smp} packages. + + Removed default setting of TOOLPREFIX in + madwifi/hal/linux/{x86_64-elf,powerpc-be-eapi}.inc, as we compile + natively. + * Rewrite large swathes of debian/rules to have a greater segregation + between drivers; e.g, use $(nv_dirname), et al, for nVidia driver. + * Make nvidia-glx-config aware of X.Org. + + -- Daniel Stone Fri, 3 Dec 2004 10:58:53 +0000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-4) warty; urgency=low + + * Fix nvidia-glx call to date. (Closes: #2429) + + -- Fabio M. Di Nitto Mon, 18 Oct 2004 05:37:36 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-3) warty; urgency=low + + * .. and bump the version number of nvidia-glx. + + -- Tollef Fog Heen Mon, 11 Oct 2004 21:01:22 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-2) warty; urgency=low + + * Brown paper bug -- too much copy&paste in debian/rules is not a + good idea. Actually copy the madwifi directory to build it. + * amd64-xeon is amd64, not i386. + + -- Tollef Fog Heen Mon, 11 Oct 2004 18:19:51 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-1) warty; urgency=low + + * s/Debian/Ubuntu/ in some readme files + * Add nvidia amd64 modules + + -- Tollef Fog Heen Sat, 09 Oct 2004 14:24:18 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-3) warty; urgency=low + + * Fixed acx100 firmware filenames. + + -- Herbert Xu Fri, 8 Oct 2004 09:07:29 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-2) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Herbert Xu Fri, 8 Oct 2004 07:27:07 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-1) warty; urgency=low + + * Added acx100 firmware. + + -- Herbert Xu Thu, 7 Oct 2004 21:34:45 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-7) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Matt Zimmerman Mon, 27 Sep 2004 11:57:13 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-6) warty; urgency=low + + * Updated ABI + * Add "Atheros" to description, for keyword searches + * Add note to nvidia-kernel-source description explaining that this package + is not needed in ubuntu + * Add instructions to nvidia-glx description about how to enable the driver + * Remove pointer to nvidia-kernel-source from nvidia-glx description + + -- Matt Zimmerman Mon, 27 Sep 2004 10:48:42 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-5) warty; urgency=low + + * Build-Depends: bzip2 + + -- Matt Zimmerman Mon, 20 Sep 2004 18:58:27 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-4) warty; urgency=low + + * Improved /etc/modules modification in nvidia-glx-config + (Fabio M. Di Nitto). + + -- Herbert Xu Mon, 20 Sep 2004 21:00:03 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-3) warty; urgency=low + + * Added nvidia-glx-config script (Fabio M. Di Nitto) + + -- Herbert Xu Sat, 18 Sep 2004 14:23:49 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-2) warty; urgency=low + + * Added ATI license to copyright. + + -- Herbert Xu Wed, 15 Sep 2004 19:58:51 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-1) warty; urgency=low + + * Added ATI driver. + * Clarified package descriptions. + + -- Herbert Xu Tue, 14 Sep 2004 20:25:27 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.0-2) warty; urgency=low + + * Build-Depends: sharutils + + -- Matt Zimmerman Fri, 10 Sep 2004 18:38:02 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.0-1) warty; urgency=low + + * Add nvidia kernel and X driver: + + Roll new orig.tar.gz. to add nvidia directory and binary installer. + + Update copyright file to include NVIDIA license and email exchange + between Debian maintainer and upstream to clarify a few points + about the redistribution. + + Build-Depends on debhelper >= 4.0.0 and sed >> 3.0. + + Make flavour regexpr more strict to match only kernel modules packages + and clear pkg var after each match to avoid duplicates. + + Add comments in debian/rules to identify specific drivers operations. + + Make clean: target wipe only linux-restricted*.postinst and postrm. + + Create nvidia-kernel-source, nvidia-glx and nvidia-glx-dev packages + and give them proper version. + + Build nvidia kernel driver and install in linux-restricted-modules-* + + Add nvidia bits to linux-restricted-modules postinst and postrm. + + linux-restricted-modules Depends: nvidia-kernel-common, + Provides: nvidia-kernel-1.0.6111 and Suggests: nvidia-glx + + nvidia-glx Depends: nvidia-kernel-1.0.6111 + + -- Fabio M. Di Nitto Sat, 11 Sep 2004 01:19:12 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1-2) warty; urgency=low + + * Built for linux-source 2.6.8.1-3. + * Replaced the word non-free by restricted. + + -- Herbert Xu Fri, 10 Sep 2004 09:22:59 +1000 + +linux-non-free-modules-2.6.8.1 (2.6.8.1-1) unstable; urgency=low + + * Initial release. + + -- Herbert Xu Sun, 29 Aug 2004 15:06:44 +1000 diff -urN debian.old/nvidia-glx.links.amd64.in~ debian/nvidia-glx.links.amd64.in~ --- debian.old/nvidia-glx.links.amd64.in~ 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx.links.amd64.in~ 2007-08-17 22:48:41.000000000 +0200 @@ -0,0 +1,14 @@ +usr/lib32/libGL.so.@@VERSION@@ usr/lib32/libGL.so.1 +usr/lib32/libGLcore.so.@@VERSION@@ usr/lib32/libGLcore.so.1 +usr/lib32/libnvidia-cfg.so.@@VERSION@@ usr/lib32/libnvidia-cfg.so.1 +usr/lib32/libnvidia-tls.so.@@VERSION@@ usr/lib32/libnvidia-tls.so.1 +usr/lib32/tls/libnvidia-tls.so.@@VERSION@@ usr/lib32/tls/libnvidia-tls.so.1 +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/libglx.so.@@VERSION@@ usr/lib/xorg/modules/libglx.so +usr/lib/xorg/modules/libnvidia-wfb.so.@@VERSION@@ usr/lib/xorg/modules/libwfb.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 diff -urN debian.old/nvidia-glx.links.in~ debian/nvidia-glx.links.in~ --- debian.old/nvidia-glx.links.in~ 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx.links.in~ 2007-08-17 22:48:42.000000000 +0200 @@ -0,0 +1,9 @@ +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/libglx.so.@@VERSION@@ usr/lib/xorg/modules/libglx.so +usr/lib/xorg/modules/libnvidia-wfb.so.@@VERSION@@ usr/lib/xorg/modules/libwfb.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 diff -urN debian.old/nvidia-glx-new-dev.dirs.in debian/nvidia-glx-new-dev.dirs.in --- debian.old/nvidia-glx-new-dev.dirs.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new-dev.dirs.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,3 @@ +usr/share/doc/nvidia-glx@@NV_LEGACY@@-dev/include/GL +usr/X11R6/lib +usr/lib/nvidia diff -urN debian.old/nvidia-glx-new-dev.links.in debian/nvidia-glx-new-dev.links.in --- debian.old/nvidia-glx-new-dev.links.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new-dev.links.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1 @@ +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so diff -urN debian.old/nvidia-glx-new-dev.postinst.in debian/nvidia-glx-new-dev.postinst.in --- debian.old/nvidia-glx-new-dev.postinst.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new-dev.postinst.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + if [ -e /etc/init.d/nvidia-glx@@NV_LEGACY@@ ] ; then + /etc/init.d/nvidia-glx@@NV_LEGACY@@ start + fi + ;; +esac + +#DEBHELPER# diff -urN debian.old/nvidia-glx-new-dev.postrm.in debian/nvidia-glx-new-dev.postrm.in --- debian.old/nvidia-glx-new-dev.postrm.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new-dev.postrm.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,40 @@ +#! /bin/sh +# postrm script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove) + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + + if [ -d /usr/lib/nvidia ]; then + rmdir /usr/lib/nvidia || true; + + fi + if [ -d /usr/X11R6/lib/nvidia ]; then + rmdir /usr/X11R6/lib/nvidia || true; + + fi + + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# diff -urN debian.old/nvidia-glx-new-dev.preinst.in debian/nvidia-glx-new-dev.preinst.in --- debian.old/nvidia-glx-new-dev.preinst.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new-dev.preinst.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,88 @@ +#! /bin/sh +# preinst script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + install|upgrade) + # diversion transition + if [ -d /usr/share/nvidia-glx/diversions/ ] ; then + rm -f /usr/lib/libGL.so + rm -f /usr/lib/libGL.a + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions/ || true + rmdir /usr/share/nvidia-glx || true + + fi + + if [ -d /usr/share/nvidia-glx/diversions-X11R6 ] ; then + rm -f /usr/X11R6/lib/libGL.so + rm -f /usr/X11R6/lib/libGL.a + + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.a /usr/X11R6/lib/libGL.a > /dev/null + + + rmdir /usr/share/nvidia-glx/diversions-X11R6/ || true + rmdir /usr/share/nvidia-glx || true + fi + + + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + if [ ! -d /usr/X11R6/lib/nvidia ]; then + mkdir -p /usr/X11R6/lib/nvidia || true + fi + +# to remove old old old gl header diversions + + if [ -e /usr/share/nvidia-glx/diversions-X11R6/gl.h ]; then + if [ -e /usr/include/GL/gl.h ]; then + rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h /usr/include/GL/glxtokens.h + fi + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glxtokens.h /usr/X11R6/include/GL/glxtokens.h > /dev/null + + fi + + # remove the old nvidia-glx diversion before re-creating it, since our + # first nvidia-glx-legacy upload was broken, argh: + if [ -n "@@NV_LEGACY@@" ] && dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev$' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + fi + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -urN debian.old/nvidia-glx-new.dirs.in debian/nvidia-glx-new.dirs.in --- debian.old/nvidia-glx-new.dirs.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.dirs.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,11 @@ +usr/bin +usr/lib +usr/sbin +usr/share/man/man1 +usr/share/lintian/overrides +usr/lib/xorg/modules/drivers +usr/lib/xorg/modules/extensions +usr/lib/tls +usr/lib/nvidia +usr/lib32/nvidia +usr/share/bug/nvidia-glx@@NV_LEGACY@@ diff -urN debian.old/nvidia-glx-new.docs.in debian/nvidia-glx-new.docs.in --- debian.old/nvidia-glx-new.docs.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.docs.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,3 @@ +@dirname@/usr/share/doc/NVIDIA_Changelog +@dirname@/usr/share/doc/README* +@dirname@/usr/share/doc/nvidia-settings-user-guide.txt diff -urN debian.old/nvidia-glx-new.examples.in debian/nvidia-glx-new.examples.in --- debian.old/nvidia-glx-new.examples.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.examples.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1 @@ +@dirname@/usr/share/doc/XF86Config.sample diff -urN debian.old/nvidia-glx-new.links.amd64.in debian/nvidia-glx-new.links.amd64.in --- debian.old/nvidia-glx-new.links.amd64.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.links.amd64.in 2007-08-17 22:48:41.000000000 +0200 @@ -0,0 +1,14 @@ +usr/lib32/libGL.so.@@VERSION@@ usr/lib32/libGL.so.1 +usr/lib32/libGLcore.so.@@VERSION@@ usr/lib32/libGLcore.so.1 +usr/lib32/libnvidia-cfg.so.@@VERSION@@ usr/lib32/libnvidia-cfg.so.1 +usr/lib32/libnvidia-tls.so.@@VERSION@@ usr/lib32/libnvidia-tls.so.1 +usr/lib32/tls/libnvidia-tls.so.@@VERSION@@ usr/lib32/tls/libnvidia-tls.so.1 +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/libglx.so.@@VERSION@@ usr/lib/xorg/modules/libglx.so +usr/lib/xorg/modules/libnvidia-wfb.so.@@VERSION@@ usr/lib/xorg/modules/libwfb.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 diff -urN debian.old/nvidia-glx-new.links.in debian/nvidia-glx-new.links.in --- debian.old/nvidia-glx-new.links.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.links.in 2007-08-17 22:48:42.000000000 +0200 @@ -0,0 +1,9 @@ +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/libglx.so.@@VERSION@@ usr/lib/xorg/modules/libglx.so +usr/lib/xorg/modules/libnvidia-wfb.so.@@VERSION@@ usr/lib/xorg/modules/libwfb.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 diff -urN debian.old/nvidia-glx-new.override.in debian/nvidia-glx-new.override.in --- debian.old/nvidia-glx-new.override.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.override.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,14 @@ +nvidia-glx@@NV_LEGACY@@: library-not-linked-against-libc ./usr/lib/libGL.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: library-not-linked-against-libc ./usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/libGL.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/libGLcore.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so +nvidia-glx@@NV_LEGACY@@: non-dev-pkg-with-shlib-symlink usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ usr/X11R6/lib/modules/extensions/libglx.so diff -urN debian.old/nvidia-glx-new.postinst.in debian/nvidia-glx-new.postinst.in --- debian.old/nvidia-glx-new.postinst.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.postinst.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ -n "@@NV_ALT@@" ] && [ ! -e /lib/linux-restricted-modules/.nvidia_@@NV_ALT@@_installed ]; then + mkdir -p /lib/linux-restricted-modules + echo "# do not remove this file, it's needed by /sbin/lrm-video" \ + > /lib/linux-restricted-modules/.nvidia_@@NV_ALT@@_installed +fi + +#DEBHELPER# + +ldconfig diff -urN debian.old/nvidia-glx-new.postrm.in debian/nvidia-glx-new.postrm.in --- debian.old/nvidia-glx-new.postrm.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.postrm.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,80 @@ +#! /bin/sh +# postrm script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|purge) + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + if dpkg-divert --list /usr/X11R6/lib32/libGL.so.1 | grep 'nvidia-glx@@NV_LEGACY@@' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + fi + + if dpkg-divert --list /usr/lib32/libGL.so.1 | grep 'nvidia-glx@@NV_LEGACY@@' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/libGLcore.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/libglx.so > /dev/null + + rm -f /usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ 2> /dev/null || true + if [ -d /usr/lib/nvidia ]; then + rmdir /usr/lib/nvidia || true; + fi + if [ -d /usr/X11R6/lib/nvidia ]; then + rmdir /usr/X11R6/lib/nvidia || true; + fi + if [ -d /usr/X11R6/lib32/nvidia ]; then + rmdir /usr/X11R6/lib32/nvidia || true; + fi + if [ -d /usr/lib32/nvidia ]; then + rmdir /usr/lib32/nvidia || true; + fi + ldconfig + + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + + +#rm -f /usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ 2> /dev/null || true + + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# diff -urN debian.old/nvidia-glx-new.preinst.in debian/nvidia-glx-new.preinst.in --- debian.old/nvidia-glx-new.preinst.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.preinst.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,128 @@ +#! /bin/sh +# preinst script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# For details see /usr/share/doc/packaging-manual/ + +if [ `dpkg --print-installation-architecture` = "amd64" ]; then + HAS_LIB32="yes" +fi + +case "$1" in + install|upgrade) + + # Forcefully remove old init scripts and defaults files + rm -f /etc/init.d/nvidia-glx + rm -f /etc/init.d/nvidia-glx-legacy + rm -f /etc/default/nvidia-glx + rm -f /etc/default/nvidia-glx-legacy + update-rc.d nvidia-glx remove >/dev/null || true + update-rc.d nvidia-glx-legacy remove >/dev/null || true + + # Hack right now. + # rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336 2>/dev/null || true + + # clean up from old diversions + if [ -d /usr/share/nvidia-glx/diversions ]; then + rm -f /usr/lib/libGL.so.1 + rm -f /usr/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null + + rm -f /usr/X11R6/lib/modules/extensions/libGLcore.a + rm -f /usr/X11R6/lib/modules/extensions/libglx.a + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGLcore.a /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libglx.a /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions || true; + rmdir /usr/share/nvidia-glx || true; + fi + if [ -d /usr/share/nvidia-glx/diversions-X11R6 ]; then + + rm -f /usr/X11R6/lib/libGL.so.1 + rm -f /usr/X11R6/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1 /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1.2 /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + rmdir /usr/share/nvidia-glx/diversions-X11R6 || true; + rmdir /usr/share/nvidia-glx || true; + fi + + + # create new diversion directories + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + if [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib/nvidia ]; then + mkdir -p /usr/X11R6/lib/nvidia || true + fi + if [ -n "$HAS_LIB32" ] && [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib32/nvidia ]; then + mkdir -p /usr/X11R6/lib32/nvidia || true + fi + if [ -n "$HAS_LIB32" ] && [ ! -d /usr/lib32/nvidia ]; then + mkdir -p /usr/lib32/nvidia || true + fi + + # remove the old nvidia-glx diversion before re-creating it, since our + # first nvidia-glx-legacy upload was broken, argh: + if [ -n "@@NV_LEGACY@@" ] && dpkg-divert --list /usr/lib/libGL.so.1 | grep 'nvidia-glx$' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + fi + + # make new diversions + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + if [ -n "$HAS_LIB32" ]; then + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/libGLcore.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/libglx.so > /dev/null + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -urN debian.old/nvidia-glx-new.prerm.in debian/nvidia-glx-new.prerm.in --- debian.old/nvidia-glx-new.prerm.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.prerm.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,45 @@ +#! /bin/sh +# prerm script for nvidia-drivers +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) +# install-info --quiet --remove /usr/info/nvidia-drivers.info.gz + if [ -n "@@NV_LEGACY@@" ]; then + rm -f /lib/linux-restricted-modules/.nvidia_legacy_installed + rmdir /lib/linux-restricted-modules 2>/dev/null || true + fi + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff -urN debian.old/nvidia-glx-new.README.Debian.in debian/nvidia-glx-new.README.Debian.in --- debian.old/nvidia-glx-new.README.Debian.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.README.Debian.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,82 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to the Ubuntu NVIDIA packages. This document has notes on the +X Server and GL libraries of the NVIDIA driver offering. + + +A Note about Thread Local Storage (TLS): +---------------------------------------- +Under 2.6.x kernels a new TLS method is used and different libraries are +required. NVIDIA provides these libraries and at boot time (via +/etc/init.d/nvidia-glx) a test is performed on your system to see if +your require these extra libraries. Having the TLS libraries installed +(in /usr/lib/tls and libglx.so) running under a 2.4.x kernel will cause +problems when running GL applications. Likewise, not having these libraries +installed under 2.6.x might prevent X from starting at all. + +Simple Explanation: +To switch back and forth between the two systems simply run: + + /etc/init.d/nvidia-glx start + + This is run automatically at boot time. + +To force a certain setting (e.g. you may have a 2.4 kernel patched for +NPTL) place USE_TLS=1 in /etc/defaults/nvidia-glx for using the nvidia tls +libraries. USE_TLS=0 for not using tls libraries. This isn't normally +necessary for most users. + + +What Happens: +Symlinks are created in /usr/lib/tls from libraries installed in +/usr/lib/nvidia. Also the libglx.so.VERSION in +/usr/X11R6/lib/modules/extensions/ is symlinked to a tls-enabled one. + + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-glx + + +NOTES ABOUT GLX DRIVER AND OPENGL: +----------------------------------------------------------------------- + +Using the nvidia X driver requires some user modification. + + First, modify your /etc/X11/XF86Config-4 + + Minimum requirements: + In Section "Module" + add Load "glx" + remove Load "dri" + remove Load "GLcore" + In Section "Device" + Change Driver "nv" to Driver "nvidia" + + See /usr/share/doc/nvidia-glx/README.gz and + /usr/share/doc/nvidia-glx/examples/XF86Config.sample.gz + for descriptions of all supported options. + Appendix F: CONFIGURING AGP is an important section. + + +Note about OpenGL headers: The header files are not installed to +/usr/include/GL but to /usr/share/doc/nvidia-glx-dev/include/GL. +This is similar to what NVIDIA +does in their own packaging, allowing use of and not overwriting +preinstalled headers (e.g. xlibmesa-dev). If you wish to use the NVIDIA +supplied headers (e.g. you require NVIDIA GL extensions) you must copy them to +/usr/include/GL yourself or include /usr/share/doc/nvidia-glx-dev/include in +your includes path when compiling. + + +Also note all users using GLX must be in group video. (i.e. adduser +video) + + + + -- Randall Donald , Mon, 31 Mar 2003 23:40:05 -0800 diff -urN debian.old/nvidia-glx-new.reportbug.in debian/nvidia-glx-new.reportbug.in --- debian.old/nvidia-glx-new.reportbug.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.reportbug.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,33 @@ +#!/bin/sh + +PATH=/sbin:$PATH + +printf "uname -r:\n" >&3 +echo `uname -a` >&3 +printf "\n\n/proc/version:\n" >&3 +cat /proc/version >&3 +printf "\n\n" >&3 + +if [ -e /proc/driver/nvidia/version ]; then + printf "/proc/driver/nvidia/version:\n" >&3 + cat /proc/driver/nvidia/version + printf "\n\n" >&3 +fi + +if (lspci --version) > /dev/null 2>&1; then + LC_ALL=C lspci | grep 'VGA compatible controller:' >&3 + LC_ALL=C lspci -n | grep 'Class 0300:' >&3 + printf "\n" >&3 +fi + +#if [ -e /etc/X11/XF86Config-4 ]; then +# cat /etc/X11/XF86Config-4 >&3 +# printf "\n" >&3 +#fi + +#if [ -e /var/log/XFree86.0.log ]; then +# cat /var/log/XFree86.0.log >&3 +# printf "\n" >&3 +#fi + +#ls -d -l /var/log/XFree86.*.log >&3 2> /dev/null diff -urN debian.old/nvidia-glx-new.shlibs.in debian/nvidia-glx-new.shlibs.in --- debian.old/nvidia-glx-new.shlibs.in 1970-01-01 01:00:00.000000000 +0100 +++ debian/nvidia-glx-new.shlibs.in 2007-08-18 07:04:51.000000000 +0200 @@ -0,0 +1,4 @@ +libGL 1 libgl1-mesa | libgl1 +libGLcore 1 libgl1-mesa | libgl1 +libXvMCNVIDIA_dynamic 1 nvidia-glx +libnvidia-tls 1 nvidia-glx diff -urN debian.old/rules debian/rules --- debian.old/rules 2007-08-17 23:56:22.000000000 +0200 +++ debian/rules 2007-08-18 07:08:49.000000000 +0200 @@ -341,7 +341,7 @@ .prerm .README.Debian .reportbug .shlibs; \ do sed -e "s/@@VERSION@@/$(nv_new_version)/g" -e "s/@@NV_LEGACY@@/-new/g" \ -e "s:@dirname@:$(nv_new_dirname):" -e "s/@@NV_ALT@@/new/g" \ - < debian/nvidia-glx$$i.in > debian/nvidia-glx-new$$i; \ + < debian/nvidia-glx-new$$i.in > debian/nvidia-glx-new$$i; \ done for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ @@ -961,6 +961,10 @@ fi; \ install $$this_dir/usr/X11R6/lib/modules/extensions/libglx.so.$$this_ver \ $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/; \ + if [ "$$this_ver" = "$(nv_new_version)" ]; then \ + install $$this_dir/usr/X11R6/lib/modules/libnvidia-wfb.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/; \ + fi; \ install $$this_dir/usr/bin/tls_test \ $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/nvidia; \ install $$this_dir/usr/bin/tls_test_dso.so \ diff -urN debian.old/rules~ debian/rules~ --- debian.old/rules~ 1970-01-01 01:00:00.000000000 +0100 +++ debian/rules~ 2007-08-18 00:36:21.000000000 +0200 @@ -0,0 +1,1165 @@ +#!/usr/bin/make -f +# +# Copyright (c) 2004 Herbert Xu +# Copyright (c) 2004-2005 Canonical Ltd. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=4 + +SHELL := sh -e + +prefix := $(CURDIR)/debian/linux-restricted-modules +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +udeb_prefix := $(CURDIR)/debian/d-i-$(DEB_HOST_ARCH) + +ifeq "$(DEB_HOST_ARCH)" "hppa" +export CC=gcc-3.4 +export GCC=gcc-3.4 +else +export CC=gcc +export GCC=gcc +endif + +# kernel +abi_version = 16 +kernel_version = $(shell dpkg-parsechangelog | grep ^Source | sed 's/.*-//') +kernel_abi_version = $(kernel_version)-$(abi_version) +lrm_version = $(shell dpkg-parsechangelog | grep ^Version | awk '{print $$2}') + +# nvidia +nv_base_version=1.0 +nv_release := 9631 +nv_upstreamversion := ${nv_base_version}-${nv_release} +nv_version := ${nv_base_version}.${nv_release} +nv_new_release := 9755 +nv_new_upstreamversion := ${nv_base_version}-${nv_new_release} +nv_new_version := ${nv_base_version}.${nv_new_release} +nv_legacy_release := 7184 +nv_legacy_upstreamversion := ${nv_base_version}-${nv_legacy_release} +nv_legacy_version := ${nv_base_version}.${nv_legacy_release} + +# fglrx +ati_xorg_base_version = 7.1.0 +ati_revision = 8.34.8 +ati_upstreamversion = ${ati_revision} +ati_xorg_version = ${ati_xorg_base_version}-${ati_revision} +ati_shar = ati-driver-installer-${ati_revision}-x86.x86_64.run + +# fritz avm +avm_base_version = 3.11 +#avm_version = ${avm_base_version}-${avm_revision} +avm_version = ${avm_base_version} +pkg_avmfw := $(shell awk '/^Package: avm-fritz-firmware/ {print $$2}' debian/control.stub) +avmfw_dir = $(subst avm-fritz-firmware-,,$(pkg_avmfw)) + +# ltmodem +ltm_base_version = 8.31+2.6-alk-8 +ltm_url = http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/ + +# ipw3945d +ipw3945_version = 1.7.22 + +# madwifi +madwifi_version = 0.9.3 + +# vmware-player +vmplay_dir = $(CURDIR)/debian/vmware-player-kernel-modules-$(kernel_abi_version) +vmserv_dir = $(CURDIR)/debian/vmware-server-kernel-modules-$(kernel_abi_version) +vmtool_dir = $(CURDIR)/debian/vmware-tools-kernel-modules-$(kernel_abi_version) + +FGLRX := 1 +NVIDIA := 1 +MADWIFI := 1 +FRITZ := 1 +LTMODEM := 1 +IPW3945 := 1 +VMWARE := 1 +VMDESCHED := 1 + +ifeq "$(DEB_HOST_ARCH)" "i386" +export karch=i386 +mw_target := TARGET=i386-elf + +nv_filename := NVIDIA-Linux-x86-${nv_upstreamversion}-pkg1.run +nv_dirname := nvidia/NVIDIA-Linux-x86-${nv_upstreamversion}-pkg1 +nv_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_upstreamversion}/${nv_filename} + +nv_new_filename := NVIDIA-Linux-x86-${nv_new_upstreamversion}-pkg1.run +nv_new_dirname := nvidia/NVIDIA-Linux-x86-${nv_new_upstreamversion}-pkg1 +nv_new_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_new_upstreamversion}/${nv_new_filename} + +nv_legacy_filename := NVIDIA-Linux-x86-${nv_legacy_upstreamversion}-pkg1.run +nv_legacy_dirname := nvidia/NVIDIA-Linux-x86-${nv_legacy_upstreamversion}-pkg1 +nv_legacy_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_legacy_upstreamversion}/${nv_legacy_filename} + +ati_package = fglrx +ati_url = http://www2.ati.com/drivers/linux/fglrx_${ati_revision}.zip +ati_archdir = x86 +ati_nativelibdir = lib +ati_xorg_dir = x710 +fritz_dir := fritz +ipw3945_dir := x86 +split_fritz_modules += \ + fcdsl/src/fcdsl \ + fcdsl2/src/fcdsl2 \ + fcdslsl/src/fcdslsl \ + fcdslslusb/src/fcdslslusb \ + fcdslusb/1/fritz/src/fcdslusb \ + fcdslusb/2/fritz/src/fcdslusb2 \ + fcdslusba/src/fcdslusba \ + fcpci/src/fcpci \ + fcusb/src/fcusb \ + fxusb/src/fxusb +flavours := $(addprefix $(kernel_abi_version)-,generic 386 lowlatency) +vmware_server_extra_flavours := $(addprefix $(kernel_abi_version)-,server server-bigiron) +vmware_tools_extra_flavours := $(addprefix $(kernel_abi_version)-,server) +endif + +ifeq "$(DEB_HOST_ARCH)" "amd64" +export karch=x86_64 +mw_target := TARGET=x86_64-elf + +nv_filename := NVIDIA-Linux-x86_64-${nv_upstreamversion}-pkg2.run +nv_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_upstreamversion}-pkg2 +nv_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_upstreamversion}/${nv_filename} + +nv_new_filename := NVIDIA-Linux-x86_64-${nv_new_upstreamversion}-pkg2.run +nv_new_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_new_upstreamversion}-pkg2 +nv_new_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_new_upstreamversion}/${nv_new_filename} + +nv_legacy_filename := NVIDIA-Linux-x86_64-${nv_legacy_upstreamversion}-pkg2.run +nv_legacy_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_legacy_upstreamversion}-pkg2 +nv_legacy_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_legacy_upstreamversion}/${nv_legacy_filename} + +ati_package := fglrx64 +ati_url = http://www2.ati.com/drivers/linux/fglrx64_${ati_revision}.zip +ati_archdir = x86_64 +ati_nativelibdir = lib64 +ati_xorg_dir = x710_64a +fritz_dir := fritz64 +ipw3945_dir := x86_64 +split_fritz_modules += \ + fcdsl2/src/fcdsl2 \ + fcdslsl/src/fcdslsl \ + fcdslslusb/src/fcdslslusb \ + fcdslusb/1/fritz/src/fcdslusb \ + fcdslusb/2/fritz/src/fcdslusb2 \ + fcpci/src/fcpci +flavours := $(addprefix $(kernel_abi_version)-,generic lowlatency) +LTMODEM := 0 # no Winmodem support +VMDESCHED := 0 +vmware_server_extra_flavours := $(addprefix $(kernel_abi_version)-,server) +vmware_tools_extra_flavours := $(addprefix $(kernel_abi_version)-,server) +endif + +ifeq "$(DEB_HOST_ARCH)" "ia64" +export karch=ia64 +mw_target := TARGET=ia64-elf +flavours := $(addprefix $(kernel_abi_version)-,itanium mckinley) + +NVIDIA := 0 # no real upstream nvidia support +FGLRX := 0 # no fireGL support yet +MADWIFI := 0 # no madwifi support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d support +VMWARE := 0 # no vmware player support +endif + +ifeq "$(DEB_HOST_ARCH)" "powerpc" +export karch=powerpc +mw_target := TARGET=powerpc-be-elf +flavours := $(addprefix $(kernel_abi_version)-,powerpc powerpc-smp powerpc64-smp) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d suppor +VMWARE := 0 # no vmware player supportt +endif + +ifeq "$(DEB_HOST_ARCH)" "hppa" +export karch=hppa +mw_target := TARGET=hppa-be-elf +flavours := $(addprefix $(kernel_abi_version)-,hppa32 hppa64) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +MADWIFI := 0 # no madwifi support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d suppor +VMWARE := 0 # no vmware player supportt +endif + +ifeq "$(DEB_HOST_ARCH)" "sparc" +export karch=sparc +mw_target := TARGET=sparc-be-elf +flavours := $(addprefix $(kernel_abi_version)-,sparc64 sparc64-smp) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +MADWIFI := 0 # no madwifi support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d suppor +VMWARE := 0 # no vmware player supportt +endif + +flavours_udeb := $(shell grep ^$(DEB_HOST_ARCH) debian/d-i/kernel-versions | awk '{print $$4}') + +split_modules := +ifeq "$(FGLRX)" "1" +split_modules += ati/build_mod/2.6.x/fglrx +endif +ifeq "$(NVIDIA)" "1" +split_modules += nv/nvidia +endif +ifeq "$(MADWIFI)" "1" +split_modules += madwifi/ath_hal/ath_hal +endif +ifeq "$(FRITZ)" "1" +split_modules += $(split_fritz_modules) +endif +ifeq "$(LTMODEM)" "1" +split_modules += ltmodem/ltmodem ltmodem/ltserial +endif + +builddir := $(CURDIR)/debian/build +rbuilddir := debian/build + +download-avm: + rm -rf fritz fritz64 + python debian/getavmcardware.py + : # cleanup files we don't want in the archive + -find fritz fritz64 -name '*.ko' -o -name '*.rpm' | xargs rm -f + +unpack: unpack-stamp unpack-avm-stamp +unpack-stamp: + dh_testdir + + if [ -e debian/build ]; then \ + mv debian/build debian/build.old; \ + fi + mkdir debian/build + + for i in $(flavours) $(vmware_server_extra_flavours) $(vmware_tools_extra_flavours); do \ + mkdir -p debian/build/$$i; \ + done + +ifeq "$(FGLRX)" "1" + mkdir $(builddir)/ati-xorg + cd $(builddir)/ati-xorg; \ + $(SHELL) $(CURDIR)/ati/${ati_shar} --extract .; \ + chmod u+rw . -R; \ + mkdir -p extra_src/panel; \ + tar zxfC common/usr/src/ati/fglrx_panel_sources.tgz \ + extra_src/panel; \ + if [ -d $(CURDIR)/ati/patches/ ]; then \ + for i in $(CURDIR)/ati/patches/*; do \ + patch -p0 -d $(builddir)/ati-xorg/ < $$i; \ + done; \ + fi; + + for i in $(flavours); do \ + cp -al $(builddir)/ati-xorg/common/lib/modules/fglrx \ + $(builddir)/$$i/ati; \ + cp -a $(builddir)/ati-xorg/arch/$(ati_archdir)/lib/modules/fglrx/build_mod/* $(builddir)/$$i/ati/build_mod; \ + done +endif + + +ifeq "$(MADWIFI)" "1" + cd $(builddir)/; \ + tar jxf $(CURDIR)/madwifi/madwifi-$(madwifi_version).tar.bz2; \ + if [ -d $(CURDIR)/madwifi/patches/ ]; then \ + for i in $(CURDIR)/madwifi/patches/*; do \ + patch -p0 -d $(builddir)/madwifi-$(madwifi_version) < $$i; \ + done; \ + fi + + for i in $(flavours); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + cp -al $(builddir)/madwifi-$(madwifi_version) $(builddir)/$$i/madwifi; \ + fi; \ + done +endif + +ifeq "$(LTMODEM)" "1" + for i in $(kernel_abi_version)-386; do \ + cp -al ltmodem debian/build/$$i; \ + if [ -d $(CURDIR)/ltmodem/patches/ ]; then \ + for j in $(CURDIR)/ltmodem/patches/*; do \ + patch -p0 -d debian/build/$$i/ltmodem/ < $$j; \ + done; \ + fi; \ + done +endif + +ifeq "$(NVIDIA)" "1" + cd nvidia && sh ./$(nv_filename) --extract-only + cd nvidia && sh ./$(nv_new_filename) --extract-only + cd nvidia && sh ./$(nv_legacy_filename) --extract-only + + if [ -d $(CURDIR)/nvidia/patches/ ]; then \ + for i in $(CURDIR)/nvidia/patches/*; do \ + patch -p0 -d ${nv_dirname} < $$i; \ + done; \ + fi + + if [ -d $(CURDIR)/nvidia/patches-new/ ]; then \ + for i in $(CURDIR)/nvidia/patches-new/*; do \ + patch -p0 -d ${nv_new_dirname} < $$i; \ + done; \ + fi + + if [ -d $(CURDIR)/nvidia/patches-legacy/ ]; then \ + for i in $(CURDIR)/nvidia/patches-legacy/*; do \ + patch -p0 -d ${nv_legacy_dirname} < $$i; \ + done; \ + fi + + cd ${nv_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + cd ${nv_new_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + cd ${nv_legacy_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + + for i in $(flavours); do \ + cp -al ${nv_dirname}/usr/src/nv debian/build/$$i/nv; \ + cp -al ${nv_new_dirname}/usr/src/nv debian/build/$$i/nv-new; \ + cp -al ${nv_legacy_dirname}/usr/src/nv debian/build/$$i/nv-legacy; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_new_version)/g" -e "s/@@NV_LEGACY@@/-new/g" \ + -e "s:@dirname@:$(nv_new_dirname):" -e "s/@@NV_ALT@@/new/g" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx-new$$i; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_version)/g" -e "s/@@NV_LEGACY@@//g" \ + -e "s:@dirname@:$(nv_dirname):" -e "s/@@NV_ALT@@//g" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx$$i; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_legacy_version)/g" -e "s/@@NV_LEGACY@@/-legacy/g" \ + -e "s:@dirname@:$(nv_legacy_dirname):" -e "s/@@NV_ALT@@/legacy/g" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx-legacy$$i; \ + done +endif + for i in $(flavours); do \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/linux-restricted-modules.postinst \ + > debian/linux-restricted-modules-$$i.postinst; \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/linux-restricted-modules.postrm \ + > debian/linux-restricted-modules-$$i.postrm; \ + done + +ifeq "$(IPW3945)" "1" + mkdir $(builddir)/ipw3945 + cd $(builddir)/ipw3945 && tar zxf $(CURDIR)/ipw3945/ipw3945d-$(ipw3945_version).tgz +endif + +ifeq "$(VMWARE)" "1" + mkdir $(builddir)/vmware-player + cd $(builddir)/vmware-player; \ + tar xf $(CURDIR)/vmware-player/vmmon.tar; \ + tar xf $(CURDIR)/vmware-player/vmnet.tar; \ + if [ -d $(CURDIR)/vmware-player/patches/ ]; then \ + for i in $(CURDIR)/vmware-player/patches/*; do \ + patch -p0 -d $(builddir)/vmware-player < $$i; \ + done; \ + fi + + mkdir $(builddir)/vmware-server + cd $(builddir)/vmware-server; \ + tar xf $(CURDIR)/vmware-server/vmmon.tar; \ + tar xf $(CURDIR)/vmware-server/vmnet.tar; \ + if [ -d $(CURDIR)/vmware-server/patches/ ]; then \ + for i in $(CURDIR)/vmware-server/patches/*; do \ + patch -p0 -d $(builddir)/vmware-server < $$i; \ + done; \ + fi + + mkdir $(builddir)/vmware-tools + cd $(builddir)/vmware-tools; \ + tar xf $(CURDIR)/vmware-tools/vmdesched.tar; \ + tar xf $(CURDIR)/vmware-tools/vmmemctl.tar; \ + tar xf $(CURDIR)/vmware-tools/vmxnet.tar; \ + if [ -d $(CURDIR)/vmware-tools/patches/ ]; then \ + for i in $(CURDIR)/vmware-tools/patches/*; do \ + patch -p0 -d $(builddir)/vmware-tools < $$i; \ + done; \ + fi + + for i in $(flavours); do \ + cp -al $(builddir)/vmware-player $(builddir)/$$i/; \ + done + + for i in $(flavours) $(vmware_tools_extra_flavours); do \ + cp -al $(builddir)/vmware-tools $(builddir)/$$i/; \ + done + + for i in $(flavours) $(vmware_server_extra_flavours); do \ + cp -al $(builddir)/vmware-server $(builddir)/$$i/; \ + done + + for i in player server tools; do \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/vmware-kernel-modules.postinst > \ + debian/vmware-$$i-kernel-modules-$(kernel_abi_version).postinst; \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/vmware-kernel-modules.postrm > \ + debian/vmware-$$i-kernel-modules-$(kernel_abi_version).postrm; \ + done +endif + + touch unpack-stamp + +unpack-avm-stamp: +ifeq "$(FRITZ)" "1" + for i in $(flavours); do \ + mkdir -p debian/build/$$i; \ + for f in $(fritz_dir)/*; do \ + cp -al $$f debian/build/$$i; \ + done; \ + done +endif + touch unpack-avm-stamp + +build-kernel: build-kernel-stamp +build-kernel-stamp: unpack-stamp + dh_testdir + dh_testroot + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_release)}g;' \ + -e 's{#VERSION#}{$(nv_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches + cp -al $(nv_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_legacy_release)}g;' \ + -e 's{#VERSION#}{$(nv_legacy_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_legacy_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_legacy_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/patches + cp -al $(nv_legacy_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-legacy-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-new-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_new_release)}g;' \ + -e 's{#VERSION#}{$(nv_new_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_new_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_new_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/patches + cp -al $(nv_new_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-new-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-new-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-new-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-new-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/fglrx-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/fglrx-kernel/fglrx + cp -r $(CURDIR)/ati/debian.binary/* $(CURDIR)/debian/temp/modules/fglrx-kernel/debian + set +e && for f in `ls $(CURDIR)/ati/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(ati_xorg_base_version)}g;' \ + -e 's{#REVISION#}{$(ati_revision)}g;' \ + -e 's{#VERSION#}{$(ati_xorg_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(ati_upstreamversion)}g;' \ + -e 's{#URL#}{$(ati_url)}g' \ + < $(CURDIR)/ati/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/$$f ; \ + done + cp -al debian/build/ati-xorg/common/lib/modules/fglrx $(CURDIR)/debian/temp/modules/fglrx-kernel || true + chmod 755 $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + tar -zcvf $(CURDIR)/fglrx-kernel-source.tar.gz -C debian/temp modules + rm -rf debian/temp + + touch build-kernel-stamp + +build: build-stamp build-avm-stamp modalias-patterns-stamp debian/control +build-stamp: unpack-stamp + dh_testdir + +ifeq "$(FGLRX)" "1" + make -C debian/build/ati-xorg/extra_src/panel QTDIR=/usr/share/qt3 +endif + +ifeq "$(MADWIFI)" "1" + for i in $(flavours); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + make karch=$(karch) -C debian/build/$$i/madwifi \ + KERNELPATH=/usr/src/linux-headers-$$i $(mw_target); \ + fi; \ + done +endif + +ifeq "$(VMWARE)" "1" + for i in $(flavours); do \ + $(MAKE) -C $(builddir)/$$i/vmware-player/vmmon-only VM_UNAME=$$i; \ + $(MAKE) -C $(builddir)/$$i/vmware-player/vmnet-only VM_UNAME=$$i; \ + done + + for i in $(flavours) $(vmware_server_extra_flavours); do \ + $(MAKE) -C $(builddir)/$$i/vmware-server/vmmon-only VM_UNAME=$$i; \ + $(MAKE) -C $(builddir)/$$i/vmware-server/vmnet-only VM_UNAME=$$i; \ + done + + for i in $(flavours) $(vmware_tools_extra_flavours); do \ + $(MAKE) -C $(builddir)/$$i/vmware-tools/vmmemctl-only VM_UNAME=$$i; \ + $(MAKE) -C $(builddir)/$$i/vmware-tools/vmxnet-only VM_UNAME=$$i; \ + if [ "$(VMDESCHED)" = "1" ]; then \ + $(MAKE) -C $(builddir)/$$i/vmware-tools/vmdesched-only VM_UNAME=$$i; \ + fi; \ + done +endif + +ifeq "$(LTMODEM)" "1" + for i in $(kernel_abi_version)-386; do \ + $(MAKE) -C $(builddir)/$$i/ltmodem \ + KERNEL_DIR=/usr/src/linux-headers-$$i module; \ + done +endif + +ifeq "$(FGLRX)" "1" + for i in $(flavours); do \ + $(MAKE) -C $(builddir)/$$i/ati/build_mod/2.6.x \ + KDIR=/usr/src/linux-headers-$$i; \ + done +endif + +ifeq "$(NVIDIA)" "1" + for i in $(flavours); do \ + cd debian/build/$$i; \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv -f Makefile SYSSRC=/usr/src/linux-headers-$$i KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv" module; \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv-new -f Makefile SYSSRC=/usr/src/linux-headers-$$i KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv-new" module; \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv-legacy -f Makefile SYSSRC=/usr/src/linux-headers-$$i KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv-legacy" module; \ + cd - > /dev/null; \ + done +endif + + touch build-stamp + +build-avm-stamp: unpack-avm-stamp + dh_testdir +ifeq "$(FRITZ)" "1" + for i in $(flavours); do \ + for d in debian/build/$$i/f*; do \ + m=$$(basename $$d); \ + echo building for flavour $$i, module $$m; \ + if [ -d $$d/src.drv ]; then \ + make -C $$d/src.drv \ + `cat $$d/make.card` \ + KRNLINCL=/usr/src/linux-headers-$$i \ + || true; \ + else \ + if [ -f $$d/ID ]; then \ + mkdir -p $$d/tmp; \ + echo make -C $$d/src `cat $$d/ID` KDIR=/usr/src/linux-headers-$$i; \ + make -C $$d/src \ + `cat $$d/ID` \ + KDIR=/usr/src/linux-headers-$$i \ + LIBDIR=$(CURDIR)/$$d/tmp; \ + rm -rf $$d/tmp; \ + else \ + for d2 in $$d/?/fritz; do \ + mkdir -p $$d2/tmp; \ + echo make -C $$d2/src `cat $$d2/ID` KDIR=/usr/src/linux-headers-$$i; \ + make -C $$d2/src \ + `cat $$d2/ID` \ + KDIR=/usr/src/linux-headers-$$i \ + LIBDIR=$(CURDIR)/$$d2/tmp; \ + rm -rf $$d2/tmp; \ + done; \ + fi; \ + fi; \ + done; \ + done +endif + touch build-avm-stamp + +modalias-patterns-stamp: build-stamp + dh_testdir + +ifeq "$(FGLRX)" "1" + for i in $(flavours); do \ + $(SHELL) ati/fglrx_supported \ + $(rbuilddir)/ati-xorg/$(ati_xorg_dir)/usr/X11R6/$(ati_nativelibdir)/modules/drivers/fglrx_drv.so \ + > $(rbuilddir)/$$i/ati/modules.alias.override; \ + done +endif + +ifeq "$(MADWIFI)" "1" + for i in $(flavours); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + $(SHELL) madwifi/ath_hal_supported \ + $(rbuilddir)/$$i/madwifi/ath/ath_pci.ko \ + > $(rbuilddir)/$$i/madwifi/modules.alias.override; \ + fi; \ + done +endif + +ifeq "$(NVIDIA)" "1" + for i in $(flavours); do \ + $(SHELL) nvidia/nvidia_supported \ + $(rbuilddir)/$$i/nv/nv-kernel.o nvidia \ + $(rbuilddir)/$$i/nv-legacy/nv-kernel.o nvidia_legacy \ + $(rbuilddir)/$$i/nv-new/nv-kernel.o nvidia_new \ + > $(rbuilddir)/$$i/nv/modules.alias.override; \ + done +endif + + touch modalias-patterns-stamp + +debian/control: + echo '# THIS FILE IS AUTO-GENERATED FROM control.stub.in' > debian/control.stub + sed -e 's/@@NV_VERSION@@/$(nv_version)/g' \ + -e 's/@@NV_NEW_VERSION@@/$(nv_new_version)/g' \ + -e 's/@@NV_LEGACY_VERSION@@/$(nv_legacy_version)/g' \ + -e 's/@@KVERSION@@/$(kernel_version)/g' \ + -e 's/@@ABIVER@@/$(kernel_abi_version)/g' \ + debian/control.stub.in >> debian/control.stub + echo '# THIS FILE IS AUTO-GENERATED FROM kernel-versions.in' > debian/d-i/kernel-versions + sed -e 's/@@ABIVER@@/$(kernel_abi_version)/g' \ + debian/d-i/kernel-versions.in >> debian/d-i/kernel-versions + rm -rf $(udeb_prefix) + mkdir -p $(udeb_prefix)/modules $(udeb_prefix)/firmware + -cp -a debian/d-i/modules/$(DEB_HOST_ARCH) $(udeb_prefix)/modules/ + -cp -a debian/d-i/firmware/$(DEB_HOST_ARCH) $(udeb_prefix)/firmware/ + cp -a debian/d-i/package-list debian/d-i/kernel-versions $(udeb_prefix)/ + ln -s .. $(udeb_prefix)/debian + (cd $(udeb_prefix) && kernel-wedge gen-control) > debian/control + rm -rf $(udeb_prefix) + +clean: debian/control + dh_testdir + dh_testroot + rm -f unpack-stamp build-stamp build-kernel-stamp \ + modalias-patterns-stamp + rm -rf debian/build* debian/temp/ + rm -f debian/vmware-*-kernel-modules-*.postinst + rm -f debian/vmware-*-kernel-modules-*.postrm + rm -f debian/linux-restricted-modules-[0-9]*.postinst + rm -f debian/linux-restricted-modules-*.postrm + rm -f debian/linux-restricted-modules-*.preinst + rm -f debian/linux-restricted-modules-*.prerm + rm -f debian/nic-restricted-modules-*.postinst + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do rm -f debian/nvidia-glx$$i debian/nvidia-glx-legacy$$i debian/nvidia-glx-new$$i; \ + done + rm -rf $(nv_dirname) $(nv_legacy_dirname) $(nv_new_dirname) + rm -f nvidia-kernel-source.tar.gz nvidia-legacy-kernel-source.tar.gz \ + nvidia-new-kernel-source.tar.gz + rm -f fglrx-kernel-source.tar.gz + dh_clean `find debian/d-i/modules debian/d-i/firmware -type l 2>/dev/null` + rm -rf $(udeb_prefix) + rm -rf avm-download build-avm-stamp unpack-avm-stamp + rm -rf debian/nic-restricted-modules-*-di \ + debian/nic-restricted-firmware-*-di + rm -f correct-lib-path + cp -f debian/control.stub debian/control + +install: build build-kernel + dh_testdir + dh_clean -k + dh_installdirs + + # Split modules for install + chmod u+rx debian/split-module + for flavour in $(flavours); do \ + export KERNELPATH=/usr/src/linux-headers-$$flavour; \ + export $(mw_target); \ + for module in $(split_modules); do \ + if [ "$$module" = "ltmodem/ltmodem" ] \ + || [ "$$module" = "ltmodem/ltserial" ] \ + && [ "$$flavour" != "$(kernel_abi_version)-386" ]; then \ + echo "No $$module driver for $$flavour"; \ + elif [ "$$module" = "madwifi/ath_hal/ath_hal" ] \ + && [ "$$flavour" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "No $$module driver for $$flavour"; \ + else \ + echo "KERNELPATH=/usr/src/linux-headers-$$flavour $(mw_target) CC=$(CC) GCC=$(GCC) debian/split-module $$(basename $$module) debian/build/$$flavour/$$(dirname $$module) $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour"; \ + debian/split-module $$(basename $$module) \ + debian/build/$$flavour/$$(dirname $$module) \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour; \ + fi; \ + done; \ + done + +ifeq "$(NVIDIA)" "1" + for flavour in $(flavours); do \ + export KERNELPATH=/usr/src/linux-headers-$$flavour; \ + debian/split-module nvidia \ + debian/build/$$flavour/nv-legacy \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy; \ + mv $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy/nvidia \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nvidia_legacy; \ + rm -rf $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy; \ + debian/split-module nvidia \ + debian/build/$$flavour/nv-new \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-new; \ + mv $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-new/nvidia \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nvidia_new; \ + rm -rf $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-new; \ + install -D -m0644 \ + $(rbuilddir)/$$flavour/nv/modules.alias.override \ + $(prefix)-$$flavour/usr/share/linux-restricted-modules/$$flavour/modules.alias.override/nvidia; \ + done +endif + +ifeq "$(MADWIFI)" "1" + for flavour in $(flavours); do \ + if [ "$$flavour" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + install -d $(prefix)-$$flavour/lib/modules/$$flavour/madwifi; \ + find debian/build/$$flavour/madwifi -name '*.ko' ! -name 'ath_hal.ko' | \ + xargs cp --target=$(prefix)-$$flavour/lib/modules/$$flavour/madwifi; \ + install -D -m0644 \ + $(rbuilddir)/$$flavour/madwifi/modules.alias.override \ + $(prefix)-$$flavour/usr/share/linux-restricted-modules/$$flavour/modules.alias.override/ath_hal; \ + fi; \ + done +endif + +ifeq "$(VMWARE)" "1" + for flavour in $(flavours); do \ + install -d $(vmplay_dir)/lib/modules/$$flavour/vmware-player; \ + find debian/build/$$flavour/vmware-player -name '*.ko' | \ + xargs cp --target=$(vmplay_dir)/lib/modules/$$flavour/vmware-player; \ + done + + for flavour in $(flavours) $(vmware_server_extra_flavours); do \ + install -d $(vmserv_dir)/lib/modules/$$flavour/vmware-server; \ + find debian/build/$$flavour/vmware-server -name '*.ko' | \ + xargs cp --target=$(vmserv_dir)/lib/modules/$$flavour/vmware-server; \ + done + + for flavour in $(flavours) $(vmware_tools_extra_flavours); do \ + install -d $(vmtool_dir)/lib/modules/$$flavour/vmware-tools; \ + find debian/build/$$flavour/vmware-tools -name '*.ko' | \ + xargs cp --target=$(vmtool_dir)/lib/modules/$$flavour/vmware-tools; \ + done +endif + + # fglrx +ifeq "$(FGLRX)" "1" + $(CC) debian/correct-lib-path.c -o correct-lib-path + + dh_installdirs -pfglrx-control \ + usr/bin \ + usr/share/applnk \ + usr/share/gnome \ + usr/share/icons \ + usr/share/pixmaps + + make -C $(builddir)/ati-xorg/extra_src/panel QTDIR=/usr/share/qt3 \ + DESTDIR=$(CURDIR)/debian/fglrx-control install + dh_install -pfglrx-control ati/fireglcontrol.desktop usr/share/gnome + dh_install -pfglrx-control ati/fireglcontrol_kde3.desktop \ + usr/share/applnk + + dh_installdirs -p xorg-driver-fglrx usr/bin usr/lib/xorg/modules \ + usr/sbin usr/share/man/man8 + dh_installdirs -p xorg-driver-fglrx-dev usr/include usr/lib + + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/common/usr/share/man/man8/* \ + usr/share/man/man8 + dh_install -pxorg-driver-fglrx-dev \ + $(rbuilddir)/ati-xorg/common/usr/X11R6/include/* \ + $(rbuilddir)/ati-xorg/common/usr/include/* \ + usr/include + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/bin/* \ + usr/bin + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/common/usr/sbin/* \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/sbin/* \ + usr/sbin + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/$(ati_nativelibdir)/*.so* usr/lib + ./correct-lib-path debian/xorg-driver-fglrx/usr/lib/libGL.so.1.2 \ + /usr/X11R6/$(ati_nativelibdir)/modules/dri \ + /usr/lib/dri + + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/$(ati_nativelibdir)/modules/* usr/lib/xorg/modules + mv debian/xorg-driver-fglrx/usr/lib/xorg/modules/dri \ + debian/xorg-driver-fglrx/usr/lib/ + dh_install -pxorg-driver-fglrx-dev \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/$(ati_nativelibdir)/*.a usr/lib + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/$(ati_xorg_dir)/usr/X11R6/$(ati_nativelibdir)/modules/* \ + usr/lib/xorg/modules + +ifeq "$(ati_archdir)" "x86_64" + # 32-bit stuff + dh_installdirs -p usr/lib32 + + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/lib/*.so* \ + usr/lib32 + ./correct-lib-path debian/xorg-driver-fglrx/usr/lib32/libGL.so.1.2 \ + /usr/X11R6/lib/modules/dri \ + /usr/lib32/dri + + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/lib/modules/* \ + usr/lib32/xorg/modules + mv debian/xorg-driver-fglrx/usr/lib32/xorg/modules/dri \ + debian/xorg-driver-fglrx/usr/lib32/ + dh_install -pxorg-driver-fglrx-dev \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/lib/*.a \ + usr/lib32 + dh_installdirs -pxorg-driver-fglrx etc/X11/Xsession.d + dh_install -pxorg-driver-fglrx ati/fglrx.xsession \ + etc/X11/Xsession.d/70fglrx_32bit_dri +endif + + install -m 644 $(CURDIR)/fglrx-kernel-source.tar.gz $(CURDIR)/debian/fglrx-kernel-source/usr/src + + for flavour in $(flavours); do \ + install -D -m0644 \ + $(rbuilddir)/$$flavour/ati/modules.alias.override \ + $(prefix)-$$flavour/usr/share/linux-restricted-modules/$$flavour/modules.alias.override/fglrx; \ + done +endif + + # madwifi + +ifeq "$(NVIDIA)" "1" + # Huge pile of crud so we don't have to dupe for nvidia-{legacy,new} + for nv_flav in "" -new -legacy; do \ + install -m 644 $(CURDIR)/nvidia$${nv_flav}-kernel-source.tar.gz \ + $(CURDIR)/debian/nvidia$${nv_flav}-kernel-source/usr/src; \ + case $$nv_flav in \ + -new) this_dir=$(nv_new_dirname); this_ver=$(nv_new_version) ;; \ + -legacy) this_dir=$(nv_legacy_dirname); this_ver=$(nv_legacy_version) ;;\ + *) this_dir=$(nv_dirname); this_ver=$(nv_version) ;; \ + esac; \ + install -m 0644 $$this_dir/usr/X11R6/lib/modules/drivers/nvidia_drv.so \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/drivers/; \ + install $$this_dir/usr/X11R6/lib/libXvMCNVIDIA.a \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib/libXvMCNVIDIA.a; \ + install $$this_dir/usr/X11R6/lib/libXvMCNVIDIA.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/libXvMCNVIDIA.so.$$this_ver; \ + install -m 0644 $$this_dir/usr/include/GL/gl.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + install -m 0644 $$this_dir/usr/include/GL/glext.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + install -m 0644 $$this_dir/usr/include/GL/glx.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + if [ -e $$this_dir/usr/include/GL/glxext.h ]; then \ + install -m 0644 $$this_dir/usr/include/GL/glxext.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + fi; \ + install -m 0644 $$this_dir/usr/lib/libGL.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib; \ + install -m 0644 $$this_dir/usr/lib/libGLcore.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib; \ + if [ -e $$this_dir/usr/lib/libnvidia-cfg.so.$$this_ver ]; then \ + install -m 0644 $$this_dir/usr/lib/libnvidia-cfg.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib; \ + fi; \ + sed "s/__GENERATED_BY__/Ubuntu nvidia-$${nv_flav}graphics-drivers/" \ + $$this_dir/usr/lib/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib/" > \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib/libGL.la; \ + if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \ + install -d $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32 \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib32; \ + install -m 0644 $$this_dir/usr/lib32/libGL.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32; \ + install -m 0644 $$this_dir/usr/lib32/libGLcore.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32; \ + if [ -e $$this_dir/usr/lib32/libnvidia-cfg.so.$$this_ver ]; then \ + install -m 0644 $$this_dir/usr/lib32/libnvidia-cfg.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32; \ + fi; \ + sed "s/__GENERATED_BY__/Ubuntu nvidia-$${nv_flav}graphics-drivers/" \ + $$this_dir/usr/lib32/libGL.la | \ + sed "s/__LIBGL_PATH__/\/usr\/lib32/" > \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib32/libGL.la; \ + fi; \ + install nvidia/nvidia-glx-config \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/sbin; \ + install $$this_dir/usr/lib/libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/; \ + install $$this_dir/usr/lib/tls/libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/tls/; \ + if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \ + install $$this_dir/usr/lib32/libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32/; \ + install -d $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32/tls; \ + install $$this_dir/usr/lib32/tls/libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32/tls/; \ + fi; \ + install $$this_dir/usr/X11R6/lib/modules/extensions/libglx.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/; \ + if [ "$$this_ver" = "$(nv_new_version)" ]; then \ + install $$this_dir/usr/X11R6/lib/modules/libnvidia-wfb.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/; \ + fi; \ + install $$this_dir/usr/bin/tls_test \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/nvidia; \ + install $$this_dir/usr/bin/tls_test_dso.so \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/nvidia; \ + install -d $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/lintian/overrides; \ + install -m 0644 debian/nvidia-glx$${nv_flav}.override \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/lintian/overrides/nvidia-glx$${nv_flav}; \ + install -m 755 $$this_dir/usr/bin/nvidia-bug-report.sh \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/bin/; \ + if [ -e $$this_dir/usr/share/man/man1/nvidia-settings.1.gz ]; then \ + install -m 755 $$this_dir/usr/bin/nvidia-settings \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/bin/; \ + install -m 644 $$this_dir/usr/share/man/man1/nvidia-settings.1.gz \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/man/man1/; \ + fi; \ + if [ -e $$this_dir/usr/share/man/man1/nvidia-xconfig.1.gz ]; then \ + install -m 755 $$this_dir/usr/bin/nvidia-xconfig \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/bin/; \ + install -m 644 $$this_dir/usr/share/man/man1/nvidia-xconfig.1.gz \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/man/man1/; \ + fi; \ + install $(CURDIR)/debian/nvidia-glx$${nv_flav}.reportbug \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/bug/nvidia-glx$${nv_flav}/script; \ + done +endif + +# XXX We change the default here to avoid recreating the tarball. Fix up +# next time .orig.tar.gz is regenerated. +# acx100/acx111 and dvb firmware + for i in $(flavours); do \ + mkdir -p $(prefix)-$$i/lib/firmware/$$i; \ + cp -a acx $(prefix)-$$i/lib/firmware/$$i/; \ + rm -f $(prefix)-$$i/lib/firmware/$$i/acx/default/tiacx111c16; \ + rm -f $(prefix)-$$i/lib/firmware/$$i/acx/default/tiacx111c17; \ + ln -s ../1.2.1.34/tiacx111c16 $(prefix)-$$i/lib/firmware/$$i/acx/default/; \ + ln -s ../1.2.1.34/tiacx111c17 $(prefix)-$$i/lib/firmware/$$i/acx/default/; \ + cp -a dvb/* $(prefix)-$$i/lib/firmware/$$i/; \ + done + +# avm fritz + +ifeq "$(FRITZ)" "1" + dh_installdirs -p$(pkg_avmfw) usr/share/isdn/$(avmfw_dir) + for d in $(fritz_dir)/*; do \ + for f in $$d/*.bin $$d/*.frm $$d/?/fritz/*.bin $$d/?/fritz/*.frm; do \ + [ -f $$f ] || continue; \ + cp -p $$f debian/$(pkg_avmfw)/usr/share/isdn/$(avmfw_dir)/; \ + done; \ + done + for i in $(flavours); do \ + install -d $(prefix)-$$i/usr/share/isdn; \ + ln -s $(avmfw_dir) $(prefix)-$$i/usr/share/isdn/$$i; \ + done; \ + + dh_installdirs -pavm-fritz-kernel-source usr/src + tar cfz debian/avm-fritz-kernel-source/usr/src/avm-fritz.tgz \ + $(fritz_dir)/*/license.txt \ + $(fritz_dir)/*/Makefile \ + $(fritz_dir)/*/ID \ + $(fritz_dir)/*/lib \ + $(fritz_dir)/*/src \ + $(fritz_dir)/*/?/fritz/license.txt \ + $(fritz_dir)/*/?/fritz/Makefile \ + $(fritz_dir)/*/?/fritz/ID \ + $(fritz_dir)/*/?/fritz/lib \ + $(fritz_dir)/*/?/fritz/src + dh_installdocs -p avm-fritz-kernel-source $(fritz_dir)/fcdsl2/*.html $(fritz_dir)/fcdsl2/*.txt +endif + +ifeq "$(IPW3945)" "1" + for i in $(flavours); do \ + mkdir -p $(prefix)-$$i/sbin; \ + cp $(builddir)/ipw3945/ipw3945d-$(ipw3945_version)/$(ipw3945_dir)/ipw3945d \ + $(prefix)-$$i/sbin/ipw3945d-$$i; \ + done +endif + +# Copy modules to a temporary tree for use in udebs. +build-udebs: install + dh_testdir + dh_testroot + + for i in $(flavours_udeb); do \ + mkdir -p debian/nic-restricted-firmware-$$i-di/lib/firmware/$$i; \ + cp -a $(prefix)-$$i/lib/firmware/$$i/* \ + debian/nic-restricted-firmware-$$i-di/lib/firmware/$$i/; \ + cp debian/lrm-manager debian/nic-restricted-modules-$$i-di.postinst; \ + done + +ifeq "$(MADWIFI)" "1" + for i in $(flavours_udeb); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + mkdir -p debian/nic-restricted-modules-$$i-di/lib/linux-restricted-modules/$$i/ \ + debian/nic-restricted-modules-$$i-di/lib/modules/$$i/; \ + cp -a $(prefix)-$$i/lib/linux-restricted-modules/$$i/ath_hal \ + debian/nic-restricted-modules-$$i-di/lib/linux-restricted-modules/$$i/; \ + cp -a $(prefix)-$$i/lib/modules/$$i/madwifi \ + debian/nic-restricted-modules-$$i-di/lib/modules/$$i/; \ + fi; \ + done +endif + +ifeq "$(IPW3945)" "1" + for i in $(flavours_udeb); do \ + mkdir -p debian/nic-restricted-modules-$$i-di/sbin/ \ + debian/nic-restricted-modules-$$i-di/etc/modprobe.d/; \ + cp -a ipw3945/ipw3945.modprobe \ + debian/nic-restricted-modules-$$i-di/etc/modprobe.d/ipw3945; \ + cp -a $(prefix)-$$i/sbin/ipw3945d-$$i \ + debian/nic-restricted-modules-$$i-di/sbin/; \ + done +endif + +# Build architecture-independent files here. +binary-indep: + dh_testdir + + install -d debian/linux-restricted-modules-common/sbin + install -m 755 debian/lrm-manager debian/linux-restricted-modules-common/sbin/lrm-manager + install -m 755 debian/lrm-video debian/linux-restricted-modules-common/sbin/lrm-video + install -d debian/linux-restricted-modules-common/etc/default + install -m 644 debian/linux-restricted-modules-common.default \ + debian/linux-restricted-modules-common/etc/default/linux-restricted-modules-common + install -d debian/linux-restricted-modules-common/etc/modprobe.d + install -m 644 ipw3945/ipw3945.modprobe \ + debian/linux-restricted-modules-common/etc/modprobe.d/ipw3945 + install -m 644 debian/linux-restricted-modules-common.modprobe \ + debian/linux-restricted-modules-common/etc/modprobe.d/lrm-video + + dh_installchangelogs -i + dh_installinit -p linux-restricted-modules-common --no-start -- start 7 S . start 1 0 6 . + dh_fixperms -i + dh_compress -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: install build-udebs + dh_testdir + + dh_installchangelogs -s + dh_installdocs -s + dh_installexamples -s + dh_installman -s + dh_installinit -s + dh_link -s + # FIXME: Remove this when -legacy supports this library: + rm -f debian/nvidia-glx-legacy/usr/lib/libnvidia-cfg.so.1 + rm -f debian/nvidia-glx-legacy/usr/lib32/libnvidia-cfg.so.1 + dh_strip -s -X1.0.$(nv_release) -X1.0.$(nv_legacy_release) -Xtls_test + dh_compress -X.h -s + dh_fixperms -s + dh_installdeb -s + dh_shlibdeps -X'*tls*' -X'*lib32*' -X'*lib64*' -s \ + -l$(CURDIR)/debian/nvidia-glx/usr/lib:$(CURDIR)/debian/xorg-driver-fglrx/usr/lib +ifeq "$(NVIDIA)" "1" + # this is a dirty hack, but we don't want -glx-legacy to depend on -glx + sed -i -e 's/, nvidia-glx//' debian/nvidia-glx-legacy.substvars +endif + dh_gencontrol -s + # fglrx, nVidia and ACM build with different version numbers +ifeq "$(FGLRX)" "1" + dh_gencontrol -v -pxorg-driver-fglrx -- -v${ati_xorg_version}+${lrm_version} -Vati:Revision=${ati_revision} + dh_gencontrol -v -pxorg-driver-fglrx-dev -- -v${ati_xorg_version}+${lrm_version} -Vati:Revision=${ati_revision} -Vati:XOrgFullVersion=${ati_xorg_version}+${lrm_version} + dh_gencontrol -v -pfglrx-kernel-source -- -v${ati_revision}+${lrm_version} -Vati:XOrgVersion=${ati_xorg_version} -Vati:XFree86Version=${ati_xf86_version} + dh_gencontrol -v -pfglrx-control -- -v${ati_revision}+${lrm_version} -Vati:Revision=${ati_revision} +endif +ifeq "$(NVIDIA)" "1" + dh_gencontrol -v -pnvidia-glx -- -v1:${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + dh_gencontrol -v -pnvidia-glx-dev -- -v1:${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + dh_gencontrol -v -pnvidia-kernel-source -- -v1:${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + + dh_gencontrol -v -pnvidia-glx-new -- -v${nv_new_version}+${lrm_version} -Vnvidia:NewVersion=${nv_new_version} + dh_gencontrol -v -pnvidia-glx-new-dev -- -v${nv_new_version}+${lrm_version} -Vnvidia:NewVersion=${nv_new_version} + dh_gencontrol -v -pnvidia-new-kernel-source -- -v${nv_new_version}+${lrm_version} -Vnvidia:NewVersion=${nv_new_version} + + dh_gencontrol -v -pnvidia-glx-legacy -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} + dh_gencontrol -v -pnvidia-glx-legacy-dev -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} + dh_gencontrol -v -pnvidia-legacy-kernel-source -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} +endif +ifeq "$(FRITZ)" "1" + dh_gencontrol -v -pavm-fritz-kernel-source -- -v${avm_version}+${lrm_version} -Vavm:Version=${avm_version} + dh_gencontrol -v -p$(pkg_avmfw) -- -v${avm_version}+${lrm_version} -Vavm:Version=${avm_version} +endif + dh_md5sums -s + dh_builddeb -s + +printenv: + @echo "DEB_HOST_ARCH: $(DEB_HOST_ARCH)" + @echo "flavours: $(flavours)" + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install unpack build-kernel +.PHONY: debian/control build-udebs