On 05/03/14 18:12, Simon McVittie wrote:
> That seems a pretty tenuous reason: fglrx-driver maintainers, would
> there be anything wrong with bumping it back up to a Depends and
> simplifying the dependency graph?
fglrx-driver_740843_dep.diff, attached, for what it's worth. It's a
patch against the jessie package, built on wheezy and tested on SteamOS
(wheezy-based), but I don't see any reason why the same thing wouldn't
work for wheezy -> jessie or as a patch to the sid package.
> If you really don't want the Depends, moving the Breaks around also
> seems to work
fglrx-driver_740843_breaks.diff, attached, untested but ought to work
(the equivalent change in simplified packages did).
Feedback welcome.
S
diffstat for fglrx-driver-14.1~beta1.3 fglrx-driver-14.1~beta1.3
changelog | 8 ++++++++
control | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff -Nru fglrx-driver-14.1~beta1.3/debian/changelog fglrx-driver-14.1~beta1.3/debian/changelog
--- fglrx-driver-14.1~beta1.3/debian/changelog 2014-02-13 14:09:18.000000000 +0000
+++ fglrx-driver-14.1~beta1.3/debian/changelog 2014-03-05 18:58:17.000000000 +0000
@@ -1,3 +1,11 @@
+fglrx-driver (1:14.1~beta1.3-1+smcv.breaks) UNRELEASED; urgency=medium
+
+ * Convert fglrx-driver Breaks: libgl1-fglrx-glx (>> this)
+ into libgl1-fglrx-glx Breaks: fglrx-driver (<< this)
+ which apt seems to cope much better with. (See #740843)
+
+ -- Simon McVittie <s...@debian.org> Wed, 05 Mar 2014 18:56:57 +0000
+
fglrx-driver (1:14.1~beta1.3-1) unstable; urgency=medium
* New upstream beta release 14.1-beta v1.3 (2014-02-01) (13.35.1005).
diff -Nru fglrx-driver-14.1~beta1.3/debian/control fglrx-driver-14.1~beta1.3/debian/control
--- fglrx-driver-14.1~beta1.3/debian/control 2014-02-13 14:09:18.000000000 +0000
+++ fglrx-driver-14.1~beta1.3/debian/control 2014-03-05 18:56:55.000000000 +0000
@@ -55,7 +55,6 @@
xserver-xorg-video-fglrx,
Breaks:
libgl1-${fglrx}-glx (<< ${binary:Version}),
- libgl1-${fglrx}-glx (>> ${binary:Version}),
Replaces:
xserver-xorg-video-fglrx,
Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
@@ -170,6 +169,7 @@
fglrx-glx,
fglrx-glx-ia32,
Breaks:
+ ${fglrx}-driver (<< ${binary:Version}),
ia32-libs (<< 1:0),
Replaces:
libgl1-fglrx-glx-virtual,
diffstat for fglrx-driver-14.1~beta1.3 fglrx-driver-14.1~beta1.3
changelog | 13 +++++++++++++
control | 5 +----
2 files changed, 14 insertions(+), 4 deletions(-)
diff -Nru fglrx-driver-14.1~beta1.3/debian/changelog fglrx-driver-14.1~beta1.3/debian/changelog
--- fglrx-driver-14.1~beta1.3/debian/changelog 2014-02-13 14:09:18.000000000 +0000
+++ fglrx-driver-14.1~beta1.3/debian/changelog 2014-03-05 18:54:34.000000000 +0000
@@ -1,3 +1,16 @@
+fglrx-driver (1:14.1~beta1.3-1+smcv.dep) UNRELEASED; urgency=medium
+
+ * Switch fglrx-driver from
+ Breaks: libgl1-fglrx-glx (<< this), libgl1-fglrx-glx (>> this)
+ Recommends: libgl1-fglrx-glx (= this)
+ to a simple Depends: libgl1-fglrx-glx (= this), which apt copes with
+ significantly better. (See #740843)
+ This means you have to have fglrx-driver and
+ libgl1-fglrx-glx of the same architecture, but that was probably
+ desirable anyway.
+
+ -- Simon McVittie <s...@debian.org> Wed, 05 Mar 2014 18:47:53 +0000
+
fglrx-driver (1:14.1~beta1.3-1) unstable; urgency=medium
* New upstream beta release 14.1-beta v1.3 (2014-02-01) (13.35.1005).
diff -Nru fglrx-driver-14.1~beta1.3/debian/control fglrx-driver-14.1~beta1.3/debian/control
--- fglrx-driver-14.1~beta1.3/debian/control 2014-02-13 14:09:18.000000000 +0000
+++ fglrx-driver-14.1~beta1.3/debian/control 2014-03-05 18:47:40.000000000 +0000
@@ -34,6 +34,7 @@
Architecture: i386 amd64
Depends:
lib${fglrx} (= ${binary:Version}),
+ libgl1-${fglrx}-glx (= ${binary:Version}),
${fglrx:XorgDepends},
xserver-xorg-core,
glx-alternative-fglrx (>= 0.4.1~),
@@ -41,7 +42,6 @@
${misc:Depends}
Recommends:
${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
- libgl1-${fglrx}-glx (= ${binary:Version}),
libgl1-${fglrx}-glx-i386 [amd64],
${fglrx}-atieventsd,
Suggests:
@@ -53,9 +53,6 @@
xserver-xorg-video-fglrx,
Conflicts:
xserver-xorg-video-fglrx,
-Breaks:
- libgl1-${fglrx}-glx (<< ${binary:Version}),
- libgl1-${fglrx}-glx (>> ${binary:Version}),
Replaces:
xserver-xorg-video-fglrx,
Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
