[Pkg-fglrx-devel] r972 - in fglrx-driver/trunk/debian: . module
Andreas Beckmann
anbe-guest at alioth.debian.org
Mon Jul 9 09:00:44 UTC 2012
Author: anbe-guest
Date: 2012-07-09 09:00:44 +0000 (Mon, 09 Jul 2012)
New Revision: 972
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/fglrx-driver.doc-base.in
fglrx-driver/trunk/debian/fglrx-driver.install.in
fglrx-driver/trunk/debian/fglrx-source.install.in
fglrx-driver/trunk/debian/fglrx-source.lintian-overrides
fglrx-driver/trunk/debian/module/control.template.in
fglrx-driver/trunk/debian/module/rules
fglrx-driver/trunk/debian/rules
Log:
use ${fglrx} and ${fglrx:Legacy} substitutions
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/changelog 2012-07-09 09:00:44 UTC (rev 972)
@@ -8,6 +8,8 @@
- Add support for on-the-fly renaming of debian/*{fglrx => fglrx-legacy}*.
- Add information about supported models to the long descriptions.
- Add support for adding a legacy note to the short descriptions.
+ - Add ${fglrx} and ${fglrx:Legacy} substvars to simplify replacing the
+ 'fglrx' part of package names with 'fglrx-legacy'.
* debian/rules get-orig-source:
- Add support for zipped installers.
- Add support for using the internal version as upstream version.
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/control 2012-07-09 09:00:44 UTC (rev 972)
@@ -38,20 +38,20 @@
Depends:
${misc:Depends},
${shlibs:Depends},
- libfglrx (= ${binary:Version}),
+ lib${fglrx} (= ${binary:Version}),
xorg-video-abi-12 | xorg-video-abi-11 | xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
xserver-xorg-core,
glx-alternative-fglrx (>= 0.2),
Recommends:
- fglrx-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
- libgl1-fglrx-glx (= ${binary:Version}),
- libgl1-fglrx-glx-i386 [amd64],
- fglrx-glx-ia32 [amd64],
- fglrx-atieventsd,
+ ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
+ libgl1-${fglrx}-glx (= ${binary:Version}),
+ libgl1-${fglrx}-glx-i386 [amd64],
+ ${fglrx}-glx-ia32 [amd64],
+ ${fglrx}-atieventsd,
Suggests:
- fglrx-control,
+ ${fglrx}-control,
xvba-va-driver,
- amd-opencl-icd,
+ amd-opencl-icd${fglrx:Legacy},
Provides:
xorg-driver-video,
xserver-xorg-video-fglrx,
@@ -59,8 +59,8 @@
xserver-xorg-video-fglrx,
ia32-fglrx-driver,
Breaks:
- libgl1-fglrx-glx (<< ${binary:Version}),
- libgl1-fglrx-glx (>> ${binary:Version}),
+ libgl1-${fglrx}-glx (<< ${binary:Version}),
+ libgl1-${fglrx}-glx (>> ${binary:Version}),
nvidia-glx (<< 275.09.07-3),
Replaces:
xserver-xorg-video-fglrx,
@@ -71,14 +71,15 @@
.
${fglrx:Models}
.
- This package provides display drivers and hardware accelerated OpenGL
- for X.Org. For 3D acceleration to work, you will need to
- compile the fglrx kernel module for your kernel: see the fglrx-modules-dkms
+ This package provides display drivers and hardware accelerated OpenGL for
+ X.Org. For 3D acceleration to work, you will need to compile the fglrx kernel
+ module for your kernel: see the ${fglrx}-modules-dkms
package. Note that the driver will work without the kernel module, but 3D
acceleration will be disabled.
.
The driver can work with plain MESA libGL, but some applications may require
- the proprietary libGL. This library is shipped in the libgl1-fglrx-glx package.
+ the proprietary libGL. This library is shipped in the
+ libgl1-${fglrx}-glx package.
Package: libfglrx
Section: non-free/libs
@@ -110,7 +111,8 @@
${fglrx:Models}
.
This package contains the runtime libraries.
- The proprietary libGL library is shipped in the libgl1-fglrx-glx package.
+ The proprietary libGL library is shipped in the
+ libgl1-${fglrx}-glx package.
Package: libxvbaw1
Section: non-free/libs
@@ -119,7 +121,7 @@
Pre-Depends:
${misc:Pre-Depends},
Depends:
- libgl1-fglrx-glx (= ${binary:Version}),
+ libgl1-${fglrx}-glx (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
Breaks:
@@ -171,11 +173,11 @@
Depends:
${misc:Depends},
${shlibs:Depends},
- libfglrx (= ${binary:Version}),
+ lib${fglrx} (= ${binary:Version}),
glx-alternative-fglrx (>= 0.2),
Provides:
libgl1-fglrx-glx-virtual,
- libgl1-fglrx-glx-i386 [i386],
+ libgl1-${fglrx}-glx-i386 [i386],
Conflicts:
libgl1-fglrx-glx-virtual,
fglrx-glx-ia32 [i386],
@@ -198,10 +200,10 @@
Section: non-free/oldlibs
Architecture: i386 amd64
Depends:
- libgl1-fglrx-glx,
+ libgl1-${fglrx}-glx,
${misc:Depends},
-Description: transitional package, use libgl1-fglrx-glx
- This is a transitional package to aid migration to libgl1-fglrx-glx.
+Description: transitional package, use libgl1-${fglrx}-glx
+ This is a transitional package to aid migration to libgl1-${fglrx}-glx.
It can be safely removed from the system once nothing depends on it.
Package: fglrx-glx-ia32
@@ -211,8 +213,8 @@
Depends:
${misc:Depends},
${shlibs:Depends},
- libfglrx-ia32 (= ${binary:Version}),
- fglrx-driver (= ${binary:Version}),
+ lib${fglrx}-ia32 (= ${binary:Version}),
+ ${fglrx}-driver (= ${binary:Version}),
Conflicts:
nvidia-glx-ia32,
ia32-fglrx-glx,
@@ -244,7 +246,8 @@
${fglrx:Models}
.
This package contains the 32-bit runtime libraries.
- The proprietary libGL library is shipped in the fglrx-glx-ia32 package.
+ The proprietary libGL library is shipped in the
+ ${fglrx}-glx-ia32 package.
Package: fglrx-modules-dkms
Section: non-free/kernel
@@ -253,10 +256,10 @@
${misc:Depends},
dkms (>= 2.1),
Suggests:
- fglrx-driver,
+ ${fglrx}-driver,
Provides:
fglrx-kernel-dkms,
- fglrx-kernel-${fglrx:version},
+ fglrx-kernel-${fglrx:Version},
Conflicts:
fglrx-kernel-dkms,
Breaks:
@@ -287,7 +290,7 @@
Recommends:
module-assistant | kernel-package,
Suggests:
- fglrx-driver,
+ ${fglrx}-driver,
Conflicts:
fglrx-kernel-src,
Breaks:
@@ -310,7 +313,7 @@
Depends:
${misc:Depends},
${shlibs:Depends},
- fglrx-driver,
+ ${fglrx}-driver (= ${binary:Version}),
Provides:
fglrx-control-virtual,
Conflicts:
@@ -341,7 +344,7 @@
${shlibs:Depends},
lsb-base,
Recommends:
- fglrx-driver (= ${binary:Version}),
+ ${fglrx}-driver (= ${binary:Version}),
acpid,
Provides:
fglrx-atieventsd-virtual,
Modified: fglrx-driver/trunk/debian/fglrx-driver.doc-base.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.doc-base.in 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/fglrx-driver.doc-base.in 2012-07-09 09:00:44 UTC (rev 972)
@@ -1,9 +1,9 @@
-Document: fglrx-driver
+Document: _FGLRX_-driver
Title: fglrx driver manuals
Author: AMD
Abstract: fglrx driver user manuals
Section: System/Hardware
Format: HTML
-Index: /usr/share/doc/fglrx-driver/user-manual/index.html
-Files: /usr/share/doc/fglrx-driver/*.html
+Index: /usr/share/doc/_FGLRX_-driver/user-manual/index.html
+Files: /usr/share/doc/_FGLRX_-driver/*.html
Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in 2012-07-09 09:00:44 UTC (rev 972)
@@ -12,6 +12,6 @@
_XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so usr/lib/fglrx/
_XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/fglrx-libglx.so usr/lib/fglrx/
_XPIC_/usr/X11R6/_LIB_/modules/linux/*.so usr/lib/xorg/modules/linux/
-fglrx.ids usr/share/fglrx/
+_FGLRX_.ids usr/share/fglrx/
debian/switchlibGL usr/lib/fglrx/
debian/switchlibglx usr/lib/fglrx/
Modified: fglrx-driver/trunk/debian/fglrx-source.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-source.install.in 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/fglrx-source.install.in 2012-07-09 09:00:44 UTC (rev 972)
@@ -1,9 +1,9 @@
-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/2.6.x/Makefile usr/src/modules/fglrx/
-arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a 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/
-debian/module/* usr/src/modules/fglrx/debian/
-debian/bug-script usr/src/modules/fglrx/debian/
+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/2.6.x/Makefile usr/src/modules/_FGLRX_/
+arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a 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/
+debian/module/* usr/src/modules/_FGLRX_/debian/
+debian/bug-script usr/src/modules/_FGLRX_/debian/
Modified: fglrx-driver/trunk/debian/fglrx-source.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-source.lintian-overrides 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/fglrx-source.lintian-overrides 2012-07-09 09:00:44 UTC (rev 972)
@@ -1 +1 @@
-fglrx-source: no-upstream-changelog
+no-upstream-changelog
Modified: fglrx-driver/trunk/debian/module/control.template.in
===================================================================
--- fglrx-driver/trunk/debian/module/control.template.in 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/module/control.template.in 2012-07-09 09:00:44 UTC (rev 972)
@@ -1,4 +1,4 @@
-Source: fglrx-driver
+Source: _FGLRX_-driver
Section: non-free/kernel
Priority: extra
Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
@@ -9,10 +9,10 @@
Standards-Version: 3.9.2
Homepage: http://ati.amd.com/support/drivers/linux/linux-radeon.html
-Package: fglrx-kernel-#KVERS#
+Package: _FGLRX_-kernel-#KVERS#
Architecture: i386 amd64
Recommends: linux-image-#KVERS#
-Provides: fglrx-kernel-${fglrx:version}
+Provides: fglrx-kernel-${fglrx:Version}
Description: FGLRX binary kernel module for Linux #KVERS#
FGLRX / AMD Catalyst is the non-free proprietary display driver for the
ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
Modified: fglrx-driver/trunk/debian/module/rules
===================================================================
--- fglrx-driver/trunk/debian/module/rules 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/module/rules 2012-07-09 09:00:44 UTC (rev 972)
@@ -69,7 +69,7 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:version=$(subst ~,-,$(upstream_version))'
+ dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:Version=$(subst ~,-,$(upstream_version))'
dh_md5sums
ifdef KPKG_DEST_DIR
dh_builddeb --destdir=$(KPKG_DEST_DIR)
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2012-07-09 08:23:24 UTC (rev 971)
+++ fglrx-driver/trunk/debian/rules 2012-07-09 09:00:44 UTC (rev 972)
@@ -25,6 +25,7 @@
cap=AMDXvBAx86.cap
endif
+fglrx = fglrx$(legacy)
libdir = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
CONTROL_PREFIXES = fglrx libfglrx libgl1-fglrx amd-opencl-icd
@@ -39,7 +40,7 @@
export DH_ALWAYS_EXCLUDE=.in
TEMPLATES := $(wildcard debian/*.in debian/module/*.in)
AUTOGEN += $(patsubst %.in,%,$(TEMPLATES))
-AUTOGEN += fglrx.ids
+AUTOGEN += $(fglrx).ids
AUTOGEN += debian/switchlibglx
AUTOGEN += $(patsubst %.in,%,$(RENAMED_CONTROL))
AUTOKEEP =
@@ -47,6 +48,8 @@
%: %.in debian/rules debian/rules.defs
sed -r -e 's%_VERSION_%$(upstream_version)%g' \
+ -e 's%_FGLRX_%$(fglrx)%g' \
+ -e 's%_LEGACY_%$(legacy)%g' \
-e 's%_ARCH_%$(arch)%g' \
-e 's%_XPIC_%$(xpic)%g' \
-e 's%_LIB_%$(lib)%g' \
@@ -77,7 +80,7 @@
diff -w copyright.tmp LICENSE.tmp
rm -f copyright.tmp LICENSE.tmp
-fglrx.ids: common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+$(fglrx).ids: common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
cat $< | sed -n -r -e '/FGL_ASIC_ID/ s/.*\(0x(.{4})\).*/1002\1/p' \
| tr a-z A-Z | sort -u > $@
@@ -111,30 +114,31 @@
# On amd64, AMD hardcoded some paths to /usr/lib64/fglrx/switchlibgl*, and
# prevents working around this with symlinks because they check the files
# with lstat() and thereafter complain about world writability.
-badlib64files = ./debian/fglrx-driver/usr/lib/fglrx/fglrx_drv.so
-badlib64files += ./debian/fglrx-atieventsd/usr/sbin/atieventsd
-badlib64files += ./debian/fglrx-control/usr/bin/amdcccle
-badlib64files += ./debian/fglrx-driver/usr/bin/aticonfig
+badlib64files = debian/$(fglrx)-driver/usr/lib/fglrx/fglrx_drv.so
+badlib64files += debian/$(fglrx)-atieventsd/usr/sbin/atieventsd
+badlib64files += debian/$(fglrx)-control/usr/bin/amdcccle
+badlib64files += debian/$(fglrx)-driver/usr/bin/aticonfig
override_dh_install:
dh_install
- chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
- test ! -d debian/libgl1-fglrx-glx || \
+ chrpath -d -k debian/$(fglrx)-control/usr/bin/amdcccle
+ test ! -f debian/libgl1-$(fglrx)-glx/$(libdir)/fglrx/fglrx-libGL.so.1.2 || \
rpl -e '/usr/X11R6/lib/modules/dri\0' \
'$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
- debian/libgl1-fglrx-glx/$(libdir)/fglrx/fglrx-libGL.so.1.2
- test ! -d debian/fglrx-glx-ia32 || \
+ debian/libgl1-$(fglrx)-glx/$(libdir)/fglrx/fglrx-libGL.so.1.2
+ test ! -f debian/$(fglrx)-glx-ia32/usr/lib32/fglrx-libGL.so.1.2 || \
rpl -e '/usr/X11R6/lib/modules/dri\0' \
'$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
- debian/fglrx-glx-ia32/usr/lib32/fglrx-libGL.so.1.2
+ debian/$(fglrx)-glx-ia32/usr/lib32/fglrx-libGL.so.1.2
rpl -e '/usr/lib64/fglrx' \
'/usr/lib///fglrx' \
$(badlib64files)
- rpl -e 'libAMDXvBA.cap' '$(cap)' debian/libxvbaw1/$(libdir)/libAMDXvBA.so.1.0
- chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
- tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \
+ test ! -f debian/libxvbaw$(legacy)1/$(libdir)/libAMDXvBA.so.1.0 || \
+ rpl -e 'libAMDXvBA.cap' '$(cap)' debian/libxvbaw$(legacy)1/$(libdir)/libAMDXvBA.so.1.0
+ 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
+ --directory debian/$(fglrx)-source/usr/src/ modules
override_dh_dkms:
dh_dkms -V $(upstream_version)
@@ -146,19 +150,22 @@
# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
override_dh_makeshlibs:
dh_makeshlibs
- test ! -d debian/libgl1-fglrx-glx || \
+ test ! -f debian/libgl1-$(fglrx)-glx/DEBIAN/shlibs || \
sed -i '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' \
- debian/libgl1-fglrx-glx/DEBIAN/shlibs
- test ! -d debian/fglrx-glx-ia32 || \
+ debian/libgl1-$(fglrx)-glx/DEBIAN/shlibs
+ test ! -f debian/$(fglrx)-glx-ia32/DEBIAN/shlibs || \
sed -i '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' \
- debian/fglrx-glx-ia32/DEBIAN/shlibs
+ debian/$(fglrx)-glx-ia32/DEBIAN/shlibs
override_dh_shlibdeps:
cat debian/*.shlibs > debian/shlibs.local
dh_shlibdeps
override_dh_gencontrol:
- dh_gencontrol -- -V'fglrx:version=$(subst ~,-,$(upstream_version))' \
+ dh_gencontrol -- \
+ -V'fglrx=$(fglrx)' \
+ -V'fglrx:Version=$(subst ~,-,$(upstream_version))' \
+ -V'fglrx:Legacy=$(legacy)' \
-V'fglrx:LegacyDesc=$(legacy_description)' \
-Vfglrx:Info="`cat debian/control.info`" \
-Vfglrx:Models="`cat debian/control.models`"
More information about the Pkg-fglrx-devel
mailing list