[Pkg-fglrx-devel] r715 - in fglrx-driver/branches/resurrect-fglrx-source/debian: . module
Andreas Beckmann
anbe-guest at alioth.debian.org
Tue Aug 9 20:33:20 UTC 2011
Author: anbe-guest
Date: 2011-08-09 20:33:20 +0000 (Tue, 09 Aug 2011)
New Revision: 715
Added:
fglrx-driver/branches/resurrect-fglrx-source/debian/module/install.template
fglrx-driver/branches/resurrect-fglrx-source/debian/module/lintian-overrides
Removed:
fglrx-driver/branches/resurrect-fglrx-source/debian/module/dirs.template
Modified:
fglrx-driver/branches/resurrect-fglrx-source/debian/control
fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template
fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules
fglrx-driver/branches/resurrect-fglrx-source/debian/rules
Log:
bring fglrx-source up-to-date
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/control
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/control 2011-08-09 18:34:00 UTC (rev 714)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/control 2011-08-09 20:33:20 UTC (rev 715)
@@ -100,7 +100,7 @@
Package: fglrx-source
Section: non-free/kernel
Architecture: i386 amd64
-Depends: ${misc:Depends}, debhelper (>= 7), make, bzip2
+Depends: ${misc:Depends}, debhelper (>= 8), make, bzip2
Recommends: module-assistant | kernel-package
Suggests: fglrx-driver
Replaces: fglrx-kernel-src (<< 1:8-4-2)
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template 2011-08-09 18:34:00 UTC (rev 714)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template 2011-08-09 20:33:20 UTC (rev 715)
@@ -1,16 +1,24 @@
Source: fglrx-driver
-Section: non-free/x11
+Section: non-free/kernel
Priority: extra
Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
-Uploaders: Bertrand Marc <beberking at gmail.com>, Patrick Matthäi <pmatthaei at debian.org>
-Build-Depends: debhelper (>= 5), kernel-package
+Uploaders:
+ Patrick Matthäi <pmatthaei at debian.org>,
+ Michael Gilbert <michael.s.gilbert at gmail.com>,
+Build-Depends: debhelper (>= 8)
+Standards-Version: 3.9.2
+Homepage: http://ati.amd.com/support/drivers/linux/linux-radeon.html
Package: fglrx-kernel-#KVERS#
Architecture: i386 amd64
-Provides: fglrx-modules
-Depends: fglrx-driver (= #VERSION#)
-Recommends: linux-image-#KVERS# | kernel-image-#KVERS#
-Description: ATI binary kernel module for Linux #KVERS#
- Display driver for the ATI Radeon and FireGL graphics accelerators.
+Recommends: linux-image-#KVERS#
+Description: FGLRX binary kernel module for Linux #KVERS#
+ FGLRX is the non-free binary video driver for the ATI/AMD RadeonHD and
+ FireGL graphics cards. As an alternative, you may try the newest free
+ driver xserver-xorg-video-radeon.
.
- This package provides the binary kernel module for Linux #KVERS#.
+ This package provides the non-free FGLRX binary kernel module built for
+ the Debian Linux kernel package. This kernel module is necessary to have
+ accelerated 3D support within the ATI/AMD proprietary display driver.
+ .
+ This package is built for linux-image-#KVERS#.
Deleted: fglrx-driver/branches/resurrect-fglrx-source/debian/module/dirs.template
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/dirs.template 2011-08-09 18:34:00 UTC (rev 714)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/dirs.template 2011-08-09 20:33:20 UTC (rev 715)
@@ -1 +0,0 @@
-lib/modules/#KVERS#/misc
Added: fglrx-driver/branches/resurrect-fglrx-source/debian/module/install.template
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/install.template (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/install.template 2011-08-09 20:33:20 UTC (rev 715)
@@ -0,0 +1 @@
+fglrx.ko lib/modules/#KVERS#/fglrx/
Added: fglrx-driver/branches/resurrect-fglrx-source/debian/module/lintian-overrides
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/lintian-overrides (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/lintian-overrides 2011-08-09 20:33:20 UTC (rev 715)
@@ -0,0 +1 @@
+spelling-error-in-binary
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules 2011-08-09 18:34:00 UTC (rev 714)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules 2011-08-09 20:33:20 UTC (rev 715)
@@ -6,7 +6,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export CCACHE_DISABLE := 1
+
baseepoch := $(shell expr $(KDREV) : '\([0-9]*\):.*' 2>/dev/null )
ifneq ($(baseepoch),)
EPOCH=$(baseepoch):
@@ -40,33 +42,26 @@
configure: configure-stamp
configure-stamp:
- if [ -f $(CURDIR)/debian/control.template ]; then \
- cat $(CURDIR)/debian/control.template > $(CURDIR)/debian/control; \
- fi
- dh_testdir
- touch configure-stamp
+ sed -e 's/#KVERS#/$(KVERS)/g' \
+ -e 's/#VERSION#/$(VERSION)/g' debian/control.template > debian/control
+ sed 's/#KVERS#/$(KVERS)/g' debian/install.template > debian/install
+ touch $@
build: configure-stamp
dh_testdir
+ dh_prep
$(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR) modules
-install: build
+binary_modules: build
dh_testdir
dh_testroot
- dh_clean -k
- rm -f $(CURDIR)/debian/control $(CURDIR)/debian/dirs
- sed -e 's/#KVERS#/$(KVERS)/g' \
- -e 's/#VERSION#/$(VERSION)/g' debian/control.template > $(CURDIR)/debian/control
- sed -e 's/#KVERS#/$(KVERS)/g' debian/dirs.template > $(CURDIR)/debian/dirs
dh_installdirs
- dh_install $(module) lib/modules/$(KVERS)/misc
-
-binary_modules: build install
- dh_testdir
- dh_testroot
+ dh_install
dh_installdocs
- dh_installmodules
dh_installchangelogs
+ dh_installmodules
+ dh_bugfiles
+ dh_lintian
dh_link
dh_strip
dh_compress
@@ -81,15 +76,14 @@
endif
clean:
+ test -f debian/control || cp debian/control.template debian/control
dh_testroot
rm -f configure-stamp
- rm -f $(module) fglrx.mod.c *.o libfglrx_ip.a
+ rm -f $(module) fglrx.mod.c *.o
rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
rm -rf .tmp_versions
rm -rf patch
- dh_clean
- rm -f $(CURDIR)/debian/control
- rm -f $(CURDIR)/debian/dirs
+ dh_clean debian/control debian/install
# The kdist_configure target is called by make-kpkg modules_config. It
# should configure the module so it is ready for compilation (mostly
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/rules 2011-08-09 18:34:00 UTC (rev 714)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/rules 2011-08-09 20:33:20 UTC (rev 715)
@@ -56,13 +56,12 @@
chmod -x debian/fglrx-control/usr/share/icons/*
chmod -x debian/fglrx-driver/etc/ati/atiogl.xml
chmod -x debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version)/*
- chmod +x debian/$(PKG_source)/$(KSRCDIR)/debian/rules
- chmod +x debian/$(PKG_source)/$(KSRCDIR)/make.sh
- # Create the fglrx source tarball.
- (cd debian/$(PKG_source)/usr/src \
- && chown -R root:src modules \
- && tar -c modules | bzip2 > fglrx.tar.bz2 \
- && rm -rf modules)
+ chmod -x debian/fglrx-source/usr/src/modules/fglrx/*
+ chmod -R a-sx,u=rwX,go=rX debian/fglrx-source/usr/src/modules/fglrx
+ chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
+ tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \
+ --owner=root --group=src --remove-files \
+ --directory debian/fglrx-source/usr/src/ modules
# Install reportbug files in all binary packages
override_dh_bugfiles:
More information about the Pkg-fglrx-devel
mailing list