[Pkg-fglrx-devel] r1575 - fglrx-driver/branches/15.12/debian

[Andreas Beckmann]

Author: anbe
Date: 2016-01-17 23:16:24 +0000 (Sun, 17 Jan 2016)
New Revision: 1575

Modified:
   fglrx-driver/branches/15.12/debian/changelog
   fglrx-driver/branches/15.12/debian/rules
Log:
drop support for squeeze-backports

Modified: fglrx-driver/branches/15.12/debian/changelog
===================================================================
--- fglrx-driver/branches/15.12/debian/changelog	2016-01-17 22:19:24 UTC (rev 1574)
+++ fglrx-driver/branches/15.12/debian/changelog	2016-01-17 23:16:24 UTC (rev 1575)
@@ -9,6 +9,7 @@
     upstream.
   * Disable patch 10-4.2.0-build.copy_xregs_to_kernel: seems to be no longer
     neccessary.
+  * Drop support for squeeze-backports.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Jan 2016 02:04:51 +0100
 

Modified: fglrx-driver/branches/15.12/debian/rules
===================================================================
--- fglrx-driver/branches/15.12/debian/rules	2016-01-17 22:19:24 UTC (rev 1574)
+++ fglrx-driver/branches/15.12/debian/rules	2016-01-17 23:16:24 UTC (rev 1575)
@@ -10,7 +10,6 @@
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 include debian/rules.defs
-MULTIARCH		?=
 SIGNATURE_VERSION	?=
 variant			?=
 variant_desc_suffix	?=
@@ -30,7 +29,7 @@
 cap=AMDXvBAx86.cap
 endif
 
-libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
+libdir		 = usr/lib/$(DEB_HOST_MULTIARCH)
 sigdir		 = $(if $(filter $(upstream_version),$(SIGNATURE_VERSION)),debian/import,common/etc/ati)
 xorg_depends	 = $(foreach abi, $(XORG_ABI_LIST), xorg-video-abi-$(abi) |)
 
@@ -188,17 +187,6 @@
 
 ############################################################################
 
-prepare-squeeze-backport:
-	echo 8 > debian/compat
-	sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules.defs
-	sed -i -e 's/debhelper (>= 9.*)/debhelper (>= 8.1.0~)/' \
-	       -e '/^Multi-Arch:/ d' debian/control
-	sed -i -e '/fglrx_dri.so/ s/^/#/' debian/fglrx-driver.links.in
-	debchange --bpo "Disable multiarch build."
-	debchange "Reduce Build-Depends: debhelper and compat level to 8."
-
-############################################################################
-
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
 WGET			?= wget --referer www.amd.com
 INSTALLER_PREFIX	?= amd-catalyst