[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r401 - in branches/6.9/debian: . patches patches/general



Author: dnusinow
Date: 2005-07-23 16:42:23 -0500 (Sat, 23 Jul 2005)
New Revision: 401

Modified:
   branches/6.9/debian/changelog
   branches/6.9/debian/patches/general/000_stolen_from_drm.diff
   branches/6.9/debian/patches/series
Log:
- Inaugurate new changelog
- Remove obsolete by upstream patches:
  - general/0000_backport_from_upstream.diff
  - general/000_stolen_from_HEAD_i810.diff


Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog	2005-07-23 19:14:04 UTC (rev 400)
+++ branches/6.9/debian/changelog	2005-07-23 21:42:23 UTC (rev 401)
@@ -1,3 +1,12 @@
+xorg-x11 (6.9.0.dfsg.1-0pre1+SVN) UNRELEASED; urgency=low
+
+  Changes by David Nusinow:
+     - Remove obsolete by upstream patches:
+       - general/0000_backport_from_upstream.diff
+       - general/000_stolen_from_HEAD_i810.diff
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 23 Jul 2005 17:40:13 -0400
+
 xorg-x11 (6.8.2.dfsg.1-4+SVN) UNRELEASED; urgency=low
 
   Changes by David Nusinow:

Modified: branches/6.9/debian/patches/general/000_stolen_from_drm.diff
===================================================================
--- branches/6.9/debian/patches/general/000_stolen_from_drm.diff	2005-07-23 19:14:04 UTC (rev 400)
+++ branches/6.9/debian/patches/general/000_stolen_from_drm.diff	2005-07-23 21:42:23 UTC (rev 401)
@@ -2,10 +2,12 @@
 linux-libc-headers in place of linux-kernel-headers. (Dave Airlie -- revision
 1.62, +1 -1)
 
---- xc/extras/drm/shared/drm.h.orig	2005-05-17 13:09:08.589822352 +1000
-+++ xc/extras/drm/shared/drm.h	2005-05-17 13:10:06.452025960 +1000
-@@ -38,7 +38,9 @@
- #define _DRM_H_
+Index: xc/extras/drm/shared/drm.h
+===================================================================
+--- xc/extras/drm/shared/drm.h.orig	2005-06-15 15:05:06.000000000 -0400
++++ xc/extras/drm/shared/drm.h	2005-07-23 17:37:27.000000000 -0400
+@@ -63,7 +63,9 @@
+ #endif
  
  #if defined(__linux__)
 +#if defined(__KERNEL__)

Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series	2005-07-23 19:14:04 UTC (rev 400)
+++ branches/6.9/debian/patches/series	2005-07-23 21:42:23 UTC (rev 401)
@@ -1,7 +1,5 @@
-general/0000_backport_from_upstream.diff -p0
 general/000_backport_from_author_xterm.diff -p0
 general/000_stolen_from_drm.diff -p0
-general/000_stolen_from_HEAD_i810.diff -p0
 general/000_stolen_from_linuxwacom_wacom_driver.diff -p0
 general/000_stolen_from_Mesa_6.2_branch.diff -p0
 general/000_stolen_from_Mesa_6.2_branch_vb_cull.diff -p0



Reply to: