rendered paste bodydiff -Nru /tmp/DxmU9MNDfK/restricted-manager-0.11/debian/changelog /tmp/ZgaZ3FuRMl/restricted-manager-0.12/debian/changelog--- /tmp/DxmU9MNDfK/restricted-manager-0.11/debian/changelog 2007-03-19 14:19:40.000000000 +0100+++ /tmp/ZgaZ3FuRMl/restricted-manager-0.12/debian/changelog 2007-03-20 10:10:00.000000000 +0100@@ -1,3 +1,19 @@+restricted-manager (0.12) feisty; urgency=low++ * RestrictedManager/modalias.append: Remove the manual nvidia list, since+ entries here are clobbered by modalias.override.+ * modalias_override/nvidia_supported: Maintain manual nvidia list here, so+ that modalias.override can be regenerated without losing any manually+ added entries.+ * modalias_override/nvidia_supported: Add "C51 PCI Express Bridge (rev a2)"+ which reportedly works with the driver. (LP: #93300)+ * RestrictedManager/modalias.override: Regenerate with latest+ nvidia_supported.+ * debian/restricted-manager.postinst: Bump version for purging invalid cache+ files on upgrades to 0.11, to clean up after #93368.++ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 20 Mar 2007 10:06:08 +0100+ restricted-manager (0.11) feisty; urgency=low * RestrictedManager/xorg_driver.py: Do not autodetect mouse and monitor when@@ -15,7 +31,7 @@ * RestrictedManager/{xorg_driver,nvidia,fglrx}.py: Do not assume that the kernel module name always matches the X.org driver module name (nvidia_legacy vs. nvidia), but instead pass the X.org driver name as a- separate attribute. ((LP: #92849, part two)+ separate attribute. (LP: #92849, part two) * RestrictedManager/modalias.override: Add NV44A [GeForce 6200] (not covered by nvidia_supported). (LP: #93209) * RestrictedManager/core.py: When loading default or special handlers, checkdiff -Nru /tmp/DxmU9MNDfK/restricted-manager-0.11/debian/restricted-manager.postinst /tmp/ZgaZ3FuRMl/restricted-manager-0.12/debian/restricted-manager.postinst--- /tmp/DxmU9MNDfK/restricted-manager-0.11/debian/restricted-manager.postinst 2007-03-13 17:17:41.000000000 +0100+++ /tmp/ZgaZ3FuRMl/restricted-manager-0.12/debian/restricted-manager.postinst 2007-03-20 10:05:58.000000000 +0100@@ -6,7 +6,7 @@ chmod 3775 /var/cache/restricted-manager fi -if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "0.7"; then+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "0.11"; then # Earlier versions saved incorrect cache files. rm -f /var/cache/restricted-manager/*.restricted || true fidiff -Nru /tmp/DxmU9MNDfK/restricted-manager-0.11/modalias_override/nvidia_supported /tmp/ZgaZ3FuRMl/restricted-manager-0.12/modalias_override/nvidia_supported--- /tmp/DxmU9MNDfK/restricted-manager-0.11/modalias_override/nvidia_supported 2007-03-13 10:58:57.000000000 +0100+++ /tmp/ZgaZ3FuRMl/restricted-manager-0.12/modalias_override/nvidia_supported 2007-03-20 09:57:14.000000000 +0100@@ -57,6 +57,12 @@ end puts++ puts "# Cards which are not mentioned on the nvidia homepage"+ puts "# NV44A [GeForce 6200] (rev a1)"+ puts "alias pci:v000010DEd00000221sv*sd*bc*sc*i* nvidia"+ puts "# C51 PCI Express Bridge (rev a2)"+ puts "alias pci:v000010DEd00000244sv*sd*bc*sc*i* nvidia" end def usagediff -Nru /tmp/DxmU9MNDfK/restricted-manager-0.11/RestrictedManager/modalias.append /tmp/ZgaZ3FuRMl/restricted-manager-0.12/RestrictedManager/modalias.append--- /tmp/DxmU9MNDfK/restricted-manager-0.11/RestrictedManager/modalias.append 2007-03-19 13:22:55.000000000 +0100+++ /tmp/ZgaZ3FuRMl/restricted-manager-0.12/RestrictedManager/modalias.append 2007-03-20 09:51:44.000000000 +0100@@ -229,8 +229,3 @@ alias pci:v0000168Cd00000013sv*sd*bc*sc*i* ath_hal alias pci:v0000168Cd00000012sv*sd*bc*sc*i* ath_hal alias pci:v0000168Cd00000007sv*sd*bc*sc*i* ath_hal--# nVidia cards which are not covered by nvidia_supported-# NV44A [GeForce 6200] (rev a1)-alias pci:v000010DEd00000221sv*sd*bc*sc*i* nvidia-diff -Nru /tmp/DxmU9MNDfK/restricted-manager-0.11/RestrictedManager/modalias.override /tmp/ZgaZ3FuRMl/restricted-manager-0.12/RestrictedManager/modalias.override--- /tmp/DxmU9MNDfK/restricted-manager-0.11/RestrictedManager/modalias.override 2007-03-19 12:50:52.000000000 +0100+++ /tmp/ZgaZ3FuRMl/restricted-manager-0.12/RestrictedManager/modalias.override 2007-03-20 09:58:10.000000000 +0100@@ -201,3 +201,8 @@ alias pci:v000010DEd00000150sv*sd*bc*sc*i* nvidia_legacy alias pci:v000010DEd00000153sv*sd*bc*sc*i* nvidia_legacy +# Cards which are not mentioned on the nvidia homepage+# NV44A [GeForce 6200] (rev a1)+alias pci:v000010DEd00000221sv*sd*bc*sc*i* nvidia+# C51 PCI Express Bridge (rev a2)+alias pci:v000010DEd00000244sv*sd*bc*sc*i* nvidia