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

X Strike Force X.Org X11 SVN commit: r1437 - branches/modular/lib/libX11-X11R7.0-1.0.0/debian



Author: dnusinow
Date: 2006-03-12 14:01:27 -0500 (Sun, 12 Mar 2006)
New Revision: 1437

Modified:
   branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog
   branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control
Log:
* Make libx11-6 conflict with xlibs-data. Thanks Kurt Roeckx.
  (closes: #356415)


Modified: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog	2006-03-12 18:44:01 UTC (rev 1436)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog	2006-03-12 19:01:27 UTC (rev 1437)
@@ -5,8 +5,10 @@
     keeping the patches separate is for submitting things upstream and porting
     our changes between upstream releases. Keeping the automatically generated
     build system stuff in patches also doesn't fall under this use category.
+  * Make libx11-6 conflict with xlibs-data. Thanks Kurt Roeckx.
+    (closes: #356415)
 
- -- David Nusinow <dnusinow@debian.org>  Thu,  9 Mar 2006 22:22:46 -0500
+ -- David Nusinow <dnusinow@debian.org>  Sun, 12 Mar 2006 14:00:31 -0500
 
 libx11 (2:1.0.0-2) experimental; urgency=low
 

Modified: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control	2006-03-12 18:44:01 UTC (rev 1436)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control	2006-03-12 19:01:27 UTC (rev 1437)
@@ -10,6 +10,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-data
 Pre-Depends: x11-common (>= 1:7.0.0)
+Conflicts: xlibs-data
 Description: X11 client-side library
  This package provides the main client interface to the X Window System, and is
  otherwise known as 'Xlib'.  It provides a complete API for the basic functions



Reply to: