Bug#622222: libgl1-mesa-dri-experimental: trying to overwrite '/usr/lib/dri/nouveau_vieux_dri.so', which is also in package libgl1-mesa-dri 7.10.2-1
On 2011-04-11 10:46 +0200, Cyril Brulebois wrote:
> Romain Francoise <rfrancoise@debian.org> (11/04/2011):
>> Package: libgl1-mesa-dri-experimental
>> Version: 7.10.2-1
>> Severity: serious
>> Tags: sid
>
> Probably since 7.10.1-1 actually, and probably no need for a sid
> tag. Will look into that later on.
I have investigated the issue and found a possible solution. Any
objection to the attached patch?
Cheers,
Sven
>From c4796589c3e1c6d943dba15176e9606e9eae9f23 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenjoac@gmx.de>
Date: Sat, 16 Apr 2011 19:36:05 +0200
Subject: [PATCH] Avoid installing nouveau_vieux_dri.so into two packages
Moving nouveau_vieux_dri.so to build/dri/lib/gallium/ in the build
target has the disadvantage that the upstream Makefile will detect the
missing file and bring it back later when we run "make install". So
let's make the move only when we install the files into the packages.
---
debian/changelog | 7 +++++++
debian/rules | 9 +++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6487631..cc0ecad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10.2-2) UNRELEASED; urgency=low
+
+ * Avoid installing the nouveau_vieux driver into libgl1-mesa-dri
+ (Closes: #622222).
+
+ -- Sven Joachim <svenjoac@gmx.de> Sat, 16 Apr 2011 17:50:58 +0200
+
mesa (7.10.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 2f25d15..29760e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -209,10 +209,6 @@ build-stamp: $(BUILD_STAMPS)
rm -f build/dri/lib/gallium/i915_dri.so
# r600g is not yet in a fit state to ship
rm -f build/dri/lib/gallium/r600_dri.so
-# Move nouveau_vieux alongside nouveau to install in dri-experimental package
-ifneq (,$(filter nouveau,$(DRI_DRIVERS)))
- mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
-endif
>$@
$(STAMP)-build-%: configure
@@ -274,6 +270,11 @@ binary-arch: install
# install the right files manually.
rm -r debian/tmp/dri/usr/lib/dri
+ # Move nouveau_vieux alongside nouveau to install in dri-experimental package
+ifneq (,$(filter nouveau,$(DRI_DRIVERS)))
+ mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
+endif
+
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
--
1.7.4.4
Reply to: