[Pkg-fglrx-devel] r642 - in fglrx-driver/trunk/debian: . dkms
Michael Gilbert
gilbert-guest at alioth.debian.org
Thu Aug 4 06:00:40 UTC 2011
Author: gilbert-guest
Date: 2011-08-04 06:00:39 +0000 (Thu, 04 Aug 2011)
New Revision: 642
Added:
fglrx-driver/trunk/debian/dkms.conf.in
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.install.in
fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in
Removed:
fglrx-driver/trunk/debian/dkms/dkms.conf.template
fglrx-driver/trunk/debian/fglrx-atieventsd.install
fglrx-driver/trunk/debian/fglrx-control.install
fglrx-driver/trunk/debian/fglrx-driver.install
fglrx-driver/trunk/debian/fglrx-glx.install
fglrx-driver/trunk/debian/fglrx-modules-dkms.install
fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/fglrx-glx-ia32.install
fglrx-driver/trunk/debian/rules
Log:
further simplify build process
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/changelog 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,3 +1,10 @@
+fglrx-driver (1:11-7-2) unstable; urgency=low
+
+ * Further simplify build process simplifications.
+ * Drop unneeded shlibs:Depends in fglrx-atieventsd.
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com> Sun, 31 Jul 2011 00:24:30 -0400
+
fglrx-driver (1:11-7-1) unstable; urgency=low
* New upstream version:
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/control 2011-08-04 06:00:39 UTC (rev 642)
@@ -37,7 +37,6 @@
Depends:
${misc:Depends},
${shlibs:Depends},
- xserver-xorg (>= 1:7.6+7),
xorg-video-abi-10,
glx-alternative-fglrx (>= 0.1.2)
Recommends:
@@ -143,8 +142,6 @@
Architecture: i386 amd64
Depends:
${misc:Depends},
- ${shlibs:Depends},
- xserver-xorg (>= 1:7.6+1),
lsb-base
Recommends:
fglrx-driver (= ${binary:Version}),
Deleted: fglrx-driver/trunk/debian/dkms/dkms.conf.template
===================================================================
--- fglrx-driver/trunk/debian/dkms/dkms.conf.template 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/dkms/dkms.conf.template 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,6 +0,0 @@
-PACKAGE_NAME="fglrx"
-PACKAGE_VERSION="_VERSION_"
-BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
-DEST_MODULE_LOCATION[0]="/updates"
-AUTOINSTALL=yes
-CLEAN="rm -f *.*o"
Copied: fglrx-driver/trunk/debian/dkms.conf.in (from rev 641, fglrx-driver/trunk/debian/dkms/dkms.conf.template)
===================================================================
--- fglrx-driver/trunk/debian/dkms.conf.in (rev 0)
+++ fglrx-driver/trunk/debian/dkms.conf.in 2011-08-04 06:00:39 UTC (rev 642)
@@ -0,0 +1,6 @@
+PACKAGE_NAME="fglrx"
+PACKAGE_VERSION="_VERSION_"
+BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
+DEST_MODULE_LOCATION[0]="/updates"
+AUTOINSTALL=yes
+CLEAN="rm -f *.*o"
Deleted: fglrx-driver/trunk/debian/fglrx-atieventsd.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-atieventsd.install 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/fglrx-atieventsd.install 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,3 +0,0 @@
-common/etc/ati/authatieventsd.sh etc/ati/
-debian/reportbug/script usr/share/bug/fglrx-atieventsd/
-sbin/atieventsd usr/sbin
Copied: fglrx-driver/trunk/debian/fglrx-atieventsd.install.in (from rev 641, fglrx-driver/trunk/debian/fglrx-atieventsd.install)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-atieventsd.install.in (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-atieventsd.install.in 2011-08-04 06:00:39 UTC (rev 642)
@@ -0,0 +1,3 @@
+common/etc/ati/authatieventsd.sh etc/ati/
+debian/reportbug/script usr/share/bug/fglrx-atieventsd/
+arch/_ARCH_/usr/sbin/atieventsd usr/sbin
Deleted: fglrx-driver/trunk/debian/fglrx-control.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.install 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/fglrx-control.install 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,4 +0,0 @@
-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
Copied: fglrx-driver/trunk/debian/fglrx-control.install.in (from rev 641, fglrx-driver/trunk/debian/fglrx-control.install)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.install.in (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-control.install.in 2011-08-04 06:00:39 UTC (rev 642)
@@ -0,0 +1,4 @@
+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
Deleted: fglrx-driver/trunk/debian/fglrx-driver.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/fglrx-driver.install 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,26 +0,0 @@
-common/etc/ati/signature etc/ati/
-common/etc/ati/control etc/ati/
-common/etc/ati/atiogl.xml etc/ati/
-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/
-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/drivers/fglrx_drv.so usr/lib/fglrx
Added: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in 2011-08-04 06:00:39 UTC (rev 642)
@@ -0,0 +1,26 @@
+common/etc/ati/signature etc/ati/
+common/etc/ati/control etc/ati/
+common/etc/ati/atiogl.xml etc/ati/
+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
+arch/_ARCH_/usr/X11R6/bin/atiodcli usr/bin
+arch/_ARCH_/usr/X11R6/bin/atiode usr/bin
+arch/_ARCH_/usr/X11R6/bin/fgl_glxgears usr/bin
+arch/_ARCH_/usr/X11R6/bin/fglrxinfo usr/bin
+arch/_ARCH_/usr/_LIB_/libatiuki.so.1.0 usr/lib
+arch/_ARCH_/usr/_LIB_/libaticaldd.so usr/lib
+arch/_ARCH_/usr/_LIB_/libaticalcl.so usr/lib
+arch/_ARCH_/usr/_LIB_/libaticalrt.so usr/lib
+arch/_ARCH_/usr/X11R6/_LIB_/libatiadlxx.so usr/lib
+arch/_ARCH_/usr/X11R6/_LIB_/libXvBAW.so.1.0 usr/lib
+arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.so.1.0 usr/lib
+arch/_ARCH_/usr/X11R6/_LIB_/libfglrx_dm.a usr/lib
+arch/_ARCH_/usr/X11R6/_LIB_/libfglrx_dm.so.1.0 usr/lib
+arch/_ARCH_/usr/X11R6/_LIB_/modules/dri usr/lib
+_XPIC_/usr/X11R6/_LIB_/modules usr/lib/xorg
+_XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so usr/lib/fglrx
Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,4 +1,4 @@
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
+arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 usr/lib32
debian/reportbug/script usr/share/bug/fglrx-glx-ia32/
Deleted: fglrx-driver/trunk/debian/fglrx-glx.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.install 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/fglrx-glx.install 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,3 +0,0 @@
-debian/reportbug/script usr/share/bug/fglrx-glx/
-xlib/libGL.so.1.2 usr/lib/fglrx
-mlib/modules/extensions/fglrx/fglrx-libglx.so usr/lib/fglrx
Added: fglrx-driver/trunk/debian/fglrx-glx.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.install.in (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx.install.in 2011-08-04 06:00:39 UTC (rev 642)
@@ -0,0 +1,3 @@
+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
Deleted: fglrx-driver/trunk/debian/fglrx-modules-dkms.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,6 +0,0 @@
-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/dkms.conf usr/src/fglrx-VERSION/
-blib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-VERSION/
Added: fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in 2011-08-04 06:00:39 UTC (rev 642)
@@ -0,0 +1,6 @@
+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/fglrx-modules-dkms.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides 2011-08-04 06:00:39 UTC (rev 642)
@@ -1,5 +0,0 @@
-fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-11-7/libfglrx_ip.a aquired acquired
-fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-11-7/libfglrx_ip.a neccessary necessary
-fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-11-7/libfglrx_ip.a neccessary necessary
-fglrx-modules-dkms: unstripped-binary-or-object usr/src/fglrx-11-7/libfglrx_ip.a
-fglrx-modules-dkms: no-upstream-changelog
Added: fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in 2011-08-04 06:00:39 UTC (rev 642)
@@ -0,0 +1,5 @@
+fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a aquired acquired
+fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
+fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
+fglrx-modules-dkms: unstripped-binary-or-object usr/src/fglrx-_VERSION_/libfglrx_ip.a
+fglrx-modules-dkms: no-upstream-changelog
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2011-07-28 03:06:31 UTC (rev 641)
+++ fglrx-driver/trunk/debian/rules 2011-08-04 06:00:39 UTC (rev 642)
@@ -11,47 +11,46 @@
endif
ifeq ($(DEB_BUILD_ARCH),amd64)
-arch=arch/x86_64
-pic=xpic_64a
+arch=x86_64
+xpic=xpic_64a
lib=lib64
else
-arch=arch/x86
-pic=xpic
+arch=x86
+xpic=xpic
lib=lib
endif
+files=debian/dkms.conf \
+ debian/fglrx-glx.install \
+ debian/fglrx-driver.install \
+ debian/fglrx-control.install \
+ debian/fglrx-modules-dkms.install \
+ debian/fglrx-modules-dkms.lintian-overrides
+
+%: %.in
+ sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
+
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 blib mlib debian/dkms/dkms.conf
+ rm -f $(files)
-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
+override_dh_auto_configure: $(files)
+ cd debian/man && ./autogen.sh --copy
+ chmod +x debian/man/configure debian/man/install-sh debian/man/missing
+ cd debian/man && ./configure --prefix=/usr --mandir=/usr/share/man
$(MAKE) -C debian/man
- 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 $(arch)/lib blib
- ln -s $(pic)/usr/X11R6/$(lib) mlib
-
- 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
-
- sed s/_VERSION_/$(upstream_version)/g < debian/dkms/dkms.conf.template > debian/dkms/dkms.conf
-
override_dh_installdeb:
chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
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-VERSION/*
- mv debian/fglrx-modules-dkms/usr/src/fglrx-VERSION/ \
- debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version)
+ chmod -x debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version)/*
mv debian/fglrx-glx/usr/lib/fglrx/fglrx-libglx.so \
debian/fglrx-glx/usr/lib/fglrx/libglx.so
+ mv debian/fglrx-glx/usr/lib/fglrx/fglrx-libGL.so.1.2 \
+ debian/fglrx-glx/usr/lib/fglrx/libGL.so.1.2
+ test $(arch) != x86_64 || mv debian/fglrx-glx-ia32/usr/lib32/fglrx-libGL.so.1.2 \
+ debian/fglrx-glx-ia32/usr/lib32/libGL.so.1.2
dh_installdeb
get-orig-source-checks::
More information about the Pkg-fglrx-devel
mailing list