Rename libdrm-nouveau1 package to libdrm-nouveau1a

Upstream broke the ABI of libdrm-nouveau without changing soname, so
we have to change at least the package name.  Install a new lintian
override for the package-name-doesnt-match-sonames warning.

7 files changed, 17 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 002388b5..4444bc95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 libdrm (2.4.23-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
+  * Rename the libdrm-nouveau1 package to libdrm-nouveau1a, since upstream
+    broke the ABI without changing the soname.
+    - Make libdrm-nouveau1a{,-dbg} conflict with libdrm-nouveau1{,-dbg} and
+      remove the Breaks against xserver-xorg-video-nouveau.
+    - Adjust the lintian override.
+  
  -- Sven Joachim <svenjoac@gmx.de>  Tue, 14 Dec 2010 14:28:11 +0100
 
 libdrm (2.4.22-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index e15bc87b..cc5091a6 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends:
  libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
- libdrm-nouveau1 (= ${binary:Version}) [linux-any],
+ libdrm-nouveau1a (= ${binary:Version}) [linux-any],
  libkms1 (= ${binary:Version}) [linux-any],
  ${misc:Depends},
 Replaces:
@@ -95,31 +95,32 @@ Description: Userspace interface to intel-specific kernel DRM services -- debugg
  .
  This package provides the debugging symbols for the libdrm-intel1 package.
 
-Package: libdrm-nouveau1
+Package: libdrm-nouveau1a
 Section: libs
 Architecture: linux-any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
-Breaks: xserver-xorg-video-nouveau (<< 1:0.0.16)
+Conflicts: libdrm-nouveau1
 Description: Userspace interface to nouveau-specific kernel DRM services -- runtime
  This library implements the userspace interface to the nouveau-specific kernel
  DRM services. DRM stands for "Direct Rendering Manager", which is the
  kernelspace portion of the "Direct Rendering Infrastructure" (DRI). The DRI is
  currently used on Linux to provide hardware-accelerated OpenGL drivers.
 
-Package: libdrm-nouveau1-dbg
+Package: libdrm-nouveau1a-dbg
 Section: debug
 Priority: extra
 Architecture: linux-any
-Depends: libdrm-nouveau1 (= ${binary:Version}),
+Depends: libdrm-nouveau1a (= ${binary:Version}),
  ${misc:Depends},
+Conflicts: libdrm-nouveau1-dbg
 Description: Userspace interface to nouveau-specific kernel DRM -- debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for "Direct Rendering Manager", which is the kernelspace portion
  of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on
  Linux to provide hardware-accelerated OpenGL drivers.
  .
- This package provides the debugging symbols for the libdrm-nouveau1 package.
+ This package provides the debugging symbols for the libdrm-nouveau1a package.
 
 Package: libdrm-radeon1
 Section: libs
diff --git a/debian/libdrm-nouveau1.lintian-overrides b/debian/libdrm-nouveau1.lintian-overrides
deleted file mode 100644
index 5ce3941a..00000000
--- a/debian/libdrm-nouveau1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-nouveau1: symbols-file-contains-debian-revision on symbol nouveau_bo_busy@Base and 44 others
diff --git a/debian/libdrm-nouveau1.install b/debian/libdrm-nouveau1a.install
index b19813f5..b19813f5 100644
--- a/debian/libdrm-nouveau1.install
+++ b/debian/libdrm-nouveau1a.install
diff --git a/debian/libdrm-nouveau1a.lintian-overrides b/debian/libdrm-nouveau1a.lintian-overrides
new file mode 100644
index 00000000..76c525b1
--- /dev/null
+++ b/debian/libdrm-nouveau1a.lintian-overrides
@@ -0,0 +1 @@
+libdrm-nouveau1a: package-name-doesnt-match-sonames libdrm-nouveau1
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1a.symbols
index a7c48d0a..4da10eaa 100644
--- a/debian/libdrm-nouveau1.symbols
+++ b/debian/libdrm-nouveau1a.symbols
@@ -1,4 +1,4 @@
-libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
+libdrm_nouveau.so.1 libdrm-nouveau1a #MINVER#
  nouveau_bo_busy@Base 2.4.21-1
  nouveau_bo_emit_buffer@Base 2.4.21-1
  nouveau_bo_handle_get@Base 2.4.21-1
diff --git a/debian/rules b/debian/rules
index b9b097e1..1d838c45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,7 @@ ifeq ($(INTEL), yes)
 	dh_strip -plibdrm-intel1 --dbg-package=libdrm-intel1-dbg
 endif
 ifeq ($(NOUVEAU), yes)
-	dh_strip -plibdrm-nouveau1 --dbg-package=libdrm-nouveau1-dbg
+	dh_strip -plibdrm-nouveau1a --dbg-package=libdrm-nouveau1a-dbg
 endif
 ifeq ($(RADEON), yes)
 	dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
@@ -147,7 +147,7 @@ ifeq ($(INTEL), yes)
 	dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.21)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
-	dh_makeshlibs -plibdrm-nouveau1 -V'libdrm-nouveau1 (>= 2.4.21-1)' -- -c4
+	dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (>= 2.4.21-1)' -- -c4
 endif
 ifeq ($(RADEON), yes)
 	dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.20)' -- -c4