[Pkg-fglrx-devel] r647 - in fglrx-driver/trunk/debian: . reportbug
Michael Gilbert
gilbert-guest at alioth.debian.org
Thu Aug 4 06:01:18 UTC 2011
Author: gilbert-guest
Date: 2011-08-04 06:01:17 +0000 (Thu, 04 Aug 2011)
New Revision: 647
Removed:
fglrx-driver/trunk/debian/reportbug/script
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/fglrx-atieventsd.install.in
fglrx-driver/trunk/debian/fglrx-control.install.in
fglrx-driver/trunk/debian/fglrx-driver.install.in
fglrx-driver/trunk/debian/fglrx-glx-ia32.install
fglrx-driver/trunk/debian/fglrx-glx.install.in
fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
fglrx-driver/trunk/debian/rules
Log:
use dh_bugfiles
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/changelog 2011-08-04 06:01:17 UTC (rev 647)
@@ -3,6 +3,8 @@
[ Andreas Beckmann ]
* Configure the manpages with --with-xserver=Xorg to skip autodetection.
* Minimize B-D, drop B-D versioning if satisfied in oldstable (lenny)
+ * Rename debian/reportbug/script to debian/bug-script and use dh_bugfiles -A
+ to install it in all packages.
[ Michael Gilbert ]
* Handle generated files more robustly.
Modified: fglrx-driver/trunk/debian/fglrx-atieventsd.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-atieventsd.install.in 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/fglrx-atieventsd.install.in 2011-08-04 06:01:17 UTC (rev 647)
@@ -1,3 +1,2 @@
common/etc/ati/authatieventsd.sh etc/ati/
-debian/reportbug/script usr/share/bug/fglrx-atieventsd/
arch/_ARCH_/usr/sbin/atieventsd usr/sbin
Modified: fglrx-driver/trunk/debian/fglrx-control.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.install.in 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/fglrx-control.install.in 2011-08-04 06:01:17 UTC (rev 647)
@@ -1,4 +1,3 @@
debian/amdcccle.desktop usr/share/applications/
common/usr/share/icons/* usr/share/icons/
-debian/reportbug/script usr/share/bug/fglrx-control/
arch/_ARCH_/usr/X11R6/bin/amdcccle usr/bin
Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in 2011-08-04 06:01:17 UTC (rev 647)
@@ -4,7 +4,6 @@
common/etc/ati/amdpcsdb.default etc/ati/
debian/acpi/*.sh etc/acpi/
debian/acpi/events/fglrx-* etc/acpi/events/
-debian/reportbug/script usr/share/bug/fglrx-driver/
debian/configuration/fglrx-driver.conf etc/modprobe.d/
debian/import/amdxvba.h usr/include/
arch/_ARCH_/usr/X11R6/bin/aticonfig usr/bin
Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-08-04 06:01:17 UTC (rev 647)
@@ -1,4 +1,3 @@
arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri
arch/x86/usr/lib/libatiuki* usr/lib32
arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 usr/lib32
-debian/reportbug/script usr/share/bug/fglrx-glx-ia32/
Modified: fglrx-driver/trunk/debian/fglrx-glx.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.install.in 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/fglrx-glx.install.in 2011-08-04 06:01:17 UTC (rev 647)
@@ -1,3 +1,2 @@
-debian/reportbug/script usr/share/bug/fglrx-glx/
arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 usr/lib/fglrx
_XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/fglrx-libglx.so usr/lib/fglrx
Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in 2011-08-04 06:01:17 UTC (rev 647)
@@ -1,6 +1,5 @@
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/2.6.x/Makefile usr/src/fglrx-_VERSION_/
-debian/reportbug/script usr/share/bug/fglrx-modules-dkms/
debian/dkms.conf usr/src/fglrx-_VERSION_/
arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/
Deleted: fglrx-driver/trunk/debian/reportbug/script
===================================================================
--- fglrx-driver/trunk/debian/reportbug/script 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/reportbug/script 2011-08-04 06:01:17 UTC (rev 647)
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-PATH="/sbin:$PATH"
-CONFIG_DIR=/etc/X11
-XORGCONFIG="$CONFIG_DIR/xorg.conf"
-CONFIG_AUX_DIR=/var/lib/x11
-
-exec >&3
-
-if which lspci > /dev/null 2>&1; then
- printf "VGA-compatible devices on PCI bus:\n"
- LC_ALL=C lspci | grep 'VGA compatible controller:'
- LC_ALL=C lspci -n | grep 'Class 0300:'
-else
- printf "The lspci command was not found; not including PCI data.\n"
-fi
-
-printf "\n"
-
-if [ -x /bin/dmesg ]; then
- printf "DRM and fglrx Informations from dmesg:\n"
- dmesg | egrep -i 'drm|agp|fglrx'
-fi
-
-
-printf "\n"
-
-if [ -e "$XORGCONFIG" ]; then
- printf "Xorg X server configuration file status:\n"
- ls -dl "$XORGCONFIG"
- printf "\n"
- printf "Contents of $XORGCONFIG:\n"
- iconv -c -t ascii "$XORGCONFIG"
- printf "\n"
-else
- printf "$XORGCONFIG does not exist.\n"
-fi
-
-printf "\n"
-
-XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
-
-if [ -n "$XORG_LOGS" ]; then
- printf "Xorg X server log files on system:\n"
- ls -dlrt /var/log/Xorg.*.log 2>/dev/null
- printf "\n"
- for LOG in $XORG_LOGS; do
- if [ -f "$LOG" ]; then
- printf "Contents of most recent Xorg X server log file\n"
- printf "%s:\n" "$LOG"
- cat "$LOG"
- # the log files are large; only show the most recent
- break
- fi
- done
-else
- printf "No Xorg X server log files found.\n"
-fi
-
-printf "\n"
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2011-08-04 06:01:10 UTC (rev 646)
+++ fglrx-driver/trunk/debian/rules 2011-08-04 06:01:17 UTC (rev 647)
@@ -37,6 +37,9 @@
--with-xserver=Xorg
$(MAKE) -C debian/man
+override_dh_bugfiles:
+ dh_bugfiles -A
+
override_dh_installdeb:
chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
chmod -x debian/fglrx-control/usr/share/icons/*
More information about the Pkg-fglrx-devel
mailing list