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

X Strike Force X.Org X11 SVN commit: r3999 - trunk/debian/xorg/debian



Author: julien
Date: 2006-11-14 19:26:18 -0500 (Tue, 14 Nov 2006)
New Revision: 3999

Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/control
Log:
* Add x11-common conflict with xephem (only in woody/non-free).

Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog	2006-11-15 00:19:37 UTC (rev 3998)
+++ trunk/debian/xorg/debian/changelog	2006-11-15 00:26:18 UTC (rev 3999)
@@ -17,8 +17,9 @@
     monolith, and some display managers rely on it being executable
     (closes: #390526).
   * Add line breaks to x11-common's Conflicts field in debian/control.
+  * Add x11-common conflict with xephem (only in woody/non-free).
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Sun, 12 Nov 2006 13:55:06 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Tue, 14 Nov 2006 17:36:10 +0100
 
 xorg (1:7.1.0-6) unstable; urgency=low
 

Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control	2006-11-15 00:19:37 UTC (rev 3998)
+++ trunk/debian/xorg/debian/control	2006-11-15 00:26:18 UTC (rev 3999)
@@ -59,7 +59,7 @@
  beaver (<= 0.2.5-2), lsb-core (<= 3.1-4), yank (<=0.2.1-7.2),
  xpmumon (<= 1.3.0), ivtools-dev (<= 1.1.3-5), ppxp (<= 0.2001080415-14),
  guitar (<= 0.1.4-11), xftp, xext, xpaste, ghostview, xv (<= 3.10a-26),
- xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4)
+ xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4), xephem
 Replaces: xfree86-common, xorg-common, xserver-common, x-common
 Description: X Window System (X.Org) infrastructure
  x11-common contains the filesystem infrastructure required for further



Reply to: