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

Patrick Matthäi pmatthaei at alioth.debian.org
Thu Apr 29 17:41:29 UTC 2010 

Author: pmatthaei
Date: 2010-04-29 17:41:29 +0000 (Thu, 29 Apr 2010)
New Revision: 405

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-atieventsd.install
   fglrx-driver/trunk/debian/fglrx-atieventsd.manpages
   fglrx-driver/trunk/debian/fglrx-control.install
   fglrx-driver/trunk/debian/fglrx-driver.docs
   fglrx-driver/trunk/debian/fglrx-driver.install
   fglrx-driver/trunk/debian/fglrx-modules-dkms.install
   fglrx-driver/trunk/debian/fglrx-source.install
   fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff
   fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff
   fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff
Log:
* New upstream release.
  - And again the paths have been changed, thanks Ubuntu..


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/changelog	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,9 +1,11 @@
-fglrx-driver (1:10-4~prerelease-2) UNRELEASED; urgency=low
+fglrx-driver (1:10-4-1) unstable; urgency=low
 
+  * New upstream release.
+    - And again the paths have been changed, thanks Ubuntu..
   * Add spanish translation from Ricardo Fraile.
     Closes: #579516
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 29 Apr 2010 18:32:21 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 29 Apr 2010 19:09:04 +0200
 
 fglrx-driver (1:10-4~prerelease-1) unstable; urgency=low
 

Modified: fglrx-driver/trunk/debian/fglrx-atieventsd.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-atieventsd.install	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/fglrx-atieventsd.install	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,2 +1,2 @@
-etc/ati/authatieventsd.sh etc/ati/
+common/etc/ati/authatieventsd.sh etc/ati/
 debian/reportbug/script usr/share/bug/fglrx-atieventsd/

Modified: fglrx-driver/trunk/debian/fglrx-atieventsd.manpages
===================================================================
--- fglrx-driver/trunk/debian/fglrx-atieventsd.manpages	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/fglrx-atieventsd.manpages	2010-04-29 17:41:29 UTC (rev 405)
@@ -1 +1 @@
-usr/share/man/man8/atieventsd.8
+common/usr/share/man/man8/atieventsd.8

Modified: fglrx-driver/trunk/debian/fglrx-control.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.install	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/fglrx-control.install	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,4 +1,4 @@
 debian/amdcccle.desktop usr/share/applications/
-usr/share/icons/* usr/share/icons/
+common/usr/share/icons/* usr/share/icons/
 debian/amdcccle.xpm usr/share/pixmaps/
 debian/reportbug/script usr/share/bug/fglrx-control/

Modified: fglrx-driver/trunk/debian/fglrx-driver.docs
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.docs	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/fglrx-driver.docs	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,7 +1,7 @@
 debian/README.Debian
-usr/share/doc/fglrx/articles
-usr/share/doc/fglrx/configure.html
-usr/share/doc/fglrx/driverfaq.html
-usr/share/doc/fglrx/issues.html
-usr/share/doc/fglrx/linuxfaq.html
-usr/share/doc/fglrx/user-manual
+common/usr/share/doc/fglrx/articles
+common/usr/share/doc/fglrx/configure.html
+common/usr/share/doc/fglrx/driverfaq.html
+common/usr/share/doc/fglrx/issues.html
+common/usr/share/doc/fglrx/linuxfaq.html
+common/usr/share/doc/fglrx/user-manual

Modified: fglrx-driver/trunk/debian/fglrx-driver.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/fglrx-driver.install	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,7 +1,7 @@
-etc/ati/signature etc/ati/
-etc/ati/control etc/ati/
-etc/ati/atiogl.xml etc/ati/
-etc/ati/amdpcsdb.default etc/ati/
+common/etc/ati/signature etc/ati/
+common/etc/ati/control etc/ati/
+common/etc/ati/atiogl.xml etc/ati/
+common/etc/ati/amdpcsdb.default etc/ati/
 debian/acpi/*.sh etc/acpi/
 debian/acpi/events/fglrx-* etc/acpi/events/
 debian/reportbug/script usr/share/bug/fglrx-driver/

Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,5 +1,5 @@
-lib/modules/fglrx/build_mod/*.c usr/src/fglrx-VERSION/
-lib/modules/fglrx/build_mod/*.h usr/src/fglrx-VERSION/
-lib/modules/fglrx/build_mod/*.sh usr/src/fglrx-VERSION/
-lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-VERSION/2.6.x/
+common/lib/modules/fglrx/build_mod/*.c usr/src/fglrx-VERSION/
+common/lib/modules/fglrx/build_mod/*.h usr/src/fglrx-VERSION/
+common/lib/modules/fglrx/build_mod/*.sh usr/src/fglrx-VERSION/
+common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-VERSION/2.6.x/
 debian/reportbug/script usr/share/bug/fglrx-modules-dkms/

Modified: fglrx-driver/trunk/debian/fglrx-source.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-source.install	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/fglrx-source.install	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,7 +1,7 @@
-lib/modules/fglrx/build_mod/*.c usr/src/modules/fglrx/
-lib/modules/fglrx/build_mod/*.h usr/src/modules/fglrx/
-lib/modules/fglrx/build_mod/*.sh usr/src/modules/fglrx/
-lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/*.c usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/*.h usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/*.sh usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/modules/fglrx/
 debian/changelog usr/src/modules/fglrx/debian/
 debian/copyright usr/src/modules/fglrx/debian/
 debian/compat usr/src/modules/fglrx/debian/

Modified: fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,8 +1,8 @@
 # Adds support for XEN.
 
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/firegl_public.c	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-15 19:53:38.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-29 19:16:03.000000000 +0200
 @@ -32,6 +32,7 @@
  
  #if !defined(CONFIG_X86) 

Modified: fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,8 +1,8 @@
 # Make the authatieventsd.sh working on Debian.
 
-diff -Naur fglrx-driver-10-4~prerelease.orig//etc/ati/authatieventsd.sh fglrx-driver-10-4~prerelease/etc/ati/authatieventsd.sh
---- fglrx-driver-10-4~prerelease.orig//etc/ati/authatieventsd.sh	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/etc/ati/authatieventsd.sh	2010-04-15 19:56:25.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/etc/ati/authatieventsd.sh fglrx-driver-10-4/common/etc/ati/authatieventsd.sh
+--- fglrx-driver-10-4.orig//common/etc/ati/authatieventsd.sh	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/etc/ati/authatieventsd.sh	2010-04-29 19:16:43.000000000 +0200
 @@ -42,6 +42,16 @@
          return 0
      fi

Modified: fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff	2010-04-29 17:00:38 UTC (rev 404)
+++ fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff	2010-04-29 17:41:29 UTC (rev 405)
@@ -1,8 +1,8 @@
 # Fix broken usage of internal macro; fixes compiling with 2.6.33
 
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/drmP.h fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/drmP.h
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/drmP.h	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/drmP.h	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/drmP.h fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/drmP.h
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/drmP.h	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/drmP.h	2010-04-29 19:18:17.000000000 +0200
 @@ -42,7 +42,12 @@
   * can build the DRM (part of PI DRI). 4/21/2000 S + B */
  #include <asm/current.h>
@@ -24,9 +24,9 @@
  #include <linux/sched.h>
  #include <linux/smp_lock.h>	/* For (un)lock_kernel */
  #include <linux/mm.h>
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/firegl_public.c	2010-04-15 19:56:40.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-29 19:16:30.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-29 19:18:17.000000000 +0200
 @@ -28,7 +28,11 @@
  #error Kernel versions older than 2.6.0 are no longer supported by this module.
  #endif 
@@ -70,9 +70,9 @@
  #endif
  }
  
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_acpi.c	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_acpi.c	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_acpi.c	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2010-04-29 19:18:17.000000000 +0200
 @@ -15,7 +15,11 @@
   ****************************************************************************/
  
@@ -85,9 +85,9 @@
  #include <linux/acpi.h>
  #include <linux/pci.h>
  
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_agp.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_agp.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_agp.c	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_agp.c	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_agp.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_agp.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_agp.c	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_agp.c	2010-04-29 19:18:17.000000000 +0200
 @@ -31,7 +31,11 @@
   */
  
@@ -100,9 +100,9 @@
  #include <linux/pci.h>
  #include <linux/agp_backend.h>
  #include <linux/string.h>
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_io.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_io.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_io.c	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_io.c	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_io.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_io.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_io.c	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_io.c	2010-04-29 19:18:17.000000000 +0200
 @@ -37,7 +37,11 @@
   */
  
@@ -115,9 +115,9 @@
  #include <linux/poll.h>
  #include <linux/signal.h>
  #include <asm/io.h>
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_osconfig.h fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_osconfig.h
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_osconfig.h fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-04-29 19:18:17.000000000 +0200
 @@ -20,7 +20,11 @@
  #define KCL_OSCONFIG_H
  
@@ -130,9 +130,9 @@
  
  // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
  #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_pci.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_pci.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_pci.c	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_pci.c	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_pci.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_pci.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_pci.c	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_pci.c	2010-04-29 19:18:17.000000000 +0200
 @@ -31,7 +31,11 @@
   */
  
@@ -145,9 +145,9 @@
  #include <linux/pci.h>
  
  #include "kcl_config.h"
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_str.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_str.c	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_str.c	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_str.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_str.c	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_str.c	2010-04-29 19:18:17.000000000 +0200
 @@ -30,7 +30,12 @@
   *
   */
@@ -161,9 +161,9 @@
  #include <linux/string.h>
  #include <linux/module.h>
  
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_wait.c fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_wait.c
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_wait.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-29 19:18:17.000000000 +0200
 @@ -31,7 +31,11 @@
   */
  
@@ -176,9 +176,9 @@
  #include <linux/wait.h>
  #include <linux/highmem.h>
  #include <linux/sched.h>
-diff -Naur fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/make.sh fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/make.sh
---- fglrx-driver-10-4~prerelease.orig//lib/modules/fglrx/build_mod/make.sh	2010-04-09 20:21:39.000000000 +0200
-+++ fglrx-driver-10-4~prerelease/lib/modules/fglrx/build_mod/make.sh	2010-04-15 19:58:55.000000000 +0200
+diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/make.sh fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/make.sh
+--- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/make.sh	2010-04-15 18:44:15.000000000 +0200
++++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/make.sh	2010-04-29 19:18:17.000000000 +0200
 @@ -218,8 +218,15 @@
          # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
          kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`

More information about the Pkg-fglrx-devel mailing list