Please merge xserver-xorg-video-ati 1:6.12.191-1 (main) from Debian experimental (main).

Bug #534026 reported by Benjamin Drung
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
xserver-xorg-video-ati (Ubuntu)
Fix Released
High
Unassigned

Bug Description

Binary package hint: xserver-xorg-video-ati

Please merge xserver-xorg-video-ati 1:6.12.191-1 (main) from Debian experimental (main). This will fix the tearing bug #514845.

Changelog since current lucid version 1:6.12.99+git20100126.e5933fd7-0ubuntu2:

xserver-xorg-video-ati (1:6.12.191-1) experimental; urgency=low

  * New upstream release candidate.

 -- Brice Goglin <email address hidden> Wed, 03 Mar 2010 17:37:19 +0100

xserver-xorg-video-ati (1:6.12.99+git20100201.a887818f-1) experimental; urgency=low

  * New upstream release snapshot.
    + EXA now enabled by default, closes: #502970.
    + Fix display watermark, closes: #540954.
    + Add KMS support, closes: #561526, #567999.
  * Bump libdrm-dev dependency to 2.4.17 to get libdrm-radeon.
  * Build-depend on x11proto-dri2-dev for DRI2 support.

 -- Brice Goglin <email address hidden> Mon, 01 Feb 2010 23:54:34 +0100

xserver-xorg-video-ati (1:6.12.5-1) unstable; urgency=low

  * New upstream release, closes: #572306.

 -- Brice Goglin <email address hidden> Wed, 03 Mar 2010 07:29:24 +0100

xserver-xorg-video-ati (1:6.12.4-3) unstable; urgency=low

  [ Julien Cristau ]
  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
    good reason. Thanks, Colin Watson!

  [ Brice Goglin ]
  * Pull upstream 6.12-branch up to commit 712ac98a.
    + Some EXA fixes, closes: #565506.

 -- Brice Goglin <email address hidden> Wed, 27 Jan 2010 16:44:30 +0100

xserver-xorg-video-ati (1:6.12.4-2) unstable; urgency=low

  [ Julien Cristau ]
  * Drop obsolete build-dep on xf86miscproto.

  [ Cyril Brulebois ]
  * Add ${misc:Depends} to xserver-xorg-video-*-dbg's Depends.
  * Wrap all Depends while I'm at it.
  * Upload to unstable.

 -- Cyril Brulebois <email address hidden> Fri, 08 Jan 2010 01:16:00 +0100

xserver-xorg-video-ati (1:6.12.4-1) experimental; urgency=low

  [ Timo Aaltonen ]
  * New upstream release.
  * Bump Standards-Version to 3.8.3.

  [ Brice Goglin ]
  * Properly generate each binary package substvars so as to fix shlibs
    dependencies, closes: #558290.
  * Build against xserver 1.7.

 -- Brice Goglin <email address hidden> Thu, 03 Dec 2009 16:38:29 +0100

xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low

  * New upstream release.
    + More AGP quirks, closes: #545040.

 -- Brice Goglin <email address hidden> Thu, 10 Sep 2009 07:40:14 +0200

Tags: workflow
Revision history for this message
Benjamin Drung (bdrung) wrote :

xserver-xorg-video-ati (1:6.12.191-1ubuntu1) lucid; urgency=low

  * Merge from Debian experimental (LP: #534026).
    + Fix tearing (LP: #514845)
  * Remaining changes:
    - 100_radeon-6.9.0-bgnr-enable.patch: Turn on option to allow xserver to
      skip drawing the root background window for the radeon driver. This
      will make the boot up sequence smoother by eliminating one flicker.
      TESTERS: Watch for corruption or other ill effects during boot up.
  * Switch to dpkg-source 3.0 (quilt) for the patch.
  * Add DEP-3 header to 100_radeon-6.9.0-bgnr-enable.patch.

 -- Benjamin Drung <email address hidden> Sun, 07 Mar 2010 22:23:34 +0100

Revision history for this message
Benjamin Drung (bdrung) wrote :
Revision history for this message
Benjamin Drung (bdrung) wrote :
Bryce Harrington (bryce)
tags: added: workflow
Revision history for this message
Martin Pitt (pitti) wrote :

Some notes:

 - The changelog in the description is probably correct wrt. the last merge point, but we already have a much newer version than that (wrt. FF)
 - the attached merge diff has quite a lot of noise (unnecessary removal of some files, which then get reapplied later on in this ominous debian/patches/debian-changes-1:6.12.191-1ubuntu1 -- can all of this please just get dropped? It seems the only really remaining change is the addition of 100_radeon-6.9.0-bgnr-enable.patch.

Changed in xserver-xorg-video-ati (Ubuntu):
status: New → Confirmed
Revision history for this message
Martin Pitt (pitti) wrote :

Oh, forgot to say, approved.

Revision history for this message
Benjamin Drung (bdrung) wrote :

* The changelog description are the Debian changes since the last sync/merge. What else should be in the description? Should I mention the Ubuntu changes since the last sync/merge?
* The removals and creation of debian/patches/debian-changes-1:6.12.191-1ubuntu1 comes from moving to dpkg-source 3.0 (quilt) version. Instead of directly modifying the source, the changes are stored as patch. I wanted to avoid the modification of debian/rules. Attached the patch without the automatic modification due to dpkg-source 3.0 (quilt).

Revision history for this message
Martin Pitt (pitti) wrote :

> What else should be in the description?

It was fine, I just wrote that down as kind of notekeeping, and for other members of -release.

> comes from moving to dpkg-source 3.0 (quilt) version.

Ah. Personally I don't like packages which change the packaging system to Debian for such a simple reason (since it creates large deltas like this), but with my -release hat on I don't object to it formally.

Revision history for this message
Benjamin Drung (bdrung) wrote :

> Ah. Personally I don't like packages which change the packaging system to Debian for such a simple reason (since it creates large deltas like this), but with my -release hat on I don't object to it formally.

Adding one line to debian/source/format instead of hacking debian/rules is less error-prone and makes the diff file cleaner. Sadly the Debian package has direct source changes. The cleaned debdiff should work, too.

Revision history for this message
Timo Aaltonen (tjaalton) wrote :

NACK, no need to change the packaging that much. Check debian/README.source how to enable the patch system.

Revision history for this message
Benjamin Drung (bdrung) wrote :

Here is the updated patch. It modifies debian/rules instead of using dpkg-source 3.0 (quilt) format.

Revision history for this message
Timo Aaltonen (tjaalton) wrote :

ACK, better now :)

Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks, latest changes look good to me as well. Sponsored and uploaded.

Changed in xserver-xorg-video-ati (Ubuntu):
importance: Undecided → High
status: Confirmed → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package xserver-xorg-video-ati - 1:6.12.191-1ubuntu1

---------------
xserver-xorg-video-ati (1:6.12.191-1ubuntu1) lucid; urgency=low

  * Merge from Debian experimental (LP: #534026).
    + Fix tearing (LP: #514845).
  * Remaining changes:
    - 100_radeon-6.9.0-bgnr-enable.patch: Turn on option to allow xserver to
      skip drawing the root background window for the radeon driver. This
      will make the boot up sequence smoother by eliminating one flicker.
      TESTERS: Watch for corruption or other ill effects during boot up.
  * Add quilt to Build-Depends and call patch/unpatch target.
  * Add DEP-3 header to 100_radeon-6.9.0-bgnr-enable.patch.
 -- Benjamin Drung <email address hidden> Tue, 09 Mar 2010 14:24:44 +0100

Changed in xserver-xorg-video-ati (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.