Rename dove -> armada

As this is not specific to Armada 510 (Dove) devices, but also appears
on other Marvell Armada devices, use "armada" as the name rather than
"dove".

Signed-off-by: Russell King <rmk_cubox@arm.linux.org.uk>

6 files changed, 18 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 95e7cd7..dc126c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm-armada (2.0.1-1) unstable; urgency=low
+
+  * Rename to Armada as this covers more devices than just the Armada 510
+    Dove.
+
+ -- Russell King <rmk_cubox@arm.linux.org.uk>  Tue, 21 May 2013 10:54:58 +0100
+
 libdrm-dove (2.0.0-1) unstable; urgency=low
 
   * Re-vamp API to allow a buffer manager object, stop passing fd into
diff --git a/debian/control b/debian/control
index efbf3d0..909d780 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libdrm-dove
+Source: libdrm-armada
 Priority: optional
 Maintainer: Russell King <rmk+cubox@arm.linux.org.uk>
 Build-Depends:
@@ -9,11 +9,11 @@ Build-Depends:
 Standards-Version: 3.9.2
 Section: libs
 
-Package: libdrm-dove-dev
+Package: libdrm-armada-dev
 Section: libdevel
 Architecture: any
 Depends:
- libdrm-dove2 (= ${binary:Version}),
+ libdrm-armada2 (= ${binary:Version}),
  ${misc:Depends},
 Description: Userspace interface to kernel DRM services -- development files
  This library implements the userspace interface to the kernel DRM
@@ -22,9 +22,9 @@ Description: Userspace interface to kernel DRM services -- development files
  The DRI is currently used on Linux to provide hardware-accelerated
  OpenGL drivers.
  .
- This package provides the development environment for libdrm-dove2.
+ This package provides the development environment for libdrm-armada2.
 
-Package: libdrm-dove2
+Package: libdrm-armada2
 Section: libs
 Priority: extra
 Architecture: linux-any
@@ -40,9 +40,9 @@ Description: Userspace interface to kernel DRM services -- runtime
  The DRI is currently used on Linux to provide hardware-accelerated
  OpenGL drivers.
  .
- This package provides the runtime environment for libdrm-dove2.
+ This package provides the runtime environment for libdrm-armada2.
 
-Package: libdrm-dove2-dbg
+Package: libdrm-armada2-dbg
 Section: debug
 Priority: extra
 Architecture: linux-any
@@ -56,4 +56,4 @@ Description: Userspace interface to kernel DRM services -- debugging symbols
  The DRI is currently used on Linux to provide hardware-accelerated
  OpenGL drivers.
  .
- This package provides debugging symbols for the libdrm-dove2 package.
+ This package provides debugging symbols for the libdrm-armada2 package.
diff --git a/debian/libdrm-dove-dev.install b/debian/libdrm-armada-dev.install
index 757f698..757f698 100644
--- a/debian/libdrm-dove-dev.install
+++ b/debian/libdrm-armada-dev.install
diff --git a/debian/libdrm-armada2.install b/debian/libdrm-armada2.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libdrm-armada2.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/libdrm-dove2.install b/debian/libdrm-dove2.install
deleted file mode 100644
index c131245..0000000
--- a/debian/libdrm-dove2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdrm_dove.so.2*
diff --git a/debian/rules b/debian/rules
index cc315f2..2d9cfa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,9 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_strip:
-	dh_strip -plibdrm-dove2 --dbg-package=libdrm-dove2-dbg
+	dh_strip -plibdrm-armada2 --dbg-package=libdrm-armada2-dbg
 	dh_strip -s --remaining-packages
 
 %:
-	dh $@ --with quilt,autoreconf --builddirectory=build/
+	dh $@ --with autoreconf --builddirectory=build/