Changeset 6795 for pkg/vinnie/non-free


Ignore:
Timestamp:
07/11/10 20:48:28 (3 years ago)
Author:
alanbach-guest
Message:
  • Sync'd with Debian 1:10-6-1
Location:
pkg/vinnie/non-free/fglrx-driver/trunk/debian
Files:
2 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • pkg/vinnie/non-free/fglrx-driver/trunk/debian/changelog

    r6577 r6795  
     1fglrx-driver (1:10-6-1) unstable; urgency=low 
     2 
     3  [ Patrick MatthÀi ] 
     4  * New upstream release. 
     5    - Refresh 01-CONFIG_X86_XEN.diff. 
     6    - Drop patch 05_fix_cmpxchg.diff, merged by upstream. 
     7  * Add danish translation from Joe Dalton. 
     8    Closes: #584290 
     9 
     10 -- Alan Baghumian <alan@memphis-mobile>  Sun, 11 Jul 2010 11:47:55 -0700 
     11 
     12fglrx-driver (1:10-5-1) unstable; urgency=low 
     13 
     14  * New upstream release. 
     15    - Drop patch 02-add-new-cards.diff, merged by upstream. 
     16  * s/approriate/appropriate/ in fglrx-modules-dkms long description. 
     17    Closes: #582662 
     18 
     19 -- Patrick MatthÀi <pmatthaei@debian.org>  Thu, 27 May 2010 12:51:48 +0200 
     20 
     21fglrx-driver (1:10-4-2) unstable; urgency=low 
     22 
     23  * The fglrx-driver package conflicts against the nvidia-glx package. 
     24    Closes: #581776 
     25  * Fix a few typos in the long descriptions. 
     26    Closes: #581954 
     27  * Update to the new fglrx 10-4 release. AMD silently updated the original 
     28    tarball. This patch adds support for new cards. 
     29  * Speed up package building by adding --ignore options in debian/rules. 
     30  * Add patch 06-build-with-2.6.34.diff to build against Linux 2.6.34. 
     31 
     32 -- Patrick MatthÀi <pmatthaei@debian.org>  Thu, 20 May 2010 21:48:55 +0200 
     33 
    134fglrx-driver (1:10-4-1) unstable; urgency=low 
    235 
    3   [ Patrick MatthÀi ] 
    436  * New upstream release. 
    537    - And again the paths have been changed, thanks Ubuntu.. 
    … …  
    739    Closes: #579516 
    840 
    9  -- Alan Baghumian <alan@technotux.org>  Sat, 01 May 2010 13:35:23 -0700 
     41 -- Patrick MatthÀi <pmatthaei@debian.org>  Thu, 29 Apr 2010 19:09:04 +0200 
    1042 
    1143fglrx-driver (1:10-4~prerelease-1) unstable; urgency=low 

  • pkg/vinnie/non-free/fglrx-driver/trunk/debian/control

    r6544 r6795  
    2020 fglrx-glx, fglrx-glx-ia32 [amd64], fglrx-atieventsd 
    2121Provides: xserver-xorg-video-6 
    22 Conflicts: ia32-fglrx-driver 
     22Conflicts: ia32-fglrx-driver, nvidia-glx 
    2323Suggests: fglrx-control 
    2424Description: non-free AMD/ATI r6xx - r7xx display driver 
    … …  
    7474Conflicts: fglrx-kernel-src (<< 1:8-4-2) 
    7575Description: kernel module source for the non-free AMD/ATI r6xx - r7xx display driver 
    76  This package provides the Kernel build environment and the fglrx modules, 
     76 This package provides the kernel build environment and the fglrx modules, 
    7777 which are necessary to have accelerated 3D support within the AMD/ATI 
    78  propriertary display driver. 
     78 proprietary display driver. 
    7979 
    8080Package: fglrx-modules-dkms 
    … …  
    8484Suggests: fglrx-driver 
    8585Description: dkms module source for the non-free AMD/ATI r6xx - r7xx display driver 
    86  This package provides the Kernel build environment and the fglrx modules, 
     86 This package provides the kernel build environment and the fglrx modules, 
    8787 which are necessary to have accelerated 3D support within the AMD/ATI 
    88  propriertary display driver. 
     88 proprietary display driver. 
    8989 . 
    9090 This package contains the source for the fglrx kernel module, packaged with 
    91  approriate configuration for DKMS to build new modules dynamically. 
     91 appropriate configuration for DKMS to build new modules dynamically. 
    9292 
    9393Package: fglrx-control 

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

    r6577 r6795  
    11# Adds support for XEN. 
    22 
    3 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 
    4 --- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/firegl_public.c  2010-04-15 18:44:15.000000000 +0200 
    5 +++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/firegl_public.c        2010-04-29 19:16:03.000000000 +0200 
    6 @@ -32,6 +32,7 @@ 
     3diff -Naur fglrx-driver-10-6.orig//common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-6/common/lib/modules/fglrx/build_mod/firegl_public.c 
     4--- fglrx-driver-10-6.orig//common/lib/modules/fglrx/build_mod/firegl_public.c  2010-06-03 16:23:55.000000000 +0200 
     5+++ fglrx-driver-10-6/common/lib/modules/fglrx/build_mod/firegl_public.c        2010-06-17 10:48:41.000000000 +0200 
     6@@ -36,6 +36,7 @@ 
    77  
    88 #if !defined(CONFIG_X86)  
    … …  
    1212 #if !defined(CONFIG_X86_VOYAGER) 
    1313 #if !defined(CONFIG_X86_NUMAQ) 
    14 @@ -43,6 +44,7 @@ 
     14@@ -47,6 +48,7 @@ 
    1515 #endif 
    1616 #endif 

  • pkg/vinnie/non-free/fglrx-driver/trunk/debian/patches/series

    r6544 r6795  
    1101-CONFIG_X86_XEN.diff 
    2203-authatieventsd.sh.diff 
    3 05_fix_cmpxchg.diff 
     306-build-with-2.6.34.diff 

  • pkg/vinnie/non-free/fglrx-driver/trunk/debian/rules

    r6574 r6795  
    8787        dh_installdirs 
    8888        dh_install 
    89         dh_install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/fgl*" "usr/bin" 
    90         dh_install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/ati*" "usr/bin" 
    91         dh_install -p$(PKG_daemon)  "$(ARCH)/usr/sbin/ati*" "usr/sbin" 
    92         dh_install -p$(PKG_glx)     "$(ARCH)/usr/X11R6/$(LIB)/libGL*" "usr/lib" 
    93 ifeq ($(DEB_BUILD_ARCH),amd64) 
    94         dh_install -p$(PKG_driver)      "$(ARCH)/usr/lib64/*" "usr/lib" 
    95 else 
    96         dh_install -p$(PKG_driver)  "$(ARCH)/usr/lib/*" "usr/lib" 
    97 endif 
    98         dh_install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libfglrx*" "usr/lib" 
    99         dh_install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libati*" "usr/lib" 
    100         dh_install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "usr/lib/dri" 
    101         dh_install -p$(PKG_driver)      "$(ARCH)/usr/X11R6/$(LIB)/lib*XvB*" "usr/lib" 
    102         dh_install -p$(PKG_driver)  "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "usr/lib/xorg/modules" 
    103         dh_install -p$(PKG_source)  "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(KSRCDIR)" 
    104         dh_install -p$(PKG_dkms)        "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(DKMSBASE)" 
    105         dh_install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin" 
     89        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/fgl*" "usr/bin" 
     90        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/bin/ati*" "usr/bin" 
     91        dh_install --ignore=debian/$(PKG_daemon).install -p$(PKG_daemon)  "$(ARCH)/usr/sbin/ati*" "usr/sbin" 
     92        dh_install --ignore=debian/$(PKG_glx).install -p$(PKG_glx)     "$(ARCH)/usr/X11R6/$(LIB)/libGL*" "usr/lib" 
     93ifeq ($(DEB_BUILD_ARCH),amd64) 
     94        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)        "$(ARCH)/usr/lib64/*" "usr/lib" 
     95else 
     96        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/lib/*" "usr/lib" 
     97endif 
     98        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libfglrx*" "usr/lib" 
     99        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libati*" "usr/lib" 
     100        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "usr/lib/dri" 
     101        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)        "$(ARCH)/usr/X11R6/$(LIB)/lib*XvB*" "usr/lib" 
     102        dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "usr/lib/xorg/modules" 
     103        dh_install --ignore=debian/$(PKG_source).install -p$(PKG_source)  "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(KSRCDIR)" 
     104        dh_install --ignore=debian/$(PKG_dkms).install -p$(PKG_dkms)    "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(DKMSBASE)" 
     105        dh_install --ignore=debian/$(PKG_control).install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin" 
    106106ifeq ($(DEB_BUILD_ARCH),amd64) 
    107107    # Replace library paths -- careful, these are binary files! 
Note: See TracChangeset for help on using the changeset viewer.