[Pkg-fglrx-devel] Bug#636450: fglrx-driver: moved/duplicated/lost files after recent packaging changes
Andreas Beckmann
debian at abeckmann.de
Tue Aug 2 23:51:35 UTC 2011
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 01-fix-ftbfs.diff
Type: text/x-diff
Size: 1236 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0008.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 02-minimize-build-depends.diff
Type: text/x-diff
Size: 1312 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0009.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 03-generic-handling-of-templates.diff
Type: text/x-diff
Size: 1819 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0010.diff>
-------------- next part --------------
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 <debian at abeckmann.de> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 05-rename-before-install-and-drop-duplicate-files.diff
Type: text/x-diff
Size: 4659 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0011.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 06-simplify-rules.diff
Type: text/x-diff
Size: 3153 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0012.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 07-fix-shlibs.diff
Type: text/x-diff
Size: 3508 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0013.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 08-allow-multiple-xorg-video-abis.diff
Type: text/x-diff
Size: 1911 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0014.diff>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 09-636225.diff
Type: text/x-diff
Size: 1918 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fglrx-devel/attachments/20110803/5be2d968/attachment-0015.diff>
More information about the Pkg-fglrx-devel
mailing list