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

X Strike Force XFree86 SVN commit: r2235 - trunk/debian



Author: branden
Date: 2005-04-07 11:40:35 -0500 (Thu, 07 Apr 2005)
New Revision: 2235

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/TODO
   trunk/debian/changelog
   trunk/debian/control
Log:
Add dependencies on xfree86-common to every package that ships files in
/usr/X11R6 and doesn't already have such a dependency; this ensures that
the files located there are always locatable via the
/usr/{bin,include,lib}/X11 symbolic links provided by xfree86-common.


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2005-04-07 03:02:49 UTC (rev 2234)
+++ trunk/debian/CHANGESETS	2005-04-07 16:40:35 UTC (rev 2235)
@@ -61,4 +61,10 @@
 purge of the /etc/X11 directory (among the xfree86 packages, at least).
     2234
 
+Add dependencies on xfree86-common to every package that ships files in
+/usr/X11R6 and doesn't already have such a dependency; this ensures that
+the files located there are always locatable via the
+/usr/{bin,include,lib}/X11 symbolic links provided by xfree86-common.
+    2235
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2005-04-07 03:02:49 UTC (rev 2234)
+++ trunk/debian/TODO	2005-04-07 16:40:35 UTC (rev 2235)
@@ -16,8 +16,6 @@
 
 4.3.0.dfsg.1-13
 ---------------
-* all packages that install anything to /usr/X11R6 need to depend on
-  xfree86-common
 * #285807: fix busted MiscPassMessage() implementation which 1) copies from
   an invalid memory location, and 2) has memory leaks -- neither is a good trait
   in a setuid root program like the X server

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-04-07 03:02:49 UTC (rev 2234)
+++ trunk/debian/changelog	2005-04-07 16:40:35 UTC (rev 2235)
@@ -47,8 +47,13 @@
     enables a clean purge of the /etc/X11 directory (among the xfree86
     packages, at least).
 
- -- Branden Robinson <branden@debian.org>  Wed,  6 Apr 2005 22:02:01 -0500
+  * Add dependencies on xfree86-common to every package that ships files in
+    /usr/X11R6 and doesn't already have such a dependency; this ensures that
+    the files located there are always locatable via the
+    /usr/{bin,include,lib}/X11 symbolic links provided by xfree86-common.
 
+ -- Branden Robinson <branden@debian.org>  Thu,  7 Apr 2005 11:35:21 -0500
+
 xfree86 (4.3.0.dfsg.1-12) unstable; urgency=medium
 
   * Urgency set to medium due to fix for release-critical bug #295175

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-04-07 03:02:49 UTC (rev 2234)
+++ trunk/debian/control	2005-04-07 16:40:35 UTC (rev 2235)
@@ -9,7 +9,7 @@
 
 Package: lbxproxy
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Recommends: proxymngr
 Conflicts: xproxy
 Replaces: xproxy, xbase (<< 3.3.2.3a-2)
@@ -25,7 +25,7 @@
 Package: libdps1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Description: Display PostScript (DPS) client library
  libdps provides client-side libraries for use with the Display Postscript
  (DPS) system.
@@ -38,7 +38,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libdps1 (= ${Source-Version}), ${misc:Depends}
+Depends: libdps1 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Description: Display PostScript (DPS) client library (unstripped)
  This package is useful to provide a backtrace with symbol names in a
  debugger; this facilitates interpretation of core dumps, and aids in finding
@@ -53,7 +53,7 @@
 Package: libdps-dev
 Section: libdevel
 Architecture: any
-Depends: libdps1 (= ${Source-Version}), x-dev, libc6-dev | libc-dev
+Depends: libdps1 (= ${Source-Version}), xfree86-common, x-dev, libc6-dev | libc-dev
 Conflicts: dpsclient-dev
 Replaces: dpsclient-dev
 Description: Display PostScript (DPS) client library development files
@@ -65,7 +65,7 @@
 Package: libice6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: Inter-Client Exchange library
@@ -81,7 +81,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libice6 (= ${Source-Version}), ${misc:Depends}
+Depends: libice6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: Inter-Client Exchange library (unstripped)
@@ -98,7 +98,7 @@
 Package: libice-dev
 Section: libdevel
 Architecture: any
-Depends: libice6 (= ${Source-Version}), x-dev, libc6-dev | libc-dev
+Depends: libice6 (= ${Source-Version}), xfree86-common, x-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: Inter-Client Exchange library development files
@@ -110,7 +110,7 @@
 Package: libsm6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System Session Management library
@@ -125,7 +125,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libsm6 (= ${Source-Version}), ${misc:Depends}
+Depends: libsm6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System Session Management library (unstripped)
@@ -142,7 +142,7 @@
 Package: libsm-dev
 Section: libdevel
 Architecture: any
-Depends: libsm6 (= ${Source-Version}), x-dev, libice-dev, libc6-dev | libc-dev
+Depends: libsm6 (= ${Source-Version}), xfree86-common, x-dev, libice-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System Session Management library development files
@@ -180,7 +180,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libx11-6 (= ${Source-Version}), ${misc:Depends}
+Depends: libx11-6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System protocol client library (unstripped)
@@ -204,7 +204,7 @@
 Package: libx11-dev
 Section: libdevel
 Architecture: any
-Depends: libx11-6 (= ${Source-Version}), libxext-dev, libxi-dev, xlibs-static-dev, x-dev, libc6-dev | libc-dev
+Depends: libx11-6 (= ${Source-Version}), xfree86-common, libxext-dev, libxi-dev, xlibs-static-dev, x-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System protocol client library development files
@@ -223,7 +223,7 @@
 Package: libxaw6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Replaces: xlib6g (<< 4.0)
 Conflicts: xlib6g (<< 4.0)
 Description: X Athena widget set library (version 6)
@@ -241,7 +241,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxaw6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxaw6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Replaces: xlib6g (<< 4.0)
 Conflicts: xlib6g (<< 4.0)
 Description: X Athena widget set library (version 6, unstripped)
@@ -259,7 +259,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxaw6 (= ${Source-Version}), x-dev, libxmu-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxaw6 (= ${Source-Version}), xfree86-common, x-dev, libxmu-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw7-dev
 Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw7-dev
 Description: X Athena widget set library development files (version 6)
@@ -275,7 +275,7 @@
 Package: libxaw7
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Description: X Athena widget set library
  Xaw is a widget set based on the the Xt (X Toolkit Intrinsics) library.  It
  provides a set of graphical user-interface elements ("widgets") such as
@@ -297,7 +297,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxaw7 (= ${Source-Version}), ${misc:Depends}
+Depends: libxaw7 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Description: X Athena widget set library (unstripped)
  This package is useful to provide a backtrace with symbol names in a
  debugger; this facilitates interpretation of core dumps, and aids in finding
@@ -312,7 +312,7 @@
 Package: libxaw7-dev
 Section: libdevel
 Architecture: any
-Depends: libxaw7 (= ${Source-Version}), x-dev, libxmu-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libxpm-dev, libc6-dev | libc-dev
+Depends: libxaw7 (= ${Source-Version}), xfree86-common, x-dev, libxmu-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libxpm-dev, libc6-dev | libc-dev
 Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev
 Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev
 Provides: libxpm4-dev
@@ -326,7 +326,7 @@
 Package: libxext6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System miscellaneous extension library
@@ -359,7 +359,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxext6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxext6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System miscellaneous extension library (unstripped)
@@ -376,7 +376,7 @@
 Package: libxext-dev
 Section: libdevel
 Architecture: any
-Depends: libxext6 (= ${Source-Version}), x-dev, libc6-dev | libc-dev
+Depends: libxext6 (= ${Source-Version}), xfree86-common, x-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System miscellaneous extension library development files
@@ -388,7 +388,7 @@
 Package: libxft1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: FreeType-based font drawing library for X (version 1)
@@ -405,7 +405,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxft1 (= ${Source-Version}), ${misc:Depends}
+Depends: libxft1 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: FreeType-based font drawing library for X (version 1, unstripped)
@@ -428,7 +428,7 @@
 Package: libxi6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System Input extension library
@@ -439,7 +439,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxi6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxi6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System Input extension library (unstripped)
@@ -456,7 +456,7 @@
 Package: libxi-dev
 Section: libdevel
 Architecture: any
-Depends: libxi6 (= ${Source-Version}), x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxi6 (= ${Source-Version}), xfree86-common, x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0), libx11-dev (<< 4.3.0.dfsg.1-3)
 Replaces: xlibs-dev (<< 4.3.0), libx11-dev (<< 4.3.0.dfsg.1-3)
 Description: X Window System Input extension library development files
@@ -472,7 +472,7 @@
 Package: libxmu6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System miscellaneous utility library
@@ -483,7 +483,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxmu6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxmu6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System miscellaneous utility library (unstripped)
@@ -500,7 +500,7 @@
 Package: libxmu-dev
 Section: libdevel
 Architecture: any
-Depends: libxmu6 (= ${Source-Version}), x-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxmu6 (= ${Source-Version}), xfree86-common, x-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System miscellaneous utility library development files
@@ -512,7 +512,7 @@
 Package: libxmuu1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: lightweight X Window System miscellaneous utility library
@@ -528,7 +528,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxmuu1 (= ${Source-Version}), ${misc:Depends}
+Depends: libxmuu1 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: lightweight X Window System miscellaneous utility library (unstripped)
@@ -545,7 +545,7 @@
 Package: libxmuu-dev
 Section: libdevel
 Architecture: any
-Depends: libxmuu1 (= ${Source-Version}), libx11-dev, libc6-dev | libc-dev
+Depends: libxmuu1 (= ${Source-Version}), xfree86-common, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: lightweight X Window System miscellaneous utility library development files
@@ -558,7 +558,7 @@
 Package: libxp6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System printing extension library
@@ -569,7 +569,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxp6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxp6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System printing extension library (unstripped)
@@ -586,7 +586,7 @@
 Package: libxp-dev
 Section: libdevel
 Architecture: any
-Depends: libxp6 (= ${Source-Version}), x-dev, xlibs-static-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxp6 (= ${Source-Version}), xfree86-common, x-dev, xlibs-static-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System printing extension library development files
@@ -598,7 +598,7 @@
 Package: libxpm4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X pixmap library
@@ -613,7 +613,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxpm4 (= ${Source-Version}), ${misc:Depends}
+Depends: libxpm4 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X pixmap library (unstripped)
@@ -630,7 +630,7 @@
 Package: libxpm-dev
 Section: libdevel
 Architecture: any
-Depends: libxpm4 (= ${Source-Version}), libx11-dev, libc6-dev | libc-dev
+Depends: libxpm4 (= ${Source-Version}), xfree86-common, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X pixmap library development files
@@ -642,7 +642,7 @@
 Package: libxrandr2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Description: X Window System Resize, Rotate and Reflection extension library
  libXrandr provides an X Window System client interface to the root window
  resizing, rotation, and reflection ("R and R") extension to the X protocol.
@@ -656,7 +656,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxrandr2 (= ${Source-Version}), ${misc:Depends}
+Depends: libxrandr2 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Description: X Window System Resize, Rotate and Reflection extension library (unstripped)
  This package is useful to provide a backtrace with symbol names in a
  debugger; this facilitates interpretation of core dumps, and aids in finding
@@ -671,7 +671,7 @@
 Package: libxrandr-dev
 Section: libdevel
 Architecture: any
-Depends: libxrandr2 (= ${Source-Version}), x-dev, libxrender-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxrandr2 (= ${Source-Version}), xfree86-common, x-dev, libxrender-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System Resize, Rotate and Reflection extension library development files
@@ -683,7 +683,7 @@
 Package: libxt6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Toolkit Intrinsics
@@ -697,7 +697,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxt6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxt6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Toolkit Intrinsics (unstripped)
@@ -714,7 +714,7 @@
 Package: libxt-dev
 Section: libdevel
 Architecture: any
-Depends: libxt6 (= ${Source-Version}), x-dev, libx11-dev, libsm-dev, libice-dev, libc6-dev | libc-dev
+Depends: libxt6 (= ${Source-Version}), xfree86-common, x-dev, libx11-dev, libsm-dev, libice-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Toolkit Intrinsics development files
@@ -726,7 +726,7 @@
 Package: libxtrap6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System protocol-trapping extension library
@@ -738,7 +738,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxtrap6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxtrap6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System protocol-trapping extension library (unstripped)
@@ -755,7 +755,7 @@
 Package: libxtrap-dev
 Section: libdevel
 Architecture: any
-Depends: libxtrap6 (= ${Source-Version}), x-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxtrap6 (= ${Source-Version}), xfree86-common, x-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System protocol-trapping extension library development files
@@ -767,7 +767,7 @@
 Package: libxtst6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System event recording and testing extension library
@@ -779,7 +779,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxtst6 (= ${Source-Version}), ${misc:Depends}
+Depends: libxtst6 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibs-dbg (<< 4.3.0)
 Replaces: xlibs-dbg (<< 4.3.0)
 Description: X Window System event recording and testing extension library (unstripped)
@@ -796,7 +796,7 @@
 Package: libxtst-dev
 Section: libdevel
 Architecture: any
-Depends: libxtst6 (= ${Source-Version}), x-dev, libxext-dev, libxi-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxtst6 (= ${Source-Version}), xfree86-common, x-dev, libxext-dev, libxi-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: X Window System event recording and testing extension library development files
@@ -808,7 +808,7 @@
 Package: libxv1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Description: X Window System video extension library
  libXv provides an X Window System client interface to XVideo, the real-time
  video extension to the X protocol.
@@ -817,7 +817,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libxv1 (= ${Source-Version}), ${misc:Depends}
+Depends: libxv1 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Description: X Window System video extension library (unstripped)
  This package is useful to provide a backtrace with symbol names in a
  debugger; this facilitates interpretation of core dumps, and aids in finding
@@ -834,7 +834,7 @@
 Architecture: any
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
-Depends: libxv1 (= ${Source-Version}), x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: libxv1 (= ${Source-Version}), xfree86-common, x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Description: X Window System video extension library development files
  Header files and a static version of the Xv library are provided by this
  package.
@@ -844,6 +844,7 @@
 Package: pm-dev
 Section: libdevel
 Architecture: all
+Depends: xfree86-common
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
 Description: proxy management protocol development files
@@ -856,7 +857,7 @@
 
 Package: proxymngr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xproxy
 Replaces: xproxy, xbase (<< 3.3.2.3a-2)
 Description: X proxy services manager
@@ -866,7 +867,7 @@
 
 Package: twm
 Architecture: any
-Depends: menu (>> 1.5), ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, menu (>> 1.5), ${shlibs:Depends}, ${misc:Depends}
 Replaces: xbase (<< 3.3.2.3a-2)
 Provides: x-window-manager
 Description: Tab window manager
@@ -877,6 +878,7 @@
 
 Package: x-dev
 Section: libdevel
+Depends: xfree86-common
 Architecture: all
 Conflicts: xlibs-dev (<< 4.3.0)
 Replaces: xlibs-dev (<< 4.3.0)
@@ -888,7 +890,7 @@
 
 Package: xbase-clients
 Architecture: any
-Depends: cpp, xlibs, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, cpp, xlibs, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin, xlibs (<< 4.3.0), cpp-3.3 (<< 1:3.3.3-0pre1)
 Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<< 4.0), xutils (<< 4.3.0.dfsg.1-7), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
 Provides: xmodmap, xcontrib, xpm-bin, xsm
@@ -991,7 +993,7 @@
 
 Package: xdm
 Architecture: any
-Depends: debconf (>= 1.2.9), xbase-clients, cpp, libpam-modules, libpam-runtime (>= 0.76-13.1), ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, debconf (>= 1.2.9), xbase-clients, cpp, libpam-modules, libpam-runtime (>= 0.76-13.1), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
 Suggests: xutils
 Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
@@ -1015,7 +1017,7 @@
 
 Package: xfonts-100dpi
 Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs | xserver
 Replaces: xfnt100
 Provides: xfnt100
@@ -1039,7 +1041,7 @@
 
 Package: xfonts-100dpi-transcoded
 Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs | xserver
 Conflicts: xbase-clients (<< 4.0), xfonts-biznet-iso-8859-2-100dpi (<< 3.0.0-10)
 Replaces: xfonts-100dpi (<< 4.1.0), xfnt100
@@ -1062,7 +1064,7 @@
 
 Package: xfonts-75dpi
 Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs | xserver
 Replaces: xfnt75
 Provides: xfnt75
@@ -1086,7 +1088,7 @@
 
 Package: xfonts-75dpi-transcoded
 Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs | xserver
 Conflicts: xbase-clients (<< 4.0), xfonts-biznet-iso-8859-2-75dpi (<< 3.0.0-10)
 Replaces: xfonts-75dpi (<< 4.1.0), xfnt75
@@ -1111,7 +1113,7 @@
 Architecture: all
 Replaces: xfntbase, xfntbig, xfonts-cjk
 Provides: xfntbase, xfntbig, xfonts-cjk
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs, xserver
 Conflicts: xfntbase, xfonts-cjk, xbase-clients (<< 4.0)
 Description: standard fonts for X
@@ -1137,7 +1139,7 @@
 
 Package: xfonts-base-transcoded
 Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs, xserver
 Conflicts: xbase-clients (<< 4.0), xfonts-biznet-iso-8859-2-base (<< 3.0.0-10)
 Replaces: xfonts-base (<< 4.1.0), xfntbase
@@ -1157,7 +1159,7 @@
 Architecture: all
 Replaces: xfntcyr
 Provides: xfntcyr
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs | xserver
 Conflicts: xfntcyr, xbase-clients (<< 4.0)
 Description: Cyrillic fonts for X
@@ -1172,7 +1174,7 @@
 Architecture: all
 Replaces: xfntscl
 Provides: xfntscl
-Depends: xutils (>> 4.0.3)
+Depends: xfree86-common, xutils (>> 4.0.3)
 Suggests: xfs | xserver
 Conflicts: xfntscl, xbase-clients (<< 4.0)
 Description: scalable fonts for X
@@ -1223,7 +1225,7 @@
 
 Package: xfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-base, xfonts-scalable
 Replaces: xbase (<< 3.3.2.3a-2)
 Description: X font server
@@ -1238,7 +1240,7 @@
 
 Package: xfwp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Recommends: proxymngr
 Conflicts: xproxy
 Replaces: xproxy, xbase (<< 3.3.2.3a-2)
@@ -1255,7 +1257,7 @@
 
 Package: xlibmesa-dri
 Architecture: alpha amd64 i386 ia64 powerpc sparc
-Depends: xlibmesa-gl
+Depends: xfree86-common, xlibmesa-gl
 Suggests: libglide3
 Conflicts: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
 Replaces: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
@@ -1273,7 +1275,7 @@
 
 Package: xlibmesa-dri-dbg
 Architecture: alpha amd64 i386 ia64 powerpc sparc
-Depends: xlibmesa-dri (= ${Source-Version})
+Depends: xlibmesa-dri (= ${Source-Version}), xfree86-common
 Conflicts: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
 Replaces: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
 Description: Mesa 3D graphics library modules (unstripped) [XFree86]
@@ -1288,7 +1290,7 @@
 Package: xlibmesa-gl
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Suggests: xlibmesa-dri
 Conflicts: libgl1, libutahglx1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
 Provides: libgl1
@@ -1308,7 +1310,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: xlibmesa-gl (= ${Source-Version}), ${misc:Depends}
+Depends: xlibmesa-gl (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-gl-dbg
 Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-gl-dbg
 Description: Mesa 3D graphics library (unstripped) [XFree86]
@@ -1325,7 +1327,7 @@
 Package: xlibmesa-gl-dev
 Section: libdevel
 Architecture: any
-Depends: xlibmesa-gl (= ${Source-Version}), x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
+Depends: xlibmesa-gl (= ${Source-Version}), xfree86-common, x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
 Conflicts: libgl-dev, libutahglx-dev, xlibmesa-dev (<< 4.2.1-5)
 Provides: libgl-dev
 Replaces: libgl-dev, libutahglx-dev, xlibmesa-dev (<< 4.2.1-5)
@@ -1338,7 +1340,7 @@
 Package: xlibmesa-glu
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu
 Provides: libglu1
 Replaces: libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu
@@ -1359,7 +1361,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: xlibmesa-gl (= ${Source-Version}), ${misc:Depends}
+Depends: xlibmesa-gl (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg
 Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg
 Description: Mesa OpenGL utility library (unstripped) [XFree86]
@@ -1376,7 +1378,7 @@
 Package: xlibmesa-glu-dev
 Section: libdevel
 Architecture: any
-Depends: xlibmesa-glu (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libstdc++5-dev | libstdc++-dev, libc6-dev | libc-dev
+Depends: xlibmesa-glu (= ${Source-Version}), xfree86-common, xlibmesa-gl-dev | libgl-dev, libstdc++5-dev | libstdc++-dev, libc6-dev | libc-dev
 Conflicts: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5)
 Provides: libglu-dev
 Replaces: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5)
@@ -1389,7 +1391,7 @@
 Package: xlibosmesa4
 Section: libs
 Architecture: alpha amd64 i386 ia64 powerpc sparc
-Depends: xlibmesa-gl (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: xlibmesa-gl (= ${Source-Version}), xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Description: Mesa off-screen rendering library [XFree86]
  Mesa is a 3D graphics library which presents an API intended to be compatible
  with OpenGL.  XFree86 maintains its own version of the Mesa library (which is
@@ -1408,7 +1410,7 @@
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc
-Depends: xlibosmesa4 (= ${Source-Version}), ${misc:Depends}
+Depends: xlibosmesa4 (= ${Source-Version}), xfree86-common, ${misc:Depends}
 Description: Mesa off-screen rendering library (unstripped) [XFree86]
  This package is useful to provide a backtrace with symbol names in a
  debugger; this facilitates interpretation of core dumps, and aids in finding
@@ -1423,7 +1425,7 @@
 Package: xlibosmesa-dev
 Section: libdevel
 Architecture: alpha amd64 i386 ia64 powerpc sparc
-Depends: xlibosmesa4 (= ${Source-Version}), xlibmesa-gl-dev (= ${Source-Version}), libc6-dev | libc-dev
+Depends: xlibosmesa4 (= ${Source-Version}), xlibmesa-gl-dev (= ${Source-Version}), xfree86-common, libc6-dev | libc-dev
 Description: Mesa off-screen rendering library development files [XFree86]
  xlibosmesa-dev provides static versions of the libraries provided in
  xlibosmesa4, as well as header files and manual pages.
@@ -1453,6 +1455,7 @@
 Section: libs
 Priority: optional
 Architecture: all
+Depends: xfree86-common
 Conflicts: xlibs (<< 4.3.0), xbase-clients (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System client data
@@ -1466,7 +1469,7 @@
 Package: xlibs-static-dev
 Section: libdevel
 Architecture: any
-Depends: x-dev, libxext-dev, libxv-dev, libx11-dev, zlib1g-dev | libz-dev, libc6-dev | libc-dev
+Depends: xfree86-common, x-dev, libxext-dev, libxv-dev, libx11-dev, zlib1g-dev | libz-dev, libc6-dev | libc-dev
 Suggests: xspecs
 Conflicts: xdevel, xlib6g-dev (<< 4.0), xlib6g-static, xpm4g-dev, xmanpages, libxfont-xtt-dev
 Replaces: xbase (<< 3.3.2.3a-2), xdevel, xpm4g-dev, xmanpages, xlib6g-dev (<< 4.0), xlib6g-static, libxfont-xtt-dev, xfs-xtt (<< 1:1.3.0.1-15)
@@ -1523,7 +1526,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: xlibs-static-dev (= ${Source-Version}), libxext-dev, libxv-dev, libx11-dev, zlib1g-dev | libz-dev, libc6-dev | libc-dev
+Depends: xlibs-static-dev (= ${Source-Version}), xfree86-common, libxext-dev, libxv-dev, libx11-dev, zlib1g-dev | libz-dev, libc6-dev | libc-dev
 Conflicts: xlibs-pic (<< 4.3.0)
 Replaces: xlibs-pic (<< 4.3.0)
 Description: X Window System client extension library PIC archives
@@ -1541,7 +1544,7 @@
 Priority: extra
 Section: mail
 Architecture: any
-Depends: nmh | mh, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, nmh | mh, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
 Replaces: xbase (<< 3.3.2.3a-2)
 Description: X interface to the MH mail system
  xmh provides a graphical user interface to the MH (Message Handler) mail
@@ -1553,7 +1556,7 @@
 
 Package: xnest
 Architecture: any
-Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, xserver-common, ${shlibs:Depends}, ${misc:Depends}
 Replaces: xbase (<< 3.3.2.1-1)
 Description: nested X server
  Xnest is an X server that is itself an X client.  This allows you to run a
@@ -1587,7 +1590,7 @@
 
 Package: xserver-xfree86
 Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
 Suggests: discover, mdetect, read-edid, libglide2 (>> 2001.01.26)
 Conflicts: libxfont-xtt
 Replaces: xserver-common (<< 4.0), libxfont-xtt
@@ -1621,7 +1624,7 @@
 Package: xserver-xfree86-dbg
 Priority: extra
 Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
 Recommends: xserver-xfree86
 Suggests: discover, mdetect, read-edid
 Conflicts: libxfont-xtt
@@ -1704,7 +1707,7 @@
 
 Package: xterm
 Architecture: any
-Depends: xlibs-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
 Recommends: xutils
 Suggests: xfonts-cyrillic
 Conflicts: xbase (<< 3.3.2.3a-2), suidmanager (<< 0.50)
@@ -1796,7 +1799,7 @@
 
 Package: xvfb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common, ${shlibs:Depends}, ${misc:Depends}
 Suggests: xbase-clients
 Replaces: xbase (<< 3.3.2.1-2)
 Description: virtual framebuffer X server



Reply to: