Changeset 6577 for pkg/frankie

Timestamp:

05/01/10 22:37:42 (3 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 1:10-4-1

Location:

pkg/frankie/non-free/fglrx-driver/trunk/debian

Files:

• changelog (modified) (2 diffs)
• fglrx-atieventsd.install (modified) (1 diff)
• fglrx-atieventsd.manpages (modified) (1 diff)
• fglrx-control.install (modified) (1 diff)
• fglrx-driver.docs (modified) (1 diff)
• fglrx-driver.install (modified) (1 diff)
• fglrx-modules-dkms.install (modified) (1 diff)
• fglrx-source.install (modified) (1 diff)
• patches/01-CONFIG_X86_XEN.diff (modified) (1 diff)
• patches/03-authatieventsd.sh.diff (modified) (1 diff)
• patches/05_fix_cmpxchg.diff (modified) (10 diffs)
• po/es.po (added)

pkg/frankie/non-free/fglrx-driver/trunk/debian/changelog

@@ +1 @@
+fglrx-driver (1:10-4-1) unstable; urgency=low
+
+  [ Patrick MatthÀi ]
+  * New upstream release.
+    - And again the paths have been changed, thanks Ubuntu..
+  * Add spanish translation from Ricardo Fraile.
+    Closes: #579516
+
+ -- Alan Baghumian <alan@technotux.org>  Sat, 01 May 2010 13:35:23 -0700
+
 fglrx-driver (1:10-4~prerelease-1) unstable; urgency=low
 
@@ -12 +22 @@
     - Rediff all patches, because of changed paths in the tarball.
 
- -- Alan Baghumian <alan@technotux.org>  Sun, 25 Apr 2010 14:59:26 -0700
+ -- Patrick MatthÀi <pmatthaei@debian.org>  Sun, 18 Apr 2010 18:03:49 +0200
 
 fglrx-driver (1:10-3~prerelease-3) unstable; urgency=low

pkg/frankie/non-free/fglrx-driver/trunk/debian/fglrx-atieventsd.install

@@ -1 @@
-etc/ati/authatieventsd.sh etc/ati/
+common/etc/ati/authatieventsd.sh etc/ati/
 debian/reportbug/script usr/share/bug/fglrx-atieventsd/

pkg/frankie/non-free/fglrx-driver/trunk/debian/fglrx-atieventsd.manpages

@@ -1 @@
-usr/share/man/man8/atieventsd.8
+common/usr/share/man/man8/atieventsd.8

pkg/frankie/non-free/fglrx-driver/trunk/debian/fglrx-control.install

@@ -1 +1 @@
 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/

pkg/frankie/non-free/fglrx-driver/trunk/debian/fglrx-driver.docs

@@ -1 +1 @@
 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

pkg/frankie/non-free/fglrx-driver/trunk/debian/fglrx-driver.install

@@ -1 @@
-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/

pkg/frankie/non-free/fglrx-driver/trunk/debian/fglrx-modules-dkms.install

@@ -1 @@
-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/

pkg/frankie/non-free/fglrx-driver/trunk/debian/fglrx-source.install

@@ -1 @@
-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/

pkg/frankie/non-free/fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff

@@ -1 +1 @@
 # 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 @@
  

pkg/frankie/non-free/fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff

@@ -1 +1 @@
 # 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

pkg/frankie/non-free/fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff

@@ -1 +1 @@
 # 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 */
@@ -25 +25 @@
  #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.
@@ -71 +71 @@
  }
  
-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 @@
   ****************************************************************************/
@@ -86 +86 @@
  #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 @@
   */
@@ -101 +101 @@
  #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 @@
   */
@@ -116 +116 @@
  #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
@@ -131 +131 @@
  // 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 @@
   */
@@ -146 +146 @@
  
  #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 @@
   *
@@ -162 +162 @@
  #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 @@
   */
@@ -177 +177 @@
  #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