Source: fglrx-driver
Version: 1:11-7-2
Severity: important
Tags: patch
Hi,
after the recent packaging simplifications some files ended up at the
wrong location. Debdiff output if further below.
I'm adding a patch series that fixes most of these issues.
Unfortunately the current version is not in SVN and releases 1:11-6-3 up
to 1:11-7-2 have not been tagged in SVN.
01-fix-ftbfs.diff
- package does not build in a clean pbuilder environment without Xorg
installed
- just configure the manual pages with --with-xserver=Xorg to skip
autodetection
02-minimize-build-depends.diff
- a lot of B-Ds are not needed or are already dependencies of other libs
- versioned B-Ds were already satisfied in oldstable (lenny)
03-generic-handling-of-templates.diff
don't list all the templates in debian/rules - it's easy to forget some
just use $(wildcard debian/*.in) ...
04-use-dh_bugfiles.diff
- more simplification of the installation process, requires
svn mv debian/reportbug/script debian/bug-script
svn rm debian/reportbug
- don't worry if this changes /usr/share/bug/fglrx-foo/script into
/usr/share/bug/fglrx-foo - no longer a directory, but a file
05-rename-before-install-and-drop-duplicate-files.diff
- renaming/copying the files is better done before the installation,
doing it right before dh_installdeb is much too late
- now debian/rules needs to know what to rename in the source, but no
longer has to care about which package got the files installed
- also do it unconditionally for both arches
- avoid duplicate installations
* instead of renaming flgrx-libglx.so to libglx.so I could also change
glx-alternative-fglrx to use fglrx-libglx.so as a source for the
alternative
06-simplify-rules.diff
- double-colon rules:: are not needed; empty "do nothing" commands
(or "whitespace" only commands, just to stop make from trying further
implicit or default rules) can be achived with
target: deps ;
07-fix-shlibs.diff
- thanks to debhelper 8 we got shlibs files covering libGL 1
- use the same strategy as I did for nvidia-glx to remap them to the
packages with the mesa libs
08-allow-multiple-xorg-video-abis.diff
- it's no use to add a dependency on current xserver-xorg-core, the
driver is supposed to work with multiple ABIs. Therefore just depend
on xserver-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0
simplifying backports even more (and allowing non-backported
installation in squeeze - I'll test this tomorrow)
- the /usr/share/xserver-xorg/videodrvdep way would have needed a
B-D: xserver-xorg-dev anyway
09-636225.diff
- Closes: #636225 by adding another library to the -ia32 package.
The package with these patches applied builds successfully in sid,
squeeze and lenny pbuilder chroots for both amd64 and i386.
Additional fixes are needed for
* debian/copyright needs to be updated, LICENSE has changed
(mainly s/ATI/AMD/)
* should dh_strip be skipped? is stripping a "modification of the
binaries" that is not allowed by the license?
('override_dh_strip:' with no commands should be sufficient)
Once the above patches have been integrated into SVN, I'll work on
multiarch patches.
Here is what debdiff reports:
$ debdiff --show-moved --move /usr/src/fglrx-11-6 /usr/src/fglrx-11-7
--controlfiles ALL fglrx-driver_11-6-3_amd64.changes
fglrx-driver_11-7-2.1_amd64.changes
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files only in first set of .debs, found in package fglrx-atieventsd
-------------------------------------------------------------------
-rwxr-xr-x root/root /etc/ati/authatieventsd.sh
-rwxr-xr-x root/root /usr/sbin/atieventsd
-rwxr-xr-x root/root /usr/share/bug/fglrx-atieventsd/script
Files only in first set of .debs, found in package fglrx-driver
---------------------------------------------------------------
-rwxr-xr-x root/root /usr/lib/libAMDXvBA.cap
Files moved from package fglrx-driver to package fglrx-glx
----------------------------------------------------------
-rw-r--r-- root/root /usr/lib/fglrx/libglx.so
Files only in first set of .debs, found in package fglrx-modules-dkms
---------------------------------------------------------------------
-rwxr-xr-x root/root /usr/src/fglrx-11-7/make.sh
New files in second set of .debs, found in package fglrx-driver
---------------------------------------------------------------
-rw-r--r-- root/root /usr/lib/xorg/modules/drivers/fglrx_drv.so
-rw-r--r-- root/root /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so
-rw-r--r-- root/root /usr/share/doc/fglrx-driver/index.html
-rw-r--r-- root/root /usr/share/doc/fglrx-driver/installer.html
-rw-r--r-- root/root /usr/share/doc/fglrx-driver/tips-linux.html
Files moved or copied from at least TWO packages or to at least TWO packages
----------------------------------------------------------------------------
-rw-r--r-- root/root DEBIAN/control
>From packages: fglrx-driver, fglrx-control, fglrx-glx, fglrx-atieventsd,
>fglrx-modules-dkms, fglrx-glx-ia32
To packages: fglrx-driver, fglrx-glx, fglrx-glx-ia32, fglrx-modules-dkms,
fglrx-control, fglrx-atieventsd
-rw-r--r-- root/root DEBIAN/md5sums
>From packages: fglrx-driver, fglrx-control, fglrx-glx, fglrx-atieventsd,
>fglrx-modules-dkms, fglrx-glx-ia32
To packages: fglrx-driver, fglrx-glx, fglrx-glx-ia32, fglrx-modules-dkms,
fglrx-control, fglrx-atieventsd
-rw-r--r-- root/root DEBIAN/shlibs
>From packages: fglrx-driver, fglrx-glx-ia32
To packages: fglrx-driver, fglrx-glx, fglrx-glx-ia32
-rwxr-xr-x root/root DEBIAN/postinst
>From packages: fglrx-driver, fglrx-atieventsd, fglrx-modules-dkms,
>fglrx-glx-ia32
To packages: fglrx-driver, fglrx-glx, fglrx-glx-ia32, fglrx-modules-dkms,
fglrx-control, fglrx-atieventsd
-rwxr-xr-x root/root DEBIAN/postrm
>From packages: fglrx-driver, fglrx-atieventsd, fglrx-glx-ia32
To packages: fglrx-driver, fglrx-glx, fglrx-glx-ia32, fglrx-control,
fglrx-atieventsd
-rwxr-xr-x root/root DEBIAN/prerm
>From packages: fglrx-atieventsd, fglrx-modules-dkms
To packages: fglrx-modules-dkms, fglrx-atieventsd
Conffiles files of package fglrx-atieventsd: lines which differ (wdiff format)
------------------------------------------------------------------------------
[-/etc/ati/authatieventsd.sh-]/etc/default/fglrx-atieventsd
Control files of package fglrx-atieventsd: lines which differ (wdiff format)
----------------------------------------------------------------------------
Depends: [-libc6 (>= 2.3), libgl1-mesa-glx | libgl1, libx11-6, libxext6,
libxrandr2, libxrender1, xserver-xorg (>= 1:7.6+1),-] lsb-base
Installed-Size: [-364-] {+72+}
Recommends: fglrx-driver (= [-1:11-6-3),-] {+1:11-7-2.1),+} acpid
Version: [-1:11-6-3-] {+1:11-7-2.1+}
No differences were encountered between the postinst files of package
fglrx-atieventsd
No differences were encountered between the postrm files of package
fglrx-atieventsd
No differences were encountered between the prerm files of package
fglrx-atieventsd
Control files of package fglrx-control: lines which differ (wdiff format)
-------------------------------------------------------------------------
Installed-Size: [-6164-] {+6172+}
Version: [-1:11-6-3-] {+1:11-7-2.1+}
No differences were encountered between the conffiles files of package
fglrx-driver
Control files of package fglrx-driver: lines which differ (wdiff format)
------------------------------------------------------------------------
Depends: libc6 (>= 2.3.2), libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1,
libstdc++6 (>= 4.1.1), libx11-6, libxext6, libxinerama1, libxrandr2,
libxrender1, [-xserver-xorg (>= 1:7.6+7), xorg-video-abi-10,-]
glx-alternative-fglrx (>= 0.1.2)
Installed-Size: [-66344-] {+79468+}
Recommends: fglrx-modules-dkms (= [-1:11-6-3),-] {+1:11-7-2.1),+} fglrx-glx,
fglrx-glx-ia32, fglrx-atieventsd
Version: [-1:11-6-3-] {+1:11-7-2.1+}
No differences were encountered between the postinst files of package
fglrx-driver
No differences were encountered between the postrm files of package fglrx-driver
No differences were encountered between the preinst files of package
fglrx-driver
Shlibs files of package fglrx-driver: lines which differ (wdiff format)
-----------------------------------------------------------------------
[-libfglrx_dm 1.0-]
{+libXvBAW 1+} fglrx-driver
[-libXvBAW 1-]
{+libfglrx_dm 1.0+} fglrx-driver
Control files of package fglrx-glx: lines which differ (wdiff format)
---------------------------------------------------------------------
Depends: libc6 (>= 2.2.5), libxext6, [-fglrx-driver (= 1:11-6-3),-]
glx-alternative-fglrx (>= 0.1.2)
Installed-Size: [-980-] {+1684+}
Version: [-1:11-6-3-] {+1:11-7-2.1+}
Control files of package fglrx-glx-ia32: lines which differ (wdiff format)
--------------------------------------------------------------------------
Depends: ia32-libs (>= 20110609), lib32gcc1 (>= 1:4.1.1), fglrx-driver (=
[-1:11-6-3)-] {+1:11-7-2.1)+}
Installed-Size: [-31648-] {+31724+}
Version: [-1:11-6-3-] {+1:11-7-2.1+}
No differences were encountered between the postinst files of package
fglrx-glx-ia32
No differences were encountered between the postrm files of package
fglrx-glx-ia32
No differences were encountered between the preinst files of package
fglrx-glx-ia32
Shlibs files of package fglrx-glx-ia32: lines which differ (wdiff format)
-------------------------------------------------------------------------
{+libGL 1 fglrx-glx-ia32+}
Control files of package fglrx-modules-dkms: lines which differ (wdiff format)
------------------------------------------------------------------------------
Installed-Size: [-4300-] {+4384+}
Version: [-1:11-6-3-] {+1:11-7-2.1+}
No differences were encountered between the postinst files of package
fglrx-modules-dkms
No differences were encountered between the prerm files of package
fglrx-modules-dkms
Andreas
(nvidia-glx and glx-alternatives maintainer)
-- System Information:
Debian Release: 6.0.2
APT prefers stable
APT policy: (800, 'stable'), (700, 'testing'), (600, 'unstable'), (500,
'stable-updates'), (130, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -ur fglrx-driver-11-7-2.export/debian/changelog fglrx-driver-11-7-2a.export/debian/changelog
--- fglrx-driver-11-7-2.export/debian/changelog 2011-08-02 14:36:39.631416000 +0200
+++ fglrx-driver-11-7-2a.export/debian/changelog 2011-08-02 17:00:30.163916000 +0200
@@ -1,3 +1,10 @@
+fglrx-driver (1:11-7-2.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Configure the manpages with --with-xserver=Xorg to skip autodetection.
+
+ -- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
+
fglrx-driver (1:11-7-2) unstable; urgency=low
* Further simplify build process.
diff -ur fglrx-driver-11-7-2.export/debian/rules fglrx-driver-11-7-2a.export/debian/rules
--- fglrx-driver-11-7-2.export/debian/rules 2011-08-02 14:36:39.635922000 +0200
+++ fglrx-driver-11-7-2a.export/debian/rules 2011-08-02 16:29:00.591417000 +0200
@@ -38,7 +38,7 @@
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
+ cd debian/man && ./configure --prefix=/usr --mandir=/usr/share/man --with-xserver=Xorg
$(MAKE) -C debian/man
override_dh_installdeb:
diff -ur fglrx-driver-11-7-2a.export/debian/changelog fglrx-driver-11-7-2b.export/debian/changelog
--- fglrx-driver-11-7-2a.export/debian/changelog 2011-08-02 17:00:30.163916000 +0200
+++ fglrx-driver-11-7-2b.export/debian/changelog 2011-08-02 17:13:44.775416000 +0200
@@ -2,6 +2,7 @@
* Non-maintainer upload.
* Configure the manpages with --with-xserver=Xorg to skip autodetection.
+ * Minimize B-D, drop B-D versioning if satisfied in oldstable (lenny).
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2a.export/debian/control fglrx-driver-11-7-2b.export/debian/control
--- fglrx-driver-11-7-2a.export/debian/control 2011-08-02 14:36:39.631416000 +0200
+++ fglrx-driver-11-7-2b.export/debian/control 2011-08-02 17:06:08.779916000 +0200
@@ -6,24 +6,17 @@
Michael Gilbert <[email protected]>
Build-Depends:
debhelper (>= 8),
- bzip2,
ia32-libs [amd64],
- libx11-6,
libxext6,
libgl1-mesa-glx,
- libxrandr2,
- libice6,
- libsm6,
- libfontconfig1,
- libxi6,
+ libqtgui4,
libxcursor1,
+ libxinerama1,
+ libxrandr2,
xsltproc,
- docbook-xml (>= 4.4),
- docbook-xsl (>= 1.70.1),
- libxinerama-dev,
- libqt4-dev,
+ docbook-xml,
+ docbook-xsl,
chrpath,
- autogen,
automake
Standards-Version: 3.9.2
DM-Upload-Allowed: yes
diff -ur fglrx-driver-11-7-2b.export/debian/changelog fglrx-driver-11-7-2c.export/debian/changelog
--- fglrx-driver-11-7-2b.export/debian/changelog 2011-08-02 17:13:44.775416000 +0200
+++ fglrx-driver-11-7-2c.export/debian/changelog 2011-08-02 18:31:41.951418000 +0200
@@ -3,6 +3,7 @@
* Non-maintainer upload.
* Configure the manpages with --with-xserver=Xorg to skip autodetection.
* Minimize B-D, drop B-D versioning if satisfied in oldstable (lenny).
+ * Make handling of generated control files more generic.
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2b.export/debian/rules fglrx-driver-11-7-2c.export/debian/rules
--- fglrx-driver-11-7-2b.export/debian/rules 2011-08-02 16:29:00.591417000 +0200
+++ fglrx-driver-11-7-2c.export/debian/rules 2011-08-02 18:26:43.583916000 +0200
@@ -20,22 +20,19 @@
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
xviddriver=$(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+TEMPLATES := $(wildcard debian/*.in)
+GENERATED = $(TEMPLATES:.in=)
+
%: %.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 $(files)
+ rm -f $(GENERATED)
-override_dh_auto_configure: $(files)
+override_dh_auto_configure: $(GENERATED)
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 --with-xserver=Xorg
This patch requires the following rename in svn:
svn mv debian/reportbug/script debian/bug-script
svn rm debian/reportbug
Only in fglrx-driver-11-7-2d.export/debian: bug-script
diff -ur fglrx-driver-11-7-2c.export/debian/changelog
fglrx-driver-11-7-2d.export/debian/changelog
--- fglrx-driver-11-7-2c.export/debian/changelog 2011-08-02
18:31:41.951418000 +0200
+++ fglrx-driver-11-7-2d.export/debian/changelog 2011-08-02
20:44:36.871416000 +0200
@@ -4,6 +4,8 @@
* Configure the manpages with --with-xserver=Xorg to skip autodetection.
* Minimize B-D, drop B-D versioning if satisfied in oldstable (lenny).
* Make handling of generated control files more generic.
+ * Rename debian/reportbug/script to debian/bug-script and use dh_bugfiles -A
+ to install it in all packages.
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2c.export/debian/fglrx-atieventsd.install.in
fglrx-driver-11-7-2d.export/debian/fglrx-atieventsd.install.in
--- fglrx-driver-11-7-2c.export/debian/fglrx-atieventsd.install.in
2011-08-02 14:36:39.631416000 +0200
+++ fglrx-driver-11-7-2d.export/debian/fglrx-atieventsd.install.in
2011-08-02 18:35:41.935916000 +0200
@@ -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
diff -ur fglrx-driver-11-7-2c.export/debian/fglrx-control.install.in
fglrx-driver-11-7-2d.export/debian/fglrx-control.install.in
--- fglrx-driver-11-7-2c.export/debian/fglrx-control.install.in 2011-08-02
14:36:39.631416000 +0200
+++ fglrx-driver-11-7-2d.export/debian/fglrx-control.install.in 2011-08-02
18:35:53.135417000 +0200
@@ -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
diff -ur fglrx-driver-11-7-2c.export/debian/fglrx-driver.install.in
fglrx-driver-11-7-2d.export/debian/fglrx-driver.install.in
--- fglrx-driver-11-7-2c.export/debian/fglrx-driver.install.in 2011-08-02
14:36:39.635922000 +0200
+++ fglrx-driver-11-7-2d.export/debian/fglrx-driver.install.in 2011-08-02
18:36:04.147416000 +0200
@@ -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
diff -ur fglrx-driver-11-7-2c.export/debian/fglrx-glx-ia32.install
fglrx-driver-11-7-2d.export/debian/fglrx-glx-ia32.install
--- fglrx-driver-11-7-2c.export/debian/fglrx-glx-ia32.install 2011-08-02
14:36:39.635922000 +0200
+++ fglrx-driver-11-7-2d.export/debian/fglrx-glx-ia32.install 2011-08-02
18:45:52.351417000 +0200
@@ -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/
diff -ur fglrx-driver-11-7-2c.export/debian/fglrx-glx.install.in
fglrx-driver-11-7-2d.export/debian/fglrx-glx.install.in
--- fglrx-driver-11-7-2c.export/debian/fglrx-glx.install.in 2011-08-02
14:36:39.635922000 +0200
+++ fglrx-driver-11-7-2d.export/debian/fglrx-glx.install.in 2011-08-02
18:36:51.687917000 +0200
@@ -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
diff -ur fglrx-driver-11-7-2c.export/debian/fglrx-modules-dkms.install.in
fglrx-driver-11-7-2d.export/debian/fglrx-modules-dkms.install.in
--- fglrx-driver-11-7-2c.export/debian/fglrx-modules-dkms.install.in
2011-08-02 14:36:39.635922000 +0200
+++ fglrx-driver-11-7-2d.export/debian/fglrx-modules-dkms.install.in
2011-08-02 18:37:00.683417000 +0200
@@ -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_/
Only in fglrx-driver-11-7-2c.export/debian: reportbug
diff -ur fglrx-driver-11-7-2c.export/debian/rules
fglrx-driver-11-7-2d.export/debian/rules
--- fglrx-driver-11-7-2c.export/debian/rules 2011-08-02 18:26:43.583916000
+0200
+++ fglrx-driver-11-7-2d.export/debian/rules 2011-08-02 20:47:00.675417000
+0200
@@ -52,6 +52,9 @@
echo "xviddriver:Depends=$(xviddriver)" >> debian/fglrx-driver.substvars
dh_installdeb
+override_dh_bugfiles:
+ dh_bugfiles -A
+
get-orig-source-checks::
# This target needs DEB_BUILD_OPTIONS to contain the version
specification
# in the following form: VER=some.version.number
diff -ur fglrx-driver-11-7-2d.export/debian/changelog fglrx-driver-11-7-2e.export/debian/changelog
--- fglrx-driver-11-7-2d.export/debian/changelog 2011-08-02 20:44:36.871416000 +0200
+++ fglrx-driver-11-7-2e.export/debian/changelog 2011-08-02 20:59:02.103917000 +0200
@@ -6,6 +6,8 @@
* Make handling of generated control files more generic.
* Rename debian/reportbug/script to debian/bug-script and use dh_bugfiles -A
to install it in all packages.
+ * Rename files in the source tree, not after installation.
+ * Do not install duplicate copies of the Xorg modules.
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2d.export/debian/fglrx-driver.install.in fglrx-driver-11-7-2e.export/debian/fglrx-driver.install.in
--- fglrx-driver-11-7-2d.export/debian/fglrx-driver.install.in 2011-08-02 18:36:04.147416000 +0200
+++ fglrx-driver-11-7-2e.export/debian/fglrx-driver.install.in 2011-08-02 20:21:07.648416000 +0200
@@ -21,5 +21,7 @@
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/*.so usr/lib/xorg/modules
+_XPIC_/usr/X11R6/_LIB_/modules/linux/*.so usr/lib/xorg/modules/linux
_XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so usr/lib/fglrx
+_XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/libglx.so usr/lib/fglrx
diff -ur fglrx-driver-11-7-2d.export/debian/fglrx-glx-ia32.install fglrx-driver-11-7-2e.export/debian/fglrx-glx-ia32.install
--- fglrx-driver-11-7-2d.export/debian/fglrx-glx-ia32.install 2011-08-02 18:45:52.351417000 +0200
+++ fglrx-driver-11-7-2e.export/debian/fglrx-glx-ia32.install 2011-08-02 19:31:12.503416000 +0200
@@ -1,3 +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
+arch/x86/usr/X11R6/lib/fglrx/libGL.so.1.2 usr/lib32
diff -ur fglrx-driver-11-7-2d.export/debian/fglrx-glx.install.in fglrx-driver-11-7-2e.export/debian/fglrx-glx.install.in
--- fglrx-driver-11-7-2d.export/debian/fglrx-glx.install.in 2011-08-02 18:36:51.687917000 +0200
+++ fglrx-driver-11-7-2e.export/debian/fglrx-glx.install.in 2011-08-02 19:31:40.419928000 +0200
@@ -1,2 +1 @@
-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
+arch/_ARCH_/usr/X11R6/_LIB_/fglrx/libGL.so.1.2 usr/lib/fglrx
diff -ur fglrx-driver-11-7-2d.export/debian/rules fglrx-driver-11-7-2e.export/debian/rules
--- fglrx-driver-11-7-2d.export/debian/rules 2011-08-02 20:47:00.675417000 +0200
+++ fglrx-driver-11-7-2e.export/debian/rules 2011-08-02 19:58:57.567416000 +0200
@@ -30,27 +30,27 @@
override_dh_auto_clean:
test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
+ rm -f xpic/usr/X11R6/lib/modules/extensions/fglrx/libglx.so xpic_64a/usr/X11R6/lib64/modules/extensions/fglrx/libglx.so
+ rm -f arch/x86/usr/X11R6/lib/fglrx/libGL.so.1.2 arch/x86_64/usr/X11R6/lib64/fglrx/libGL.so.1.2
rm -f $(GENERATED)
override_dh_auto_configure: $(GENERATED)
+ ln arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 arch/x86/usr/X11R6/lib/fglrx/libGL.so.1.2
+ ln arch/x86_64/usr/X11R6/lib64/fglrx/fglrx-libGL.so.1.2 arch/x86_64/usr/X11R6/lib64/fglrx/libGL.so.1.2
+ ln xpic/usr/X11R6/lib/modules/extensions/fglrx/fglrx-libglx.so xpic/usr/X11R6/lib/modules/extensions/fglrx/libglx.so
+ ln xpic_64a/usr/X11R6/lib64/modules/extensions/fglrx/fglrx-libglx.so xpic_64a/usr/X11R6/lib64/modules/extensions/fglrx/libglx.so
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 --with-xserver=Xorg
$(MAKE) -C debian/man
-override_dh_installdeb:
+override_dh_install:
+ dh_install
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-$(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
echo "xviddriver:Depends=$(xviddriver)" >> debian/fglrx-driver.substvars
- dh_installdeb
override_dh_bugfiles:
dh_bugfiles -A
diff -ur fglrx-driver-11-7-2e.export/debian/changelog fglrx-driver-11-7-2f.export/debian/changelog
--- fglrx-driver-11-7-2e.export/debian/changelog 2011-08-02 20:59:02.103917000 +0200
+++ fglrx-driver-11-7-2f.export/debian/changelog 2011-08-02 21:39:10.643416000 +0200
@@ -8,6 +8,7 @@
to install it in all packages.
* Rename files in the source tree, not after installation.
* Do not install duplicate copies of the Xorg modules.
+ * Simplify debian/rules.
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2e.export/debian/rules fglrx-driver-11-7-2f.export/debian/rules
--- fglrx-driver-11-7-2e.export/debian/rules 2011-08-02 19:58:57.567416000 +0200
+++ fglrx-driver-11-7-2f.export/debian/rules 2011-08-02 21:30:22.715417000 +0200
@@ -1,7 +1,10 @@
#!/usr/bin/make -f
-packagename=fglrx-driver
-upstream_version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+packagename := $(shell dpkg-parsechangelog | sed -nr '/^Source:/s/Source: (.*)/\1/p')
+upstream_version := $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
NEW_UPSTREAM_VERSION=$(subst VER=,,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
@@ -28,6 +31,9 @@
%: %.in
sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
+%:
+ dh $@
+
override_dh_auto_clean:
test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
rm -f xpic/usr/X11R6/lib/modules/extensions/fglrx/libglx.so xpic_64a/usr/X11R6/lib64/modules/extensions/fglrx/libglx.so
@@ -55,13 +61,13 @@
override_dh_bugfiles:
dh_bugfiles -A
-get-orig-source-checks::
+get-orig-source-checks:
# This target needs DEB_BUILD_OPTIONS to contain the version specification
# in the following form: VER=some.version.number
test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true
test ! -e debian/rules && echo "Run this command from the root of the package" && exit 1 || true
-$(INSTALLER)::
+$(INSTALLER):
# Make sure the .run package is in the proper place,
# but first try to look in the "cache".
# For some reason wget refuses to clobber and restarts everytime.
@@ -69,7 +75,7 @@
[ -f $(CACHEDIR)/$(INSTALLER) ] || wget $(URL_PATH)/$(INSTALLER) -c -O $(CACHEDIR)/$(INSTALLER)
cp $(CACHEDIR)/$(INSTALLER) .
-../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2:: get-orig-source-checks $(INSTALLER)
+../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2: get-orig-source-checks $(INSTALLER)
mkdir $(packagename)-$(NEW_UPSTREAM_VERSION) \
&& cd $(packagename)-$(NEW_UPSTREAM_VERSION) \
&& /bin/sh ../$(INSTALLER) --extract . \
@@ -84,7 +90,4 @@
# Cleanup.
rm -fr $(packagename)-$(NEW_UPSTREAM_VERSION) && rm $(INSTALLER)
-get-orig-source:: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2
-
-%:
- test "${@}" = "get-orig-source" || dh ${@}
+get-orig-source: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ;
diff -ur fglrx-driver-11-7-2f.export/debian/changelog fglrx-driver-11-7-2g.export/debian/changelog
--- fglrx-driver-11-7-2f.export/debian/changelog 2011-08-02 21:39:10.643416000 +0200
+++ fglrx-driver-11-7-2g.export/debian/changelog 2011-08-02 22:27:56.535417000 +0200
@@ -9,6 +9,8 @@
* Rename files in the source tree, not after installation.
* Do not install duplicate copies of the Xorg modules.
* Simplify debian/rules.
+ * Redirect shlibs dependency of libGL.so.1 from fglrx-glx and fglrx-glx-ia32
+ to libgl1-mesa-glx | libgl1 and ia32-libs.
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2f.export/debian/control fglrx-driver-11-7-2g.export/debian/control
--- fglrx-driver-11-7-2f.export/debian/control 2011-08-02 21:34:47.979916000 +0200
+++ fglrx-driver-11-7-2g.export/debian/control 2011-08-02 21:40:48.931916000 +0200
@@ -135,6 +135,7 @@
Architecture: i386 amd64
Depends:
${misc:Depends},
+ ${shlibs:Depends},
lsb-base
Recommends:
fglrx-driver (= ${binary:Version}),
diff -ur fglrx-driver-11-7-2f.export/debian/fglrx-glx-ia32.lintian-overrides fglrx-driver-11-7-2g.export/debian/fglrx-glx-ia32.lintian-overrides
--- fglrx-driver-11-7-2f.export/debian/fglrx-glx-ia32.lintian-overrides 2011-06-22 22:17:11.878098000 +0200
+++ fglrx-driver-11-7-2g.export/debian/fglrx-glx-ia32.lintian-overrides 2011-08-02 22:07:46.136917000 +0200
@@ -3,6 +3,9 @@
fglrx-glx-ia32: spelling-error-in-binary usr/lib32/dri/fglrx_dri.so UNKOWN UNKNOWN
fglrx-glx-ia32: no-upstream-changelog
fglrx-glx-ia32: shlib-with-non-pic-code usr/lib32/libGL.so.1.2
-fglrx-glx-ia32: shlib-missing-in-control-file libGL 1 for usr/lib32/libGL.so.1.2
fglrx-glx-ia32: no-symbols-control-file usr/lib32/libatiuki.so.1.0
fglrx-glx-ia32: no-symbols-control-file usr/lib32/libGL.so.1.2
+
+# Packages built against the FGLRX libGL should declare dependencies on
+# the free version for Debian's purposes.
+shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
diff -ur fglrx-driver-11-7-2f.export/debian/fglrx-glx.lintian-overrides fglrx-driver-11-7-2g.export/debian/fglrx-glx.lintian-overrides
--- fglrx-driver-11-7-2f.export/debian/fglrx-glx.lintian-overrides 2011-06-22 22:17:11.878098000 +0200
+++ fglrx-driver-11-7-2g.export/debian/fglrx-glx.lintian-overrides 2011-08-02 22:12:39.168416000 +0200
@@ -1 +1,7 @@
fglrx-glx: no-upstream-changelog
+
+[i386]: shlib-with-non-pic-code usr/lib/fglrx/libGL.so.1.2
+
+# Packages built against the FGLRX libGL should declare dependencies on
+# the free version for Debian's purposes.
+shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
diff -ur fglrx-driver-11-7-2f.export/debian/rules fglrx-driver-11-7-2g.export/debian/rules
--- fglrx-driver-11-7-2f.export/debian/rules 2011-08-02 21:30:22.715417000 +0200
+++ fglrx-driver-11-7-2g.export/debian/rules 2011-08-02 21:48:46.175417000 +0200
@@ -61,6 +61,14 @@
override_dh_bugfiles:
dh_bugfiles -A
+override_dh_makeshlibs:
+ dh_makeshlibs
+ # Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
+ test ! -d debian/fglrx-glx || \
+ sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/fglrx-glx/DEBIAN/shlibs
+ test ! -d debian/fglrx-glx-ia32 || \
+ sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/fglrx-glx-ia32/DEBIAN/shlibs
+
get-orig-source-checks:
# This target needs DEB_BUILD_OPTIONS to contain the version specification
# in the following form: VER=some.version.number
diff -ur fglrx-driver-11-7-2g.export/debian/changelog fglrx-driver-11-7-2h.export/debian/changelog
--- fglrx-driver-11-7-2g.export/debian/changelog 2011-08-02 22:27:56.535417000 +0200
+++ fglrx-driver-11-7-2h.export/debian/changelog 2011-08-02 22:44:50.655917000 +0200
@@ -11,6 +11,8 @@
* Simplify debian/rules.
* Redirect shlibs dependency of libGL.so.1 from fglrx-glx and fglrx-glx-ia32
to libgl1-mesa-glx | libgl1 and ia32-libs.
+ * This driver works with multiple Xorg versions, therefore depend on
+ xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0.
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2g.export/debian/control fglrx-driver-11-7-2h.export/debian/control
--- fglrx-driver-11-7-2g.export/debian/control 2011-08-02 21:40:48.931916000 +0200
+++ fglrx-driver-11-7-2h.export/debian/control 2011-08-02 22:40:17.179416000 +0200
@@ -30,7 +30,7 @@
Depends:
${misc:Depends},
${shlibs:Depends},
- ${xviddriver:Depends},
+ xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
glx-alternative-fglrx (>= 0.1.2)
Recommends:
fglrx-modules-dkms (= ${binary:Version}),
diff -ur fglrx-driver-11-7-2g.export/debian/rules fglrx-driver-11-7-2h.export/debian/rules
--- fglrx-driver-11-7-2g.export/debian/rules 2011-08-02 21:48:46.175417000 +0200
+++ fglrx-driver-11-7-2h.export/debian/rules 2011-08-02 22:35:17.327916000 +0200
@@ -23,8 +23,6 @@
lib=lib
endif
-xviddriver=$(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
-
TEMPLATES := $(wildcard debian/*.in)
GENERATED = $(TEMPLATES:.in=)
@@ -56,7 +54,6 @@
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-$(upstream_version)/*
- echo "xviddriver:Depends=$(xviddriver)" >> debian/fglrx-driver.substvars
override_dh_bugfiles:
dh_bugfiles -A
diff -ur fglrx-driver-11-7-2h.export/debian/changelog fglrx-driver-11-7-2i.export/debian/changelog
--- fglrx-driver-11-7-2h.export/debian/changelog 2011-08-02 22:44:50.655917000 +0200
+++ fglrx-driver-11-7-2i.export/debian/changelog 2011-08-02 23:52:10.727416000 +0200
@@ -13,6 +13,7 @@
to libgl1-mesa-glx | libgl1 and ia32-libs.
* This driver works with multiple Xorg versions, therefore depend on
xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0.
+ * Add libatiadlxx.so to fglrx-glx-ia32. (Closes: #636225)
-- Andreas Beckmann <[email protected]> Tue, 02 Aug 2011 17:00:26 +0200
diff -ur fglrx-driver-11-7-2h.export/debian/fglrx-glx-ia32.install fglrx-driver-11-7-2i.export/debian/fglrx-glx-ia32.install
--- fglrx-driver-11-7-2h.export/debian/fglrx-glx-ia32.install 2011-08-02 19:31:12.503416000 +0200
+++ fglrx-driver-11-7-2i.export/debian/fglrx-glx-ia32.install 2011-08-02 23:50:34.099419000 +0200
@@ -1,3 +1,4 @@
arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri
arch/x86/usr/lib/libatiuki* usr/lib32
arch/x86/usr/X11R6/lib/fglrx/libGL.so.1.2 usr/lib32
+arch/x86/usr/X11R6/lib/libatiadlxx.so* usr/lib32
diff -ur fglrx-driver-11-7-2h.export/debian/fglrx-glx-ia32.lintian-overrides fglrx-driver-11-7-2i.export/debian/fglrx-glx-ia32.lintian-overrides
--- fglrx-driver-11-7-2h.export/debian/fglrx-glx-ia32.lintian-overrides 2011-08-02 22:07:46.136917000 +0200
+++ fglrx-driver-11-7-2i.export/debian/fglrx-glx-ia32.lintian-overrides 2011-08-03 00:14:08.607416000 +0200
@@ -6,6 +6,8 @@
fglrx-glx-ia32: no-symbols-control-file usr/lib32/libatiuki.so.1.0
fglrx-glx-ia32: no-symbols-control-file usr/lib32/libGL.so.1.2
+sharedobject-in-library-directory-missing-soname usr/lib32/libatiadlxx.so
+
# Packages built against the FGLRX libGL should declare dependencies on
# the free version for Debian's purposes.
shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
