[Pkg-fglrx-devel] r637 - in fglrx-driver/trunk/debian: . acpi
Michael Gilbert
gilbert-guest at alioth.debian.org
Sat Jul 23 03:21:38 UTC 2011
Author: gilbert-guest
Date: 2011-07-23 03:21:37 +0000 (Sat, 23 Jul 2011)
New Revision: 637
Added:
fglrx-driver/trunk/debian/fglrx-glx-ia32.links
fglrx-driver/trunk/debian/fglrx-glx.links
Modified:
fglrx-driver/trunk/debian/acpi/fglrx-powermode.sh
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/fglrx-atieventsd.install
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-driver.links
fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides
fglrx-driver/trunk/debian/fglrx-glx-ia32.install
fglrx-driver/trunk/debian/fglrx-glx.install
fglrx-driver/trunk/debian/rules
Log:
use simplified debian/rulse format
Property changes on: fglrx-driver/trunk/debian/acpi/fglrx-powermode.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/changelog 2011-07-23 03:21:37 UTC (rev 637)
@@ -1,12 +1,23 @@
-fglrx-driver (1:11-6-3) UNRELEASED; urgency=medium
+fglrx-driver (1:11-6-4) UNRELEASED; urgency=low
+ * Use simplified debian/rules format:
+ - Bump debhelper version to 8.
+ - Significantly simplify and clean up debian/rules (making it much more
+ maintainable in my opinion).
+ * Clean up get-orig-source rule a bit as well.
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com> Tue, 19 Jul 2011 18:23:13 -0400
+
+fglrx-driver (1:11-6-3) unstable; urgency=high
+
+ [ Patrick Matthäi ]
* Do not remove old diversions, which are handled by glx-diversions now.
[ Michael Gilbert ]
* Fix insecure handling of secret xauth cookie in authatieventsd.sh
(closes: #625868).
- -- Patrick Matthäi <pmatthaei at debian.org> Mon, 04 Jul 2011 20:46:08 +0200
+ -- Michael Gilbert <michael.s.gilbert at gmail.com> Tue, 19 Jul 2011 18:13:14 -0400
fglrx-driver (1:11-6-2) unstable; urgency=high
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/control 2011-07-23 03:21:37 UTC (rev 637)
@@ -4,7 +4,8 @@
Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
Uploaders: Patrick Matthäi <pmatthaei at debian.org>,
Michael Gilbert <michael.s.gilbert at gmail.com>
-Build-Depends: debhelper (>= 7),
+Build-Depends:
+ debhelper (>= 8),
bzip2,
ia32-libs [amd64],
libx11-6,
@@ -33,19 +34,22 @@
Package: fglrx-driver
Architecture: i386 amd64
-Depends: ${misc:Depends},
+Depends:
+ ${misc:Depends},
${shlibs:Depends},
xserver-xorg (>= 1:7.6+7),
xorg-video-abi-10,
glx-alternative-fglrx (>= 0.1.2)
-Recommends: fglrx-modules-dkms (= ${binary:Version}),
+Recommends:
+ fglrx-modules-dkms (= ${binary:Version}),
fglrx-glx,
fglrx-glx-ia32 [amd64],
fglrx-atieventsd
Provides: xorg-driver-video
Conflicts: ia32-fglrx-driver
Breaks: nvidia-glx (<< 275.09.07-3)
-Suggests: fglrx-control,
+Suggests:
+ fglrx-control,
xvba-va-driver
Description: non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
@@ -66,11 +70,13 @@
Package: fglrx-glx
Architecture: i386 amd64
-Depends: ${misc:Depends},
+Depends:
+ ${misc:Depends},
${shlibs:Depends},
fglrx-driver (= ${binary:Version}),
glx-alternative-fglrx (>= 0.1.2)
-Breaks: nvidia-glx (<< 275.09.07-3),
+Breaks:
+ nvidia-glx (<< 275.09.07-3),
libgl1-nvidia-glx (<< 275.09.07-3)
Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
@@ -82,11 +88,13 @@
Package: fglrx-glx-ia32
Architecture: amd64
-Depends: ${misc:Depends},
+Depends:
+ ${misc:Depends},
${shlibs:Depends},
fglrx-driver (= ${binary:Version})
Pre-Depends: libc6-i386 (>= 2.9-18)
-Conflicts: nvidia-glx-ia32,
+Conflicts:
+ nvidia-glx-ia32,
ia32-fglrx-glx
Description: proprietary libGL for the non-free ATI/AMD display driver (ia32 libs)
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
@@ -100,7 +108,8 @@
Package: fglrx-modules-dkms
Section: non-free/kernel
Architecture: i386 amd64
-Depends: ${misc:Depends},
+Depends:
+ ${misc:Depends},
dkms
Suggests: fglrx-driver
Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
@@ -113,13 +122,16 @@
Package: fglrx-control
Architecture: i386 amd64
-Depends: ${misc:Depends},
+Depends:
+ ${misc:Depends},
${shlibs:Depends},
fglrx-driver
Provides: fglrx-control-qt3
-Replaces: fglrx-control-qt3,
+Replaces:
+ fglrx-control-qt3,
fglrx-amdcccle
-Conflicts: fglrx-control-qt3,
+Conflicts:
+ fglrx-control-qt3,
fglrx-control-qt2
Description: control panel for the non-free ATI/AMD RadeonHD display driver
Control panel for the ATI/AMD RadeonHD and FireGL graphics cards.
@@ -130,11 +142,13 @@
Package: fglrx-atieventsd
Architecture: i386 amd64
-Depends: ${misc:Depends},
+Depends:
+ ${misc:Depends},
${shlibs:Depends},
xserver-xorg (>= 1:7.6+1),
lsb-base
-Recommends: fglrx-driver (= ${binary:Version}),
+Recommends:
+ fglrx-driver (= ${binary:Version}),
acpid
Replaces: fglrx-driver (<< 1:8-4-2)
Breaks: fglrx-driver (<< 1:8-4-2)
Modified: fglrx-driver/trunk/debian/fglrx-atieventsd.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-atieventsd.install 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-atieventsd.install 2011-07-23 03:21:37 UTC (rev 637)
@@ -1,2 +1,3 @@
common/etc/ati/authatieventsd.sh etc/ati/
debian/reportbug/script usr/share/bug/fglrx-atieventsd/
+sbin/atieventsd usr/sbin
Modified: fglrx-driver/trunk/debian/fglrx-control.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.install 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-control.install 2011-07-23 03:21:37 UTC (rev 637)
@@ -1,3 +1,4 @@
debian/amdcccle.desktop usr/share/applications/
common/usr/share/icons/* usr/share/icons/
debian/reportbug/script usr/share/bug/fglrx-control/
+bin/amdcccle usr/bin
Modified: fglrx-driver/trunk/debian/fglrx-driver.docs
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.docs 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-driver.docs 2011-07-23 03:21:37 UTC (rev 637)
@@ -1,7 +1,4 @@
debian/README.Debian
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
+common/usr/share/doc/fglrx/*.html
Modified: fglrx-driver/trunk/debian/fglrx-driver.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-driver.install 2011-07-23 03:21:37 UTC (rev 637)
@@ -7,3 +7,21 @@
debian/reportbug/script usr/share/bug/fglrx-driver/
debian/configuration/fglrx-driver.conf etc/modprobe.d/
debian/import/amdxvba.h usr/include/
+bin/aticonfig usr/bin
+bin/atiodcli usr/bin
+bin/atiode usr/bin
+bin/fgl_glxgears usr/bin
+bin/fglrxinfo usr/bin
+lib/libatiuki.so.1.0 usr/lib
+lib/libaticaldd.so usr/lib
+lib/libaticalcl.so usr/lib
+lib/libaticalrt.so usr/lib
+xlib/libatiadlxx.so usr/lib
+xlib/libXvBAW.so.1.0 usr/lib
+xlib/libAMDXvBA.so.1.0 usr/lib
+xlib/libfglrx_dm.a usr/lib
+xlib/libfglrx_dm.so.1.0 usr/lib
+xlib/modules/dri usr/lib
+mlib/modules usr/lib/xorg
+mlib/modules/extensions/fglrx usr/lib
+mlib/modules/drivers/fglrx_drv.so usr/lib/fglrx
Modified: fglrx-driver/trunk/debian/fglrx-driver.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.links 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-driver.links 2011-07-23 03:21:37 UTC (rev 637)
@@ -1,3 +1,4 @@
/usr/lib/libAMDXvBA.so.1.0 /usr/lib/libAMDXvBA.so.1
/usr/lib/libXvBAW.so.1.0 /usr/lib/libXvBAW.so.1
/usr/lib/libXvBAW.so.1 /usr/lib/libXvBAW.so
+/usr/lib/libatiuki.so.1.0 /usr/lib/libatiuki.so.1
Modified: fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides 2011-07-23 03:21:37 UTC (rev 637)
@@ -20,7 +20,6 @@
fglrx-driver: spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so Recieved Received
fglrx-driver: spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so seperate separate
fglrx-driver: no-upstream-changelog
-fglrx-driver: executable-not-elf-or-script usr/lib/libAMDXvBA.cap
fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/libatiadlxx.so
fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/libaticalcl.so
fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/libaticaldd.so
Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-07-23 03:21:37 UTC (rev 637)
@@ -1,3 +1,4 @@
-arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri/
-arch/x86/usr/lib/libatiuki* usr/lib32/
+arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri
+arch/x86/usr/lib/libatiuki* usr/lib32
+arch/x86/usr/X11R6/lib/libGL.so.1.2 usr/lib32
debian/reportbug/script usr/share/bug/fglrx-glx-ia32/
Added: fglrx-driver/trunk/debian/fglrx-glx-ia32.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.links (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.links 2011-07-23 03:21:37 UTC (rev 637)
@@ -0,0 +1,2 @@
+/usr/lib32/libatiuki.so.1.0 /usr/lib32/libatiuki.so.1
+/usr/lib32/libGL.so.1.2 /usr/lib32/libGL.so.1
Modified: fglrx-driver/trunk/debian/fglrx-glx.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.install 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/fglrx-glx.install 2011-07-23 03:21:37 UTC (rev 637)
@@ -1 +1,2 @@
debian/reportbug/script usr/share/bug/fglrx-glx/
+xlib/libGL.so.1.2 usr/lib/fglrx
Added: fglrx-driver/trunk/debian/fglrx-glx.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.links (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx.links 2011-07-23 03:21:37 UTC (rev 637)
@@ -0,0 +1 @@
+/usr/lib/fglrx/libGL.so.1.2 /usr/lib/fglrx/libGL.so.1
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2011-07-19 00:28:19 UTC (rev 636)
+++ fglrx-driver/trunk/debian/rules 2011-07-23 03:21:37 UTC (rev 637)
@@ -1,181 +1,61 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+packagename=fglrx-driver
-CFLAGS = -Wall
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
+ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
+NEW_UPSTREAM_VERSION=$(subst VER=,,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
+INSTALLER=ati-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
+URL_PATH=www2.ati.com/drivers/linux
+CACHEDIR=/tmp
endif
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(DEB_BUILD_ARCH))
- DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-endif
-
-VERSION := $(shell dpkg-parsechangelog|egrep '^Version:'|cut -d' ' -f2|cut -d':' -f2)
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
-
-KSRCDIR := usr/src/modules/fglrx
-DKMSBASE := usr/src/fglrx-VERSION
-DKMSSRCDIR := usr/src/fglrx-$(UPSTREAM_VERSION)
-
ifeq ($(DEB_BUILD_ARCH),amd64)
-ARCH := arch/x86_64
-XDIR := xpic_64a
-LIB := lib64
+arch=arch/x86_64
+pic=xpic_64a
+lib=lib64
else
-ARCH := arch/x86
-XDIR := xpic
-LIB := lib
+arch=arch/x86
+pic=xpic
+lib=lib
endif
-# Package names
-PKG_driver := fglrx-driver
-PKG_glx := fglrx-glx
-PKG_glx_ia32 := fglrx-glx-ia32
-PKG_control := fglrx-control
-PKG_daemon := fglrx-atieventsd
-PKG_dkms := fglrx-modules-dkms
+override_dh_auto_clean:
+ test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
+ rm -f arch/x86/usr/X11R6/lib/libGL.so.1.2 xlib/libGL.so.1.2
+ rm -rf bin sbin lib xlib mlib debian/dkms/dkms.conf
-ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
- NEW_UPSTREAM_VERSION := $(subst VER=,,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
- INSTALLER := ati-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
- URL_PATH := www2.ati.com/drivers/linux
- CACHEDIR := /tmp
-endif
-
-build: debian/man/Makefile
- dh_testdir
+override_dh_auto_configure:
+ cd debian/man && chmod +x autogen.sh && ./autogen.sh --copy
+ cd debian/man && chmod +x configure install-sh missing && \
+ ./configure --prefix=/usr --mandir=/usr/share/man
$(MAKE) -C debian/man
-build-arch: build
+ ln -s $(arch)/usr/sbin
+ ln -s $(arch)/usr/X11R6/bin bin
+ ln -s $(arch)/usr/$(lib) lib
+ ln -s $(arch)/usr/X11R6/$(lib) xlib
+ ln -s $(pic)/usr/X11R6/$(lib) mlib
-build-indep: build
+ cp arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 arch/x86/usr/X11R6/lib/libGL.so.1.2
+ cp xlib/fglrx/fglrx-libGL.so.1.2 xlib/libGL.so.1.2
-debian/man/Makefile: debian/man/configure
- (cd debian/man && \
- chmod +x configure install-sh missing && \
- LICENSE_FILE=/usr/share/doc/$(PKG_driver)/copyright \
- ./configure --prefix=/usr --mandir=/usr/share/man --with-xserver=Xorg)
+ sed s/_VERSION_/$(UPSTREAM_VERSION)/g < debian/dkms/dkms.conf.template > debian/dkms/dkms.conf
-debian/man/configure:
- (cd debian/man && \
- chmod +x autogen.sh && \
- ./autogen.sh --copy)
-
-clean:
- dh_testdir
- dh_clean
- rm -rf extra_src
- [ ! -f debian/man/Makefile ] || $(MAKE) -C debian/man maintainer-clean
-
-distclean: clean
-
-binary: binary-arch binary-indep
-
-binary-arch: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- dh_install
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(ARCH)/usr/X11R6/bin/fgl*" "usr/bin"
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(ARCH)/usr/X11R6/bin/ati*" "usr/bin"
- dh_install --ignore=debian/$(PKG_daemon).install -p$(PKG_daemon) "$(ARCH)/usr/sbin/ati*" "usr/sbin"
- dh_install --ignore=debian/$(PKG_glx).install -p$(PKG_glx) "$(ARCH)/usr/X11R6/$(LIB)/fglrx/fglrx-libGL*" "usr/lib/fglrx"
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(ARCH)/usr/$(LIB)/*" "usr/lib"
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(ARCH)/usr/X11R6/$(LIB)/libfglrx*" "usr/lib"
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(ARCH)/usr/X11R6/$(LIB)/libati*" "usr/lib"
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "usr/lib/dri"
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(ARCH)/usr/X11R6/$(LIB)/lib*XvB*" "usr/lib"
- dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver) "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "usr/lib/xorg/modules"
- dh_install --ignore=debian/$(PKG_dkms).install -p$(PKG_dkms) "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(DKMSBASE)"
- dh_install --ignore=debian/$(PKG_control).install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin"
- mkdir -p debian/$(PKG_driver)/usr/lib/fglrx
- mv debian/$(PKG_glx)/usr/lib/fglrx/fglrx-libGL.so.1.2 debian/$(PKG_glx)/usr/lib/fglrx/libGL.so.1.2
- mv debian/$(PKG_driver)/usr/lib/xorg/modules/drivers/fglrx_drv.so debian/$(PKG_driver)/usr/lib/fglrx/
- mv debian/$(PKG_driver)/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so debian/$(PKG_driver)/usr/lib/fglrx/libglx.so
- rm -rf debian/$(PKG_driver)/usr/lib/xorg/modules/drivers
- rm -rf debian/$(PKG_driver)/usr/lib/xorg/modules/extensions
- rm -f debian/$(PKG_driver)/usr/lib/fglrx/switchlib*
-ifeq ($(DEB_BUILD_ARCH),amd64)
- dh_install --ignore=debian/$(PKG_glx_ia32).install -p$(PKG_glx_ia32) "arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2" "usr/lib32"
- mv debian/$(PKG_glx_ia32)/usr/lib32/fglrx-libGL.so.1.2 debian/$(PKG_glx_ia32)/usr/lib32/libGL.so.1.2
-endif
- # Generate dkms.conf.
- cat debian/dkms/dkms.conf.template|sed "s/_VERSION_/$(UPSTREAM_VERSION)/g" \
- > debian/$(PKG_dkms)/$(DKMSBASE)/dkms.conf
- # Rename the DKMSBASE to DKMSSRCDIR and fix permissions.
- mv debian/$(PKG_dkms)/$(DKMSBASE) debian/$(PKG_dkms)/$(DKMSSRCDIR)
- chmod -x debian/$(PKG_dkms)/$(DKMSSRCDIR)/*
- chmod 0755 debian/$(PKG_dkms)/$(DKMSSRCDIR)/make.sh
- # Create symlinks to shared libs; fixes a lintian error.
- /sbin/ldconfig -n debian/$(PKG_glx)/usr/lib/fglrx
- /sbin/ldconfig -n debian/$(PKG_glx_ia32)/usr/lib32
- /sbin/ldconfig -n debian/$(PKG_driver)/usr/lib
- chmod -x debian/$(PKG_driver)/etc/ati/*
- chmod +x debian/$(PKG_daemon)/etc/ati/authatieventsd.sh
- chmod +x debian/$(PKG_driver)/etc/acpi/*.sh
- chmod -x debian/$(PKG_control)/usr/share/icons/*
- # Remove this ugly RPATH..
- chrpath -d -k debian/$(PKG_control)/usr/bin/amdcccle
- dh_installinit
- dh_installchangelogs
- dh_installdocs
- dh_installman
- dh_link
- dh_lintian
- dh_strip
- dh_compress
- dh_fixperms
-ifeq ($(DEB_BUILD_ARCH),amd64)
- dh_makeshlibs -XlibGL
-else
- dh_makeshlibs -XlibGL -Xfglrx-glx-ia32
-endif
+override_dh_installdeb:
+ chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
+ chmod -x debian/fglrx-control/usr/share/icons/*
+ chmod -x debian/fglrx-modules-dkms/usr/src/fglrx-VERSION/*
+ chmod +x debian/fglrx-modules-dkms/usr/src/fglrx-VERSION/make.sh
+ chmod -x debian/fglrx-driver/etc/ati/atiogl.xml
dh_installdeb
- dh_shlibdeps
- dh_md5sums
- dh_gencontrol -p$(PKG_driver)
- dh_gencontrol -p$(PKG_control)
- dh_gencontrol -p$(PKG_glx)
- dh_gencontrol -p$(PKG_daemon)
- dh_gencontrol -p$(PKG_dkms)
-ifeq ($(DEB_BUILD_ARCH),amd64)
- dh_gencontrol -p$(PKG_glx_ia32)
- dh_builddeb -p$(PKG_glx_ia32)
-endif
- dh_builddeb -p$(PKG_driver)
- dh_builddeb -p$(PKG_control)
- dh_builddeb -p$(PKG_glx)
- dh_builddeb -p$(PKG_daemon)
- dh_builddeb -p$(PKG_dkms)
-binary-indep: build
-
-get-orig-source-checks:
+get-orig-source-checks::
# This target needs DEB_BUILD_OPTIONS to contain the version specification
# in the following form: VER=some.version.number
- (if [ -z "$(NEW_UPSTREAM_VERSION)" ] ; \
- then \
- echo "Version not defined" ; \
- exit 1 ; \
- fi)
- # If dpkg-parsechangelog fails, we're not running
- # the command from the proper place,
- (if [ -z "$(UPSTREAM_VERSION)" ] ; \
- then \
- echo "Run this command from the root of the $(PKG_driver) package" ; \
- exit 1 ; \
- fi)
+ test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true
+ test ! -e debian/rules && echo "Run this command from the root of the package" && exit 1 || true
-$(INSTALLER):
+$(INSTALLER)::
# Make sure the .run package is in the proper place,
# but first try to look in the "cache".
# For some reason wget refuses to clobber and restarts everytime.
@@ -183,22 +63,22 @@
[ -f $(CACHEDIR)/$(INSTALLER) ] || wget $(URL_PATH)/$(INSTALLER) -c -O $(CACHEDIR)/$(INSTALLER)
cp $(CACHEDIR)/$(INSTALLER) .
-get-orig-source: ../$(PKG_driver)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2
-
-../$(PKG_driver)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2: get-orig-source-checks $(INSTALLER)
- (mkdir $(PKG_driver)-$(NEW_UPSTREAM_VERSION) \
- && cd $(PKG_driver)-$(NEW_UPSTREAM_VERSION) \
- && /bin/sh ../$(INSTALLER) --extract . \
- && rm -f README.distro *.sh \
- && rm -rf packages setup.data x4* \
- && rm -rf x6* \
- && rm -f arch/*/lib/modules/fglrx/fglrx.*.o)
+../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2:: get-orig-source-checks $(INSTALLER)
+ mkdir $(packagename)-$(NEW_UPSTREAM_VERSION) \
+ && cd $(packagename)-$(NEW_UPSTREAM_VERSION) \
+ && /bin/sh ../$(INSTALLER) --extract . \
+ && rm -f README.distro *.sh \
+ && rm -rf packages setup.data x4* \
+ && rm -rf x6* \
+ && rm -f arch/*/lib/modules/fglrx/fglrx.*.o
# Create the tarball.
- (tar -cjf $(PKG_driver)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 \
- $(PKG_driver)-$(NEW_UPSTREAM_VERSION) && mv \
- $(PKG_driver)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ../)
+ tar -cjf $(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 \
+ $(packagename)-$(NEW_UPSTREAM_VERSION) && mv \
+ $(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ../
# Cleanup.
- rm -fr $(PKG_driver)-$(NEW_UPSTREAM_VERSION) && \
- rm $(INSTALLER)
+ rm -fr $(packagename)-$(NEW_UPSTREAM_VERSION) && rm $(INSTALLER)
-.PHONY: binary binary-arch binary-indep build clean distclean get-orig-source get-orig-source-checks
+get-orig-source:: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2
+
+%:
+ test "${@}" = "get-orig-source" || dh ${@}
More information about the Pkg-fglrx-devel
mailing list