Merge lp:~veger/ubuntu/oneiric/xvba-video/fix-for-871615 into lp:ubuntu/oneiric/xvba-video

[Maarten Bezemer]

[Evan Broder (broder)]

This has been uploaded to precise and oneiric-proposed, but because the MP is against the oneiric branch, I can't close it.

review: Approve

[Maarten Bezemer (veger)]

> This has been uploaded to precise and oneiric-proposed, but because the MP is
> against the oneiric branch, I can't close it.

Do I need to do anything for that? (It is my first patch, so I am kind of new in this part of LP)

[Evan Broder (broder)]

On Tue, Dec 13, 2011 at 2:24 PM, Maarten Bezemer
<email address hidden> wrote:
>> This has been uploaded to precise and oneiric-proposed, but because the MP is
>> against the oneiric branch, I can't close it.
>
> Do I need to do anything for that? (It is my first patch, so I am kind of new in this part of LP)

At the top of the merge proposal page, there should be a Status item -
if you can edit that and set it to "Merged" instead of "Needs Review",
that should be sufficient.

Alternatively, there should be an option to delete the merge proposal
at the top of the page, which would also be fine - since I merged your
branch into precise, you'll still get credit for the change and the
bzr modifications won't get lost, and there hasn't been any
interesting discussion on the MP that the world would miss out on :)

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-30 07:28:07 +0000
+++ debian/changelog	2011-12-13 09:50:59 +0000
@@ -1,3 +1,9 @@
+xvba-video (0.7.8-1ubuntu1.1) oneiric; urgency=low
+
+  * debian/control: Accept fglrx-update package also (LP: #871615)
+
+ -- Maarten Bezemer <[e-mail]>  Tue, 13 Dec 2011 10:29:45 +0100
+
 xvba-video (0.7.8-1ubuntu1) oneiric; urgency=low
 
   * Fix debian/control to use ubuntu fglrx versioning. (LP: #753443)

=== modified file 'debian/control'
--- debian/control	2011-05-05 20:52:54 +0000
+++ debian/control	2011-12-13 09:50:59 +0000
@@ -12,7 +12,7 @@
 
 Package: xvba-va-driver
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, fglrx-driver (>= 1:10-9) | fglrx (>= 2:8.840), libva1
+Depends: ${shlibs:Depends}, ${misc:Depends}, fglrx-driver (>= 1:10-9) | fglrx (>= 2:8.840) | fglrx-updates (>=2:8.840), libva1
 Description: XvBA-based backend for VA API (AMD fglrx implementation)
  X-Video Bitstream Acceleration (XvBA), designed by AMD for its ATI/AMD Radeon
  GPU, is a future extension of the X video extension (Xv) for the X Window