[Pkg-fglrx-devel] r604 - fglrx-driver/trunk/debian

Patrick Matthäi pmatthaei at alioth.debian.org
Wed Jun 22 18:54:34 UTC 2011


Author: pmatthaei
Date: 2011-06-22 18:54:34 +0000 (Wed, 22 Jun 2011)
New Revision: 604

Added:
   fglrx-driver/trunk/debian/fglrx-driver.links
   fglrx-driver/trunk/debian/fglrx-glx-ia32.install
   fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
   fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
   fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm
   fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst
Removed:
   fglrx-driver/trunk/debian/fglrx-glx.postrm
   fglrx-driver/trunk/debian/fglrx-glx.preinst
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/fglrx-driver.postrm
   fglrx-driver/trunk/debian/fglrx-driver.preinst
   fglrx-driver/trunk/debian/rules
Log:
More work (much thanks to Andreas Beckmann!)
Reintroduced fglrx-glx-ia32 package (but it does not build, yet).


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-06-18 14:08:48 UTC (rev 603)
+++ fglrx-driver/trunk/debian/changelog	2011-06-22 18:54:34 UTC (rev 604)
@@ -3,23 +3,23 @@
   * New upstream release.
     Closes: #627100
     - Refresh patch 02-dkms-arch_compat.diff.
-  * Remove odd comments from maintainer scripts.
+  * Remove old comments from maintainer scripts.
   * Remove debconf question about ACPI Powerstates, it is handled by fglrx
     itself.
   * Wrap control fields in debian/control.
   * Depend on xserver-xorg 1:7.6+7 to ensure, that a multiarch xorg is present.
-  * Try to enable multiarch:
+  * Try to mess with multiarch:
      Closes: #630592
-    - Drop fglrx-glx-ia32 package.
     - Rework many packaging parts.
-    - Rework diversion handling.
-  * Remove odd NEWS file.
-  * Remove odd menu entries for fglrx-control.
+    - Remove diversion handling, it is handled by glx-alternative now.
+      Closes: #610022
+  * Remove old NEWS file.
+  * Remove old menu entries for fglrx-control.
   * Remove rpl from build depends and from debian/rules, no longer needed.
-  * Remove all odd upgrade paths.
+  * Remove all old upgrade paths.
   * Adjust lintian overrides.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 17 Jun 2011 22:21:58 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 22 Jun 2011 20:51:03 +0200
 
 fglrx-driver (1:11-4-2) unstable; urgency=low
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-06-18 14:08:48 UTC (rev 603)
+++ fglrx-driver/trunk/debian/control	2011-06-22 18:54:34 UTC (rev 604)
@@ -6,6 +6,7 @@
  Michael Gilbert <michael.s.gilbert at gmail.com>
 Build-Depends: debhelper (>= 7),
  bzip2,
+ ia32-libs [amd64],
  libx11-6,
  libxext6,
  libgl1-mesa-glx,
@@ -33,18 +34,18 @@
 Package: fglrx-driver
 Architecture: i386 amd64
 Multi-Arch: same
-Pre-Depends: multiarch-support
 Depends: ${misc:Depends},
  ${shlibs:Depends},
  xserver-xorg (>= 1:7.6+7),
- xorg-video-abi-10
+ xorg-video-abi-10,
+ glx-alternative-fglrx
 Recommends: fglrx-modules-dkms (= ${binary:Version}),
  fglrx-glx,
+ fglrx-glx-ia32 [amd64],
  fglrx-atieventsd
 Provides: xorg-driver-video
-Conflicts: ia32-fglrx-driver,
- nvidia-glx,
- fglrx-glx-ia32
+Conflicts: ia32-fglrx-driver
+Breaks: nvidia-glx (<< 275.09.07-3)
 Suggests: fglrx-control,
  xvba-va-driver
 Description: non-free ATI/AMD RadeonHD display driver
@@ -67,11 +68,12 @@
 Package: fglrx-glx
 Architecture: i386 amd64
 Multi-Arch: same
-Pre-Depends: multiarch-support
 Depends: ${misc:Depends},
  ${shlibs:Depends},
- fglrx-driver (= ${binary:Version})
-Conflicts: nvidia-glx
+ fglrx-driver (= ${binary:Version}),
+ glx-alternative-fglrx
+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.
  .
@@ -80,6 +82,23 @@
  This driver is not free. As an alternative, you may try the newest free
  driver xserver-xorg-video-radeon.
 
+Package: fglrx-glx-ia32
+Architecture: amd64
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ fglrx-driver (= ${binary:Version})
+Pre-Depends: libc6-i386 (>= 2.9-18)
+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.
+ .
+ This package provides the proprietary 32 bit libGL shipped by ATI/AMD for
+ emulated userspace on amd64.
+ .
+ This driver is not free. As an alternative, you may try the newest free
+ driver xserver-xorg-video-radeon.
+
 Package: fglrx-modules-dkms
 Section: non-free/kernel
 Architecture: i386 amd64

Added: fglrx-driver/trunk/debian/fglrx-driver.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.links	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-driver.links	2011-06-22 18:54:34 UTC (rev 604)
@@ -0,0 +1,2 @@
+/usr/lib/libAMDXvBA.so.1.0 /usr/lib/libAMDXvBA.so.1
+/usr/lib/libXvBAW.so.1.0 /usr/lib/libXvBAW.so.1

Modified: fglrx-driver/trunk/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postrm	2011-06-18 14:08:48 UTC (rev 603)
+++ fglrx-driver/trunk/debian/fglrx-driver.postrm	2011-06-22 18:54:34 UTC (rev 604)
@@ -2,19 +2,16 @@
 
 set -e
 
-DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 case "$1" in
 	remove)
 		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
 			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
 		fi
-		dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libglx.so
-		rm -rf /usr/lib/fglrx/diversions-$DESTINATION
+		rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
 	;;
 	purge)
 		if [ -f /etc/ati/amdpcsdb ]; then
-			rm -f /etc/ati/amdpcsdb
+			rm /etc/ati/amdpcsdb
 		fi
 	;;
     failed-upgrade|disappear)

Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-06-18 14:08:48 UTC (rev 603)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-06-22 18:54:34 UTC (rev 604)
@@ -2,18 +2,12 @@
 
 set -e
 
-DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 case "$1" in
     install|upgrade)
-		mkdir -p /usr/lib/fglrx/diversions-$DESTINATION
 		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
 			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
 		fi
-		if [ -d /usr/lib/fglrx/diversions ]; then
-			rm -rf /usr/lib/fglrx/diversions
-		fi
-		dpkg-divert --package fglrx-driver --divert /usr/lib/fglrx/diversions-$DESTINATION/libglx.so --rename /usr/lib/xorg/modules/extensions/libglx.so
+		rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
     ;;
 esac
 

Added: fglrx-driver/trunk/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.install	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.install	2011-06-22 18:54:34 UTC (rev 604)
@@ -0,0 +1,4 @@
+arch/x86/usr/X11R6/lib/libGL* usr/lib32/
+arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri/
+arch/x86/usr/lib/libatiuki* usr/lib32/
+debian/reportbug/script usr/share/bug/fglrx-glx-ia32/

Added: fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides	2011-06-22 18:54:34 UTC (rev 604)
@@ -0,0 +1,7 @@
+fglrx-glx-ia32: shlib-with-non-pic-code usr/lib32/libGL.so.1.2
+fglrx-glx-ia32: no-symbols-control-file usr/lib32/libGL.so.1.2
+fglrx-glx-ia32: shlib-calls-exit usr/lib32/libGL.so.1.2
+fglrx-glx-ia32: no-upstream-changelog
+fglrx-glx-ia32: spelling-error-in-binary
+fglrx-glx-ia32: no-symbols-control-file usr/lib32/libatiuki.so.1.0
+fglrx-glx-ia32: shlib-missing-in-control-file libGL 1 for usr/lib32/libGL.so.1.2

Added: fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst	2011-06-22 18:54:34 UTC (rev 604)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+          ldconfig
+    ;;
+esac
+
+#DEBHELPER#

Added: fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm	2011-06-22 18:54:34 UTC (rev 604)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove|purge|disappear)
+		dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1.2
+		dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1
+        ldconfig
+		rmdir /usr/lib32/fglrx/diversions /usr/lib32/fglrx 2>/dev/null || true
+    ;;
+    *)
+        exit 0
+    ;;
+esac
+
+#DEBHELPER#

Added: fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst	2011-06-22 18:54:34 UTC (rev 604)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    install)
+	mkdir -p /usr/lib32/fglrx/diversions
+	dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1.2 --rename /usr/lib32/libGL.so.1.2
+	dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1 --rename /usr/lib32/libGL.so.1
+    ;;
+esac
+
+#DEBHELPER#

Deleted: fglrx-driver/trunk/debian/fglrx-glx.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.postrm	2011-06-18 14:08:48 UTC (rev 603)
+++ fglrx-driver/trunk/debian/fglrx-glx.postrm	2011-06-22 18:54:34 UTC (rev 604)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-case "$1" in
-    remove|purge|disappear)
-		dpkg-divert --package fglrx-glx --rename --remove /usr/lib/$DESTINATION/libGL.so.1.2
-		dpkg-divert --package fglrx-glx --rename --remove /usr/lib/$DESTINATION/libGL.so.1
-		ldconfig
-    ;;
-    *)
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#

Deleted: fglrx-driver/trunk/debian/fglrx-glx.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.preinst	2011-06-18 14:08:48 UTC (rev 603)
+++ fglrx-driver/trunk/debian/fglrx-glx.preinst	2011-06-22 18:54:34 UTC (rev 604)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-case "$1" in
-    install)
-		mkdir -p /usr/lib/fglrx/diversions-$DESTINATION
-		if dpkg --compare-versions "$2" lt "1:11-6"; then
-			dpkg-divert --package fglrx-glx --rename --remove /usr/lib/libGL.so.1.2
-			dpkg-divert --package fglrx-glx --rename --remove /usr/lib/libGL.so.1
-		fi
-		if [ -d /usr/lib/fglrx/diversions ]; then
-			rm -rf /usr/lib/fglrx/diversions
-		fi
-		dpkg-divert --package fglrx-glx --divert /usr/lib/fglrx/diversions-$DESTINATION/libGL.so.1.2 --rename /usr/lib/$DESTINATION/libGL.so.1.2
-		dpkg-divert --package fglrx-glx --divert /usr/lib/fglrx/diversions-$DESTINATION/libGL.so.1 --rename /usr/lib/$DESTINATION/libGL.so.1
-    ;;
-esac
-
-#DEBHELPER#

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-06-18 14:08:48 UTC (rev 603)
+++ fglrx-driver/trunk/debian/rules	2011-06-22 18:54:34 UTC (rev 604)
@@ -20,12 +20,10 @@
 
 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)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 KSRCDIR  := usr/src/modules/fglrx
 DKMSBASE	:= usr/src/fglrx-VERSION
 DKMSSRCDIR := usr/src/fglrx-$(UPSTREAM_VERSION)
-DST := usr/lib/$(DEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_BUILD_ARCH),amd64)
 ARCH := arch/x86_64
@@ -40,6 +38,7 @@
 # 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
@@ -53,12 +52,9 @@
 
 build: debian/man/Makefile
 	dh_testdir
+	# Build man pages.
 	$(MAKE) -C debian/man
 
-build-arch: build
-
-build-indep: build
-
 debian/man/Makefile: debian/man/configure
 	(cd debian/man && \
 	chmod +x configure install-sh missing && \
@@ -74,6 +70,7 @@
 	dh_testdir
 	dh_clean
 	rm -rf extra_src
+	# Clean manpages.
 	[ ! -f debian/man/Makefile ] || $(MAKE) -C debian/man maintainer-clean
 
 distclean: clean
@@ -86,21 +83,27 @@
 	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*" "$(DST)"
-	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/$(LIB)/*" "$(DST)"
-	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*" "$(DST)"
-	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*" "$(DST)"
-	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_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"
+	mv debian/$(PKG_glx)/usr/lib/fglrx/fglrx-libGL.so.1.2 debian/$(PKG_glx)/usr/lib/fglrx/libGL.so.1.2
+ifeq ($(DEB_BUILD_ARCH),amd64)
+	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/lib64/*" "usr/lib"
+else
+	dh_install --ignore=debian/$(PKG_driver).install -p$(PKG_driver)  "$(ARCH)/usr/lib/*" "usr/lib"
+endif
+	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"
+	mkdir -p debian/$(PKG_driver)/usr/lib/fglrx
+	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-libglx.so debian/$(PKG_driver)/usr/lib/fglrx/libglx.so
+	rm -rf debian/$(PKG_driver)/usr/lib/xorg/modules/extensions/fglrx*
+	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"
-	mv "debian/$(PKG_glx)/$(DST)/fglrx-libGL.so.1.2" "debian/$(PKG_glx)/$(DST)/libGL.so.1.2"
-	dh_link "/usr/lib/${DEB_HOST_MULTIARCH}/libAMDXvBA.so.1.0" "/usr/lib/${DEB_HOST_MULTIARCH}/libAMDXvBA.so.1"
-	dh_link "/usr/lib/${DEB_HOST_MULTIARCH}/libXvBAW.so.1.0" "/usr/lib/${DEB_HOST_MULTIARCH}/libXvBAW.so.1"
 	# Generate dkms.conf.
 	cat debian/dkms/dkms.conf.template|sed "s/_VERSION_/$(UPSTREAM_VERSION)/g" \
 		> debian/$(PKG_dkms)/$(DKMSBASE)/dkms.conf
@@ -109,8 +112,9 @@
 	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)/$(DST)
-	/sbin/ldconfig -n debian/$(PKG_driver)/$(DST)
+	/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
@@ -121,12 +125,18 @@
 	dh_installchangelogs
 	dh_installdocs
 	dh_installman
+	dh_installmenu
+	dh_installdebconf
 	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
 	dh_installdeb
 	dh_shlibdeps
 	dh_md5sums
@@ -135,6 +145,10 @@
 	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)




More information about the Pkg-fglrx-devel mailing list