[Pkg-fglrx-devel] r598 - fglrx-driver/trunk/debian
Patrick Matthäi
pmatthaei at alioth.debian.org
Fri Jun 17 21:01:31 UTC 2011
Author: pmatthaei
Date: 2011-06-17 21:01:31 +0000 (Fri, 17 Jun 2011)
New Revision: 598
Removed:
fglrx-driver/trunk/debian/NEWS
fglrx-driver/trunk/debian/amdcccle.xpm
fglrx-driver/trunk/debian/fglrx-atieventsd.preinst
fglrx-driver/trunk/debian/fglrx-control.menu
fglrx-driver/trunk/debian/fglrx-driver.config
fglrx-driver/trunk/debian/fglrx-driver.templates
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
fglrx-driver/trunk/debian/po/
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/fglrx-control.install
fglrx-driver/trunk/debian/fglrx-driver.links
fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides
fglrx-driver/trunk/debian/fglrx-driver.postinst
fglrx-driver/trunk/debian/fglrx-driver.postrm
fglrx-driver/trunk/debian/fglrx-driver.preinst
fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides
fglrx-driver/trunk/debian/fglrx-glx.postinst
fglrx-driver/trunk/debian/fglrx-glx.postrm
fglrx-driver/trunk/debian/fglrx-glx.preinst
fglrx-driver/trunk/debian/rules
Log:
* Remove odd 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:
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 rpl from build depends and from debian/rules, no longer needed.
* Remove all odd upgrade paths.
* Adjust lintian overrides.
Deleted: fglrx-driver/trunk/debian/NEWS
===================================================================
--- fglrx-driver/trunk/debian/NEWS 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/NEWS 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,45 +0,0 @@
-fglrx-driver (1:9-4-1) unstable; urgency=low
-
- New upstream release.
- - Warning: This release does not support anymore any chips below the
- r600 series. If you have a r1xx-r5xx chip, please use the radeon or
- radeonhd driver instead.
-
- -- Patrick Matthäi <patrick.matthaei at web.de> Sat, 18 Apr 2009 09:33:54 +0200
-
-fglrx-driver (8.34.8-1) experimental; urgency=low
-
- This version of the driver doesn't list the supported chipsets in the X
- server log file any more, so I removed the "fglrx-supported.txt" file.
-
- Please refer to the official documentation for an up-to-date list of
- supported products.
-
- -- Flavio Stanchina <flavio at stanchina.net> Sat, 24 Feb 2007 01:17:39 +0100
-
-fglrx-driver (8.30.3-1) experimental; urgency=low
-
- As of driver version 8.29.6 support for the following products is no
- longer included:
- - Radeon 8500/9000/9100/9200/9250
- - Mobility Radeon 9000/9100/9200
- - Radeon IGP 9000/9100/9200
-
- Users of those cards are advised not to upgrade; your lovely maintainer is
- working on a long-term solution, perhaps separate packages for the
- previous version.
-
- -- Flavio Stanchina <flavio at stanchina.net> Wed, 1 Nov 2006 20:40:10 +0100
-
-fglrx-driver (8.24.8-1) unstable; urgency=low
-
- Upgrading from previous versions is quite tricky because libGL is moving
- from /usr/X11R6/lib to /usr/lib and I couldn't figure out a completely
- safe way to upgrade the libGL diversion. Upgrading should in fact work
- just fine, but downgrading to previous versions and recovery from errors
- during upgrades are broken.
-
- Therefore, I recommend to completely remove previous versions of this
- package before installing. Sorry for any inconvenience this may cause.
-
- -- Flavio Stanchina <flavio at stanchina.net> Sat, 15 Apr 2006 13:05:31 +0200
Deleted: fglrx-driver/trunk/debian/amdcccle.xpm
===================================================================
--- fglrx-driver/trunk/debian/amdcccle.xpm 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/amdcccle.xpm 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,300 +0,0 @@
-/* XPM */
-static char * ccc_small_xpm[] = {
-"32 32 265 2",
-" c None",
-". c #C2C2C2",
-"+ c #C5C5C5",
-"@ c #C4C4C4",
-"# c #C3C3C3",
-"$ c #C7C7C7",
-"% c #C9C9C9",
-"& c #C8C8C8",
-"* c #C6C6C6",
-"= c #CDCDCD",
-"- c #CFCFCF",
-"; c #CECECE",
-"> c #CBCBCB",
-", c #BCBCBC",
-"' c #8A8A8A",
-") c #B0B0B0",
-"! c #D3D3D3",
-"~ c #D9D9D9",
-"{ c #D7D7D7",
-"] c #D0D0D0",
-"^ c #6D6D6D",
-"/ c #A2A2A2",
-"( c #D8D8D8",
-"_ c #DBDBDB",
-": c #B9B9B9",
-"< c #DEDEDE",
-"[ c #DDDDDD",
-"} c #D3D5D5",
-"| c #858585",
-"1 c #ECECEC",
-"2 c #F1F1F1",
-"3 c #B8BABA",
-"4 c #DAE1E1",
-"5 c #E2E2E2",
-"6 c #E0E0E0",
-"7 c #DFDFDF",
-"8 c #D8E0E0",
-"9 c #CED3D3",
-"0 c #919191",
-"a c #EEEEEE",
-"b c #E4E3E3",
-"c c #D2D4D4",
-"d c #B3C1C1",
-"e c #B56C6C",
-"f c #DA3D3D",
-"g c #DED2D2",
-"h c #E9ECEC",
-"i c #E9E9E9",
-"j c #E9EAEA",
-"k c #E0E3E3",
-"l c #CC8888",
-"m c #D6D6D6",
-"n c #BBC5C5",
-"o c #C26262",
-"p c #DB3131",
-"q c #E2CECE",
-"r c #F1F8F8",
-"s c #EAEFEF",
-"t c #DDCCCC",
-"u c #D43A3A",
-"v c #BE0000",
-"w c #BFBFBF",
-"x c #B2BFBF",
-"y c #BD7272",
-"z c #DE2424",
-"A c #E2C9C9",
-"B c #F3FCFC",
-"C c #F4F4F4",
-"D c #F3F3F3",
-"E c #EFF1F1",
-"F c #DFD6D6",
-"G c #EFBBBB",
-"H c #ECA4A4",
-"I c #CD3C3C",
-"J c #B40000",
-"K c #D4D4D4",
-"L c #CACACA",
-"M c #AAB2B2",
-"N c #AB9999",
-"O c #D53F3F",
-"P c #E4BEBE",
-"Q c #F4FFFF",
-"R c #F6F6F6",
-"S c #F5F5F5",
-"T c #F2F5F5",
-"U c #E0DFDF",
-"V c #EBB5B5",
-"W c #EE9999",
-"X c #E07171",
-"Y c #D76969",
-"Z c #BC2222",
-"` c #A90202",
-" . c #E7E7E7",
-".. c #E4E4E4",
-"+. c #BDBDBD",
-"@. c #DF6666",
-"#. c #E4F1F1",
-"$. c #F4F8F8",
-"%. c #F7F8F8",
-"&. c #F6F8F8",
-"*. c #E5E9E9",
-"=. c #E7AFAF",
-"-. c #EE8282",
-";. c #E26161",
-">. c #DA5959",
-",. c #D35C5C",
-"'. c #C44545",
-"). c #A80000",
-"!. c #D9DCDC",
-"~. c #F2F2F2",
-"{. c #B4B4B4",
-"]. c #DB0F0F",
-"^. c #E93939",
-"/. c #EDB2B2",
-"(. c #EAF1F1",
-"_. c #E9F2F2",
-":. c #E3A0A0",
-"<. c #EB6060",
-"[. c #E45151",
-"}. c #DC4F4F",
-"|. c #D44E4E",
-"1. c #CC4D4D",
-"2. c #C44747",
-"3. c #A90808",
-"4. c #D4D0D0",
-"5. c #E1E3E3",
-"6. c #EFEFEF",
-"7. c #E6E6E6",
-"8. c #DADADA",
-"9. c #CFD6D6",
-"0. c #C4A7A7",
-"a. c #D58383",
-"b. c #F28989",
-"c. c #EE7878",
-"d. c #E38B8B",
-"e. c #E09494",
-"f. c #E84A4A",
-"g. c #E34545",
-"h. c #DF4646",
-"i. c #D74444",
-"j. c #CE4141",
-"k. c #C33535",
-"l. c #B21919",
-"m. c #A40000",
-"n. c #AD3434",
-"o. c #D2D1D1",
-"p. c #E7E9E9",
-"q. c #F0F0F0",
-"r. c #EAEAEA",
-"s. c #E3E3E3",
-"t. c #DCDCDC",
-"u. c #BABABA",
-"v. c #EFEEEE",
-"w. c #DCE2E2",
-"x. c #B9C4C4",
-"y. c #C67E7E",
-"z. c #E64242",
-"A. c #E63E3E",
-"B. c #E53E3E",
-"C. c #E23E3E",
-"D. c #DD3B3B",
-"E. c #D83535",
-"F. c #CD2929",
-"G. c #BE1717",
-"H. c #AF0606",
-"I. c #A60000",
-"J. c #A10000",
-"K. c #DEDFDF",
-"L. c #E1E1E1",
-"M. c #D5D5D5",
-"N. c #B1B1B1",
-"O. c #EDECEC",
-"P. c #D1D3D3",
-"Q. c #A8ABAB",
-"R. c #CB4F4F",
-"S. c #D92424",
-"T. c #D51D1D",
-"U. c #D01515",
-"V. c #C70A0A",
-"W. c #B90202",
-"X. c #AF0000",
-"Y. c #A80202",
-"Z. c #A30303",
-"`. c #9D0000",
-" + c #C2C1C1",
-".+ c #CBCDCD",
-"++ c #D2D2D2",
-"@+ c #B5B5B5",
-"#+ c #AFAFAF",
-"$+ c #E5E5E5",
-"%+ c #CCCCCC",
-"&+ c #ADB9B9",
-"*+ c #A86B6B",
-"=+ c #CB0000",
-"-+ c #CA0101",
-";+ c #C60000",
-">+ c #C10000",
-",+ c #B00303",
-"'+ c #AA0303",
-")+ c #A50303",
-"!+ c #A00303",
-"~+ c #9B0000",
-"{+ c #BBBDBD",
-"]+ c #BEBEBE",
-"^+ c #AAAAAA",
-"/+ c #ACB1B1",
-"(+ c #988787",
-"_+ c #BD0909",
-":+ c #BE0101",
-"<+ c #B90303",
-"[+ c #B40303",
-"}+ c #AF0303",
-"|+ c #A00101",
-"1+ c #ACACAC",
-"2+ c #A7A7A7",
-"3+ c #A4A4A4",
-"4+ c #C0C0C0",
-"5+ c #AEAEAE",
-"6+ c #9A9E9E",
-"7+ c #938383",
-"8+ c #B20A0A",
-"9+ c #B10101",
-"0+ c #AE0303",
-"a+ c #A60303",
-"b+ c #A30101",
-"c+ c #9B0404",
-"d+ c #B25F5F",
-"e+ c #ADADAD",
-"f+ c #A8A8A8",
-"g+ c #A5A5A5",
-"h+ c #C1C1C1",
-"i+ c #9C9C9C",
-"j+ c #919797",
-"k+ c #926F6F",
-"l+ c #AB0404",
-"m+ c #A70303",
-"n+ c #9E0000",
-"o+ c #AC2E2E",
-"p+ c #D2A3A3",
-"q+ c #DFE7E7",
-"r+ c #C5CBCB",
-"s+ c #B8B8B8",
-"t+ c #B3B3B3",
-"u+ c #949494",
-"v+ c #8B8D8D",
-"w+ c #A41111",
-"x+ c #B96767",
-"y+ c #D0A7A7",
-"z+ c #F3EFEF",
-"A+ c #F8FEFE",
-"B+ c #9E9E9E",
-"C+ c #989898",
-"D+ c #858686",
-"E+ c #DBE7E7",
-"F+ c #EFF6F6",
-"G+ c #F1F3F3",
-"H+ c #E8E7E7",
-"I+ c #B6B6B6",
-"J+ c #A0A0A0",
-"K+ c #9A9A9A",
-"L+ c #969696",
-"M+ c #8C8C8C",
-"N+ c #878787",
-"O+ c #B2B2B2",
-"P+ c #B7B7B7",
-" ",
-" ",
-" . . . ",
-" + @ # . . ",
-" $ + + + @ . ",
-" % % & * $ $ + ",
-" = - ; = > , ' ) ",
-" ! ~ ~ { ] - ^ / ",
-" ( _ = : { < [ _ } | ",
-" ~ 1 2 < 3 4 5 6 7 8 9 0 ",
-" 7 a b c d e f g h i j k l ",
-" ! m = n o p q r 2 2 s t u v ",
-" w , x y z A B C D E F G H I J K ] L . ",
-" M N O P Q R S T U V W X Y Z ` { < ...K +. ",
-" @.#.$.%.&.*.=.-.;.>.,.'.). !.i S S ~.i ; {.",
-" ].^./.q (._.:.<.[.}.|.1.2.3. 4.5.S D 6.7.8.] +.",
-" m ( 8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.K L u.",
-" { _ r.~.D v.w.x.y.z.A.B.C.D.E.F.G.H.I.J. = K.L.[ _ M.L , N.",
-" ~ 6.R C ~.q.O.P.Q.R.z S.T.U.V.W.X.Y.Z.`. +.+K ++; * +. at +#+",
-" M.s.S ~.2 a $+( %+&+*+=+-+;+>+W.,+'+)+!+~+ {+w w ]+u. at +#+^+",
-" K i q.1 .7 M.= # /+(+_+:+<+[+}+'+)+|+~+ {. at +{.) 1+2+3+",
-" ] 6 s.[ ( ! > 4+5+6+7+8+9+0+'+a+b+`.c+d+ e+^+f+g+ ",
-" % - ! - L h+ at +f+i+j+k+l+` m+b+n+`.o+p+q+r+ ",
-" +., s+t+1+3+i+u+v+ J.w+x+y+z+A+1 ] {. ",
-" #+1+f+3+B+C+0 ' D+ E+F+G+H+[ ; I+5+ ",
-" J+K+L+0 M+N+| ++5 6 8.; +.O+5+ ",
-" @ > > + +. at +N. ",
-" s+s+P+{.) #+ ",
-" ) ) #+5+ ",
-" ",
-" ",
-" "};
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/changelog 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,10 +1,25 @@
-fglrx-driver (1:11-6-1) UNRELEASED; urgency=low
+fglrx-driver (1:11-6-1) UNRELEASED; urgency=high
* New upstream release.
Closes: #627100
- Refresh patch 02-dkms-arch_compat.diff.
+ * Remove odd 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:
+ 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 rpl from build depends and from debian/rules, no longer needed.
+ * Remove all odd upgrade paths.
+ * Adjust lintian overrides.
- -- Patrick Matthäi <me at gnu.ameusgmbh.intern> Fri, 17 Jun 2011 19:51:24 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 17 Jun 2011 22:21:58 +0200
fglrx-driver (1:11-4-2) unstable; urgency=low
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/control 2011-06-17 21:01:31 UTC (rev 598)
@@ -2,10 +2,10 @@
Section: non-free/x11
Priority: extra
Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
-Uploaders: Patrick Matthäi <pmatthaei at debian.org>, Michael Gilbert <michael.s.gilbert at gmail.com>
+Uploaders: Patrick Matthäi <pmatthaei at debian.org>,
+ Michael Gilbert <michael.s.gilbert at gmail.com>
Build-Depends: debhelper (>= 7),
bzip2,
- ia32-libs [amd64],
libx11-6,
libxext6,
libgl1-mesa-glx,
@@ -16,7 +16,6 @@
libxi6,
libxcursor1,
xsltproc,
- rpl,
docbook-xml (>= 4.4),
docbook-xsl (>= 1.70.1),
libxinerama-dev,
@@ -33,13 +32,21 @@
Package: fglrx-driver
Architecture: i386 amd64
-Depends: ${misc:Depends}, ${shlibs:Depends}, xserver-xorg (>= 1:7.6+1),
- laptop-detect, xorg-video-abi-10
+Multi-Arch: same
+Pre-Depends: multiarch-support
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ xserver-xorg (>= 1:7.6+7),
+ xorg-video-abi-10
Recommends: fglrx-modules-dkms (= ${binary:Version}),
- fglrx-glx, fglrx-glx-ia32 [amd64], fglrx-atieventsd
+ fglrx-glx,
+ fglrx-atieventsd
Provides: xorg-driver-video
-Conflicts: ia32-fglrx-driver, nvidia-glx
-Suggests: fglrx-control, xvba-va-driver
+Conflicts: ia32-fglrx-driver,
+ nvidia-glx,
+ fglrx-glx-ia32
+Suggests: fglrx-control,
+ xvba-va-driver
Description: non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
.
@@ -59,7 +66,11 @@
Package: fglrx-glx
Architecture: i386 amd64
-Depends: ${misc:Depends}, ${shlibs:Depends}, fglrx-driver (= ${binary:Version})
+Multi-Arch: same
+Pre-Depends: multiarch-support
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ fglrx-driver (= ${binary:Version})
Conflicts: nvidia-glx
Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
@@ -69,24 +80,11 @@
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
-Depends: ${misc:Depends}, dkms
+Depends: ${misc:Depends},
+ dkms
Suggests: fglrx-driver
Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
This package provides the kernel build environment and the fglrx modules,
@@ -98,10 +96,14 @@
Package: fglrx-control
Architecture: i386 amd64
-Depends: ${misc:Depends}, ${shlibs:Depends}, fglrx-driver
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ fglrx-driver
Provides: fglrx-control-qt3
-Replaces: fglrx-control-qt3, fglrx-amdcccle
-Conflicts: fglrx-control-qt3, fglrx-control-qt2
+Replaces: fglrx-control-qt3,
+ fglrx-amdcccle
+Conflicts: fglrx-control-qt3,
+ fglrx-control-qt2
Description: control panel for the non-free ATI/AMD RadeonHD display driver
Control panel for the ATI/AMD RadeonHD and FireGL graphics cards.
.
@@ -111,8 +113,12 @@
Package: fglrx-atieventsd
Architecture: i386 amd64
-Depends: ${misc:Depends}, ${shlibs:Depends}, xserver-xorg (>= 1:7.6+1), lsb-base
-Recommends: fglrx-driver (= ${binary:Version}), acpid
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ xserver-xorg (>= 1:7.6+1),
+ lsb-base
+Recommends: fglrx-driver (= ${binary:Version}),
+ acpid
Replaces: fglrx-driver (<< 1:8-4-2)
Breaks: fglrx-driver (<< 1:8-4-2)
Description: external events daemon for the non-free ATI/AMD RadeonHD display driver
Deleted: fglrx-driver/trunk/debian/fglrx-atieventsd.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-atieventsd.preinst 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-atieventsd.preinst 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Remove a no-longer used conffile
-rm_conffile() {
- local PKGNAME="$1"
- local CONFFILE="$2"
-
- [ -e "$CONFFILE" ] || return 0
-
- local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
- local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
- sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
-}
-
-case "$1" in
- install|upgrade)
- if dpkg --compare-versions "$2" le "1:9-8-2"; then
- rm_conffile fglrx-atieventsd "/etc/init.d/fglrx-driver"
- fi
-esac
-
-#DEBHELPER#
Modified: fglrx-driver/trunk/debian/fglrx-control.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.install 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-control.install 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,4 +1,3 @@
debian/amdcccle.desktop usr/share/applications/
common/usr/share/icons/* usr/share/icons/
-debian/amdcccle.xpm usr/share/pixmaps/
debian/reportbug/script usr/share/bug/fglrx-control/
Deleted: fglrx-driver/trunk/debian/fglrx-control.menu
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.menu 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-control.menu 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,4 +0,0 @@
-?package(fglrx-control):needs="X11" section="Applications/System/Hardware"\
- title="amdcccle"\
- description="Control panel for the ATI recent Radeon and FireGL graphics cards."\
- command="/usr/bin/amdcccle" icon="/usr/share/pixmaps/amdcccle.xpm"
Deleted: fglrx-driver/trunk/debian/fglrx-driver.config
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.config 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-driver.config 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_get fglrx-driver/acpi_switch || true
-
-if [ "$RET" != "true" ] && [ "$RET" != "false" ] && [ -x `which laptop-detect` ] ; then
- if `laptop-detect > /dev/null`; then
- db_set fglrx-driver/acpi_switch false
- else
- db_set fglrx-driver/acpi_switch true
- fi
-else
- if [ -f /etc/default/fglrx-driver ] ; then
- FGLRX_ACPI_SWITCH_POWERSTATES=false
- . /etc/default/fglrx-driver
- if [ "$FGLRX_ACPI_SWITCH_POWERSTATES" = "true" ] ; then
- db_set fglrx-driver/acpi_switch true
- else
- db_set fglrx-driver/acpi_switch false
- fi
- fi
-fi
-
-db_input medium fglrx-driver/acpi_switch || true
-
-db_go
-
-#DEBHELPER#
-
-exit 0
Modified: fglrx-driver/trunk/debian/fglrx-driver.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.links 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-driver.links 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,2 +1,2 @@
-/usr/lib/libAMDXvBA.so.1.0 /usr/lib/libAMDXvBA.so.1
-/usr/lib/libXvBAW.so.1.0 /usr/lib/libXvBAW.so.1
+/usr/lib/$(DEB_HOST_MULTIARCH)/libAMDXvBA.so.1.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libAMDXvBA.so.1
+/usr/lib/$(DEB_HOST_MULTIARCH)/libXvBAW.so.1.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libXvBAW.so.1
Modified: fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,13 +1,34 @@
fglrx-driver: package-name-doesnt-match-sonames libAMDXvBA1 libXvBAW1 libatiuki1 libfglrx-dm1.0
-fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/libatiadlxx.so
-fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/libaticaldd.so
-fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/libaticalrt.so
-fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/libaticalcl.so
-fglrx-driver: no-symbols-control-file usr/lib/libfglrx_dm.so.1.0
-fglrx-driver: spelling-error-in-binary
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig dependant dependent
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig informations information
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig commited committed
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig overriden overridden
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig fuctions functions
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig Sucessfully Successfully
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig Sucessfully Successfully
+fglrx-driver: spelling-error-in-binary usr/bin/aticonfig Sucessfully Successfully
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so ouput output
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so UNKOWN UNKNOWN
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so avaiable available
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so paramter parameter
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so childs children
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so childs children
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so Recieved Received
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so recieved received
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so recieved received
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so Recieved Received
+fglrx-driver: spelling-error-in-binary usr/lib/x86_64-linux-gnu/xorg/modules/drivers/fglrx_drv.so seperate separate
fglrx-driver: no-upstream-changelog
-fglrx-driver: no-symbols-control-file usr/lib/libXvBAW.so.1.0
-fglrx-driver: no-symbols-control-file usr/lib/libAMDXvBA.so.1.0
-fglrx-driver: no-symbols-control-file usr/lib/libatiuki.so.1.0
-fglrx-driver: executable-not-elf-or-script usr/lib/libAMDXvBA.cap
-fglrx-driver: remove-of-unknown-diversion usr/lib/xorg/modules/extensions/libdri.so postrm:29
+fglrx-driver: executable-not-elf-or-script usr/lib/x86_64-linux-gnu/libAMDXvBA.cap
+fglrx-driver: remove-of-unknown-diversion usr/lib/xorg/modules/extensions/libdri.so postrm:10
+fglrx-driver: diversion-for-unknown-file usr/lib/*/xorg/modules/extensions/libglx.so preinst:19
+fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/x86_64-linux-gnu/libatiadlxx.so
+fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/x86_64-linux-gnu/libaticalcl.so
+fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/x86_64-linux-gnu/libaticaldd.so
+fglrx-driver: sharedobject-in-library-directory-missing-soname usr/lib/x86_64-linux-gnu/libaticalrt.so
+fglrx-driver: no-symbols-control-file usr/lib/x86_64-linux-gnu/libatiuki.so.1.0
+fglrx-driver: no-symbols-control-file usr/lib/x86_64-linux-gnu/libXvBAW.so.1.0
+fglrx-driver: no-symbols-control-file usr/lib/x86_64-linux-gnu/libAMDXvBA.so.1.0
+fglrx-driver: no-symbols-control-file usr/lib/x86_64-linux-gnu/libfglrx_dm.so.1.0
+fglrx-glx: no-shlibs-control-file usr/lib/x86_64-linux-gnu/libGL.so.1.2
+fglrx-glx: no-symbols-control-file usr/lib/x86_64-linux-gnu/libGL.so.1.2
Modified: fglrx-driver/trunk/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postinst 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-driver.postinst 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,48 +1,9 @@
#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
set -e
-. /usr/share/debconf/confmodule
-
-# summary of how this script can be called:
-# * <postinst> 'configure' <most-recently-configured-version>
-# * <old-postinst> 'abort-upgrade' <new-version>
-# * <conflictor's-postinst> 'abort-remove' 'in-favour' <package> <new-version>
-# * <postinst> 'abort-remove'
-# * <deconfigured's-postinst> 'abort-deconfigure' 'in-favour' <failed-install-package> <version> 'removing' <conflicting-package> <version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
-# Move a conffile without triggering a dpkg question
-# from http://wiki.debian.org/DpkgConffileHandling
-mv_conffile() {
- if [ -e $1 -a -e $2 ]; then
- echo "Preserving user changes to $2 ..."
- mv -f $2 $2.dpkg-new
- mv -f $1 $2
- fi
-}
-
case "$1" in
configure)
- if dpkg --compare-versions "$2" lt "8.30.3"; then
- mv_conffile /etc/fglrxrc /etc/ati/fglrxrc
- mv_conffile /etc/fglrxprofiles.csv /etc/ati/fglrxprofiles.csv
- fi
- # Update /etc/default/fglrx-driver based on debconf.
- if [ -f /etc/default/fglrx-driver ] ; then
- db_get fglrx-driver/acpi_switch
- ACPI_SWITCH=$RET
- if grep -E ^FGLRX_ACPI_SWITCH_POWERSTATES= /etc/default/fglrx-driver > /dev/null; then
- perl -pi -w -e "s/^FGLRX_ACPI_SWITCH_POWERSTATES=.*$/FGLRX_ACPI_SWITCH_POWERSTATES=$ACPI_SWITCH/g" /etc/default/fglrx-driver
- else
- echo "FGLRX_ACPI_SWITCH_POWERSTATES=$ACPI_SWITCH" >> /etc/default/fglrx-driver
- fi
- else
- echo "/etc/default/fglrx-driver not found, configuration failed." >&2
- fi
if ! grep -q fglrx /etc/X11/xorg.conf; then
echo "**********************************************"
echo "NOTE: the fglrx driver is not yet configued."
Modified: fglrx-driver/trunk/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postrm 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-driver.postrm 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,49 +1,26 @@
#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
set -e
-# summary of how this script can be called:
-# * <postrm> 'remove'
-# * <postrm> 'purge'
-# * <old-postrm> 'upgrade' <new-version>
-# * <new-postrm> 'failed-upgrade' <old-version>
-# * <new-postrm> 'abort-install'
-# * <new-postrm> 'abort-install' <old-version>
-# * <new-postrm> 'abort-upgrade' <old-version>
-# * <disappearer's-postrm> 'disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
+DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
case "$1" in
-
- upgrade|abort-upgrade)
- if dpkg --compare-versions "$2" lt "8.24.8"; then
- echo "*** fglrx-driver: Downgrading and aborted upgrades don't work!" >&2
- echo "*** fglrx-driver: Please uninstall any remains of this package." >&2
- fi
- ;;
-
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
+ dpkg-divert --package fglrx-driver --rename --remove /usr/lib/$DESTINATION/xorg/modules/extensions/libglx.so
;;
-
purge)
if [ -f /etc/ati/amdpcsdb ]; then
- rm /etc/ati/amdpcsdb
+ rm -f /etc/ati/amdpcsdb
fi
;;
-
failed-upgrade|disappear)
;;
-
*)
exit 0
;;
esac
#DEBHELPER#
-
Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,43 +1,22 @@
#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
set -e
-# summary of how this script can be called:
-# * <new-preinst> 'install'
-# * <new-preinst> 'install' <old-version>
-# * <new-preinst> 'upgrade' <old-version>
-# * <old-preinst> 'abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
+DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-# Prepare to move a conffile without triggering a dpkg question
-# from http://wiki.debian.org/DpkgConffileHandling
-prep_mv_conffile()
-{
- if [ -e $1 ]; then
- md5sum="$(md5sum $1 | sed -e 's/ .*//')"
- old_md5sum="$(dpkg-query -W -f='${Conffiles}' fglrx-driver | grep $1 | cut -d' ' -f3)"
- if [ "$md5sum" = "$old_md5sum" ]; then
- rm -f $1
- fi
- fi
-}
-
case "$1" in
install|upgrade)
- if dpkg --compare-versions "$2" lt "8.30.3"; then
- prep_mv_conffile /etc/fglrxrc
- prep_mv_conffile /etc/fglrxprofiles.csv
- fi
- # Add new diversions.
- mkdir -p /usr/lib/fglrx/diversions
- dpkg-divert --package fglrx-driver --divert /usr/lib/fglrx/diversions/libglx.so --rename /usr/lib/xorg/modules/extensions/libglx.so
- # Delete old diversion.
+ 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 dpkg --compare-versions "$2" lt "1:11-6"; then
+ dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libglx.so
+ 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/$DESTINATION/xorg/modules/extensions/libglx.so
;;
esac
Deleted: fglrx-driver/trunk/debian/fglrx-driver.templates
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.templates 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-driver.templates 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,9 +0,0 @@
-Template: fglrx-driver/acpi_switch
-Type: boolean
-Default: false
-_Description: Enable powersave switching on ACPI events?
- If the graphic card supports POWERplay, fglrx is able to
- clock the GPU down and up on ACPI events like opening or
- closing the lid and turning the AC adapter on or off.
- .
- This saves much battery power on notebooks.
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,4 +0,0 @@
-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/
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,7 +0,0 @@
-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
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> 'configure' <most-recently-configured-version>
-# * <old-postinst> 'abort-upgrade' <new-version>
-# * <conflictor's-postinst> 'abort-remove' 'in-favour' <package> <new-version>
-# * <postinst> 'abort-remove'
-# * <deconfigured's-postinst> 'abort-deconfigure' 'in-favour' <failed-install-package> <version> 'removing' <conflicting-package> <version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
-case "$1" in
- configure)
- ldconfig
- ;;
-esac
-
-#DEBHELPER#
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> 'remove'
-# * <postrm> 'purge'
-# * <old-postrm> 'upgrade' <new-version>
-# * <new-postrm> 'failed-upgrade' <old-version>
-# * <new-postrm> 'abort-install'
-# * <new-postrm> 'abort-install' <old-version>
-# * <new-postrm> 'abort-upgrade' <old-version>
-# * <disappearer's-postrm> 'disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
-
-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
- ;;
-
- *)
- exit 0
- ;;
-esac
-
-#DEBHELPER#
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> 'install'
-# * <new-preinst> 'install' <old-version>
-# * <new-preinst> 'upgrade' <old-version>
-# * <old-preinst> 'abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
-case "$1" in
- install)
- # Add new diversions.
- 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#
Modified: fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,5 +1,2 @@
-fglrx-glx: no-shlibs-control-file usr/lib/libGL.so.1.2
fglrx-glx: package-name-doesnt-match-sonames libGL1
-fglrx-glx: no-symbols-control-file usr/lib/libGL.so.1.2
-fglrx-glx: shlib-calls-exit usr/lib/libGL.so.1.2
fglrx-glx: no-upstream-changelog
Modified: fglrx-driver/trunk/debian/fglrx-glx.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.postinst 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx.postinst 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,18 +1,7 @@
#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
set -e
-# summary of how this script can be called:
-# * <postinst> 'configure' <most-recently-configured-version>
-# * <old-postinst> 'abort-upgrade' <new-version>
-# * <conflictor's-postinst> 'abort-remove' 'in-favour' <package> <new-version>
-# * <postinst> 'abort-remove'
-# * <deconfigured's-postinst> 'abort-deconfigure' 'in-favour' <failed-install-package> <version> 'removing' <conflicting-package> <version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
case "$1" in
configure)
ldconfig
Modified: fglrx-driver/trunk/debian/fglrx-glx.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.postrm 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx.postrm 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,33 +1,18 @@
#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
set -e
-# summary of how this script can be called:
-# * <postrm> 'remove'
-# * <postrm> 'purge'
-# * <old-postrm> 'upgrade' <new-version>
-# * <new-postrm> 'failed-upgrade' <old-version>
-# * <new-postrm> 'abort-install'
-# * <new-postrm> 'abort-install' <old-version>
-# * <new-postrm> 'abort-upgrade' <old-version>
-# * <disappearer's-postrm> 'disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
+DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-
case "$1" in
remove|purge|disappear)
- 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
+ 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#
-
Modified: fglrx-driver/trunk/debian/fglrx-glx.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.preinst 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/fglrx-glx.preinst 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,23 +1,21 @@
#!/bin/sh
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
set -e
-# summary of how this script can be called:
-# * <new-preinst> 'install'
-# * <new-preinst> 'install' <old-version>
-# * <new-preinst> 'upgrade' <old-version>
-# * <old-preinst> 'abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
+DESTINATION=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
case "$1" in
install)
- # Add new diversion.
- mkdir -p /usr/lib/fglrx/diversions
- dpkg-divert --package fglrx-glx --divert /usr/lib/fglrx/diversions/libGL.so.1.2 --rename /usr/lib/libGL.so.1.2
- dpkg-divert --package fglrx-glx --divert /usr/lib/fglrx/diversions/libGL.so.1 --rename /usr/lib/libGL.so.1
+ 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
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2011-06-17 18:09:20 UTC (rev 597)
+++ fglrx-driver/trunk/debian/rules 2011-06-17 21:01:31 UTC (rev 598)
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -22,10 +20,12 @@
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,7 +40,6 @@
# 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
@@ -54,9 +53,12 @@
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 && \
@@ -72,7 +74,6 @@
dh_testdir
dh_clean
rm -rf extra_src
- # Clean manpages.
[ ! -f debian/man/Makefile ] || $(MAKE) -C debian/man maintainer-clean
distclean: clean
@@ -85,36 +86,19 @@
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)/libGL*" "usr/lib"
-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"
- 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*" "$(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*" "$(DST)"
+ 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/*" "$(DST)/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/*" "$(DST)/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_control).install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin"
-ifeq ($(DEB_BUILD_ARCH),amd64)
- # Replace library paths -- careful, these are binary files!
- # The new string must have same length as the old one..
- rpl -v -e '/usr/X11R6/lib64/modules/dri\0' \
- '/usr/lib/dri\0!!!!!!!!!!!!!!!!' \
- debian/$(PKG_glx)/usr/lib/libGL.so.1.2
- rpl -v -e '/usr/X11R6/lib/modules/dri\0' \
- '/usr/lib32/dri\0!!!!!!!!!!!!' \
- debian/$(PKG_glx_ia32)/usr/lib32/libGL.so.1.2
-else
- rpl -v -e '/usr/X11R6/lib/modules/dri\0' \
- '/usr/lib/dri\0!!!!!!!!!!!!!!' \
- debian/$(PKG_glx)/usr/lib/libGL.so.1.2
-endif
+ mv "debian/$(PKG_glx)/$(DST)/fglrx-libGL.so.1.2" "debian/$(PKG_glx)/$(DST)/libGL.so.1.2"
# Generate dkms.conf.
cat debian/dkms/dkms.conf.template|sed "s/_VERSION_/$(UPSTREAM_VERSION)/g" \
> debian/$(PKG_dkms)/$(DKMSBASE)/dkms.conf
@@ -123,9 +107,8 @@
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)/usr/lib
- /sbin/ldconfig -n debian/$(PKG_glx_ia32)/usr/lib32
- /sbin/ldconfig -n debian/$(PKG_driver)/usr/lib
+ /sbin/ldconfig -n debian/$(PKG_glx)/$(DST)
+ /sbin/ldconfig -n debian/$(PKG_driver)/$(DST)
chmod -x debian/$(PKG_driver)/etc/ati/*
chmod +x debian/$(PKG_daemon)/etc/ati/authatieventsd.sh
chmod +x debian/$(PKG_driver)/etc/acpi/*.sh
@@ -136,18 +119,12 @@
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
@@ -156,10 +133,6 @@
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