debian/changelog |   10 +++++++---
 debian/rules     |    1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 6ea061f25a2b7b769f68ec6ffc67ac30793b5f05
Author: Julien Cristau <jcris...@debian.org>
Date:   Wed Apr 14 17:11:45 2010 +0200

    Remove from debian/rules an obsolete reference to 
/usr/share/debhelper/dh_make/debianm/rules.

diff --git a/debian/changelog b/debian/changelog
index 653511b..e107850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.7.6-3) UNRELEASED; urgency=low
 
+  [ Cyril Brulebois ]
   * Steal patch 112_xaa-fbcomposite-fix-negative-size.patch from ubuntu,
     and rename it 16-xaa-fbcomposite-fix-negative-size.diff as it's now
     applied in Debian as well. It fixes arithmetic bugs in mod(); thanks to
@@ -14,6 +15,10 @@ xorg-server (2:1.7.6-3) UNRELEASED; urgency=low
     the uname in Xorg.*.log might not give enough details (like the Debian
     revision).
 
+  [ Julien Cristau ]
+  * Remove from debian/rules an obsolete reference to
+    /usr/share/debhelper/dh_make/debianm/rules.
+
  -- Cyril Brulebois <k...@debian.org>  Mon, 05 Apr 2010 20:25:26 +0200
 
 xorg-server (2:1.7.6-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 09e5995..fa194e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -256,7 +256,6 @@ binary-initial:
        dh_testroot
 
 # stub to build deb files, used by binary-indep and binary-arch
-# (cf. /usr/share/debhelper/dh_make/debianm/rules)
 binary-deb:
        dh_compress
        dh_fixperms

commit 06f04cc5328ef0b9e027a1e66d87bb92c853daa7
Author: Julien Cristau <jcris...@debian.org>
Date:   Wed Apr 14 17:07:35 2010 +0200

    Tone down the changelog entry about the mod() macro fix
    
    It's not security-relevant in a pixman world, according to ajax.

diff --git a/debian/changelog b/debian/changelog
index 9ce203f..653511b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,8 @@ xorg-server (2:1.7.6-3) UNRELEASED; urgency=low
 
   * Steal patch 112_xaa-fbcomposite-fix-negative-size.patch from ubuntu,
     and rename it 16-xaa-fbcomposite-fix-negative-size.diff as it's now
-    applied in Debian as well. It fixes arithmetic bugs in mod(), which
-    could lead to X crashes/exploits when XAA and compositing are used;
-    thanks to Bryce Harrington.
+    applied in Debian as well. It fixes arithmetic bugs in mod(); thanks to
+    Bryce Harrington.
   * Merge 'xsfbs/debian-unstable' to fix target dependencies, which fixes
     useless rebuilds.
   * Add support for “noudeb” in DEB_BUILD_OPTIONS to disable building the


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o251s-00045j...@alioth.debian.org

Reply via email to