[SCM] intel-vaapi-driver/master: Rename libva-intel-vaapi-driver package back to i965-va-driver. See debian/changelog for details as to why the name was reverted.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 27140bb9b05a9df112807b26193240eab00a73ca
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Tue Mar 20 11:18:05 2012 -0400

    Rename libva-intel-vaapi-driver package back to i965-va-driver.
    See debian/changelog for details as to why the name was reverted.

diff --git a/debian/changelog b/debian/changelog
index 12e233b..d7b0ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+intel-vaapi-driver (1.0.16-4) unstable; urgency=low
+
+  * Rename libva-intel-vaapi-driver package back to i965-va-driver.
+    This is done to match naming sceme picked for other VAAPI modules.
+    The name is picked by looking at the name of the *.so file installed
+    under /usr/lib/<triplet>/dri, and using the first part of the name.
+    In this case, the driver file is named "i965_drv_video.so" and so the
+    package to install the driver is named i965-va-driver.
+
+ -- Andres Mejia <amejia at debian.org>  Tue, 20 Mar 2012 11:16:29 -0400
+
 intel-vaapi-driver (1.0.16-3) unstable; urgency=low
 
   * Set Architecture field to specific supported architecture fields.
diff --git a/debian/control b/debian/control
index 8e9f143..c1351e9 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Homepage: http://www.freedesktop.org/wiki/Software/vaapi
 Vcs-Git: git://git.debian.org/pkg-multimedia/intel-vaapi-driver.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/intel-vaapi-driver.git
 
-Package: libva-intel-vaapi-driver
+Package: i965-va-driver
 Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -28,11 +28,11 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Breaks:
- i965-va-driver (<< 1.0.15~)
+ libva-intel-vaapi-driver (<< 1.0.16-4)
 Replaces:
- i965-va-driver
+ libva-intel-vaapi-driver
 Provides:
- i965-va-driver
+ libva-intel-vaapi-driver
 Description: VAAPI driver for Intel G45 & HD Graphics family
  The VA-API (Video Acceleration API) enables hardware accelerated video
  decode/encode at various entry-points (VLD, IDCT, Motion Compensation
@@ -50,41 +50,19 @@ Description: VAAPI driver for Intel G45 & HD Graphics family
  Intel G45 chipsets and Intel HD Graphics for Intel Core processor
  family.
 
-Package: i965-va-driver
-Architecture: all
-Multi-Arch: foreign
-Depends:
- libva-intel-vaapi-driver,
- ${misc:Depends}
-Section: oldlibs
-Priority: extra
-Description: VAAPI driver for Intel G45 & HD Graphics family (transitional package)
- The VA-API (Video Acceleration API) enables hardware accelerated video
- decode/encode at various entry-points (VLD, IDCT, Motion Compensation
- etc.) for the prevailing coding standards today (MPEG-2, MPEG-4
- ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3). It provides an interface
- to fully expose the video decode capabilities in today's GPUs.
- .
- Platform definitions:
- CTG: Cantiga, Intel GMA 4500MHD (GM45)
- ILK: Ironlake, Intel HD Graphics for 2010 Intel Core processor family
- SNB: Sandybridge, Intel HD Graphics for 2011 Intel Core processor family
- IVB: Ivybridge
- .
- This package installs the video decode & encode driver backend for the
- Intel G45 chipsets and Intel HD Graphics for Intel Core processor
- family.
- .
- This package ensures a smooth upgrades from previous versions of Debian.
- It can safely be removed if no other packages depend on it.
-
-Package: libva-intel-vaapi-driver-dbg
+Package: i965-va-driver-dbg
 Section: debug
 Priority: extra
 Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
 Multi-Arch: same
+Breaks:
+ libva-intel-vaapi-driver-dbg (<< 1.0.16-4)
+Replaces:
+ libva-intel-vaapi-driver-dbg
+Provides:
+ libva-intel-vaapi-driver-dbg
 Depends:
- libva-intel-vaapi-driver (= ${binary:Version}),
+ i965-va-driver (= ${binary:Version}),
  ${misc:Depends}
 Description: VAAPI driver for Intel G45 & HD Graphics family (debug symbols)
  Video decode & encode driver for Intel G45 chipsets and Intel HD
diff --git a/debian/libva-intel-vaapi-driver.install b/debian/i965-va-driver.install
similarity index 100%
rename from debian/libva-intel-vaapi-driver.install
rename to debian/i965-va-driver.install
diff --git a/debian/rules b/debian/rules
index ad9c604..9c55fad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh $@ --parallel --with autoreconf
 
 override_dh_strip:
-	dh_strip --dbg-package=libva-intel-vaapi-driver-dbg
+	dh_strip --dbg-package=i965-va-driver-dbg
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

-- 
intel-vaapi-driver packaging