[Pkg-fglrx-devel] r1515 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-09-27 08:48:13 +0000 (Sun, 27 Sep 2015)
New Revision: 1515

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch
Log:
* Refresh patch 04-3.17rc6-no_hotplug.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-09-19 18:10:23 UTC (rev 1514)
+++ fglrx-driver/trunk/debian/changelog	2015-09-27 08:48:13 UTC (rev 1515)
@@ -1,10 +1,14 @@
 fglrx-driver (1:15.9-1) UNRELEASED; urgency=medium
 
+  [ Andreas Beckmann ]
   * New upstream release 15.9 (2015-09-15) (15.201.1151).  (Closes: #799439)
   * Use signature from 15.7.
   * Update watch file.
   * Update lintian overrides.
 
+  [ Patrick Matthäi ]
+  * Refresh patch 04-3.17rc6-no_hotplug.
+
  -- Andreas Beckmann <anbe at debian.org>  Sat, 19 Sep 2015 16:55:28 +0200
 
 fglrx-driver (1:15.7-3) unstable; urgency=high

Modified: fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch	2015-09-19 18:10:23 UTC (rev 1514)
+++ fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch	2015-09-27 08:48:13 UTC (rev 1515)
@@ -1,9 +1,9 @@
 # Fix building with Linux 3.17.
 
-diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-04 16:31:23.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-09 19:41:44.115360696 +0200
-@@ -1104,6 +1104,9 @@
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-09 00:57:14.000000000 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-27 10:39:09.390175314 +0200
+@@ -1112,6 +1112,9 @@
      // directly here to allow suspend/resume without X server start. 
          firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
          pci_disable_device(pdev);
@@ -13,10 +13,10 @@
          PMSG_EVENT(pdev->dev.power.power_state) = state;
      }
      else
-diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-07-04 16:31:23.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-07-09 19:41:44.115360696 +0200
-@@ -840,10 +840,12 @@
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-09 00:57:14.000000000 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-27 10:39:09.390175314 +0200
+@@ -847,10 +847,12 @@
     if(tdev != NULL)
     {
        device = (acpi_device_adr(tdev) >> 16) & 0xffff;