diff options
| author | David Nusinow <dnusinow@debian.org> | 2007-02-28 21:48:47 -0500 |
|---|---|---|
| committer | David Nusinow <dnusinow@debian.org> | 2007-02-28 21:48:47 -0500 |
| commit | d5bda887becbcaf6174c93ced8a45db8a8661317 (patch) | |
| tree | 3d31c0e8d31e99530b4985f20d8bb615592fa794 | |
| parent | 3b1d2f9f0db0b3e74f14ad440ecac2090f14dc4a (diff) | |
Also replace xserver-common for the SecurityPolicy conflictxorg-server-2_1.1.1-19
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 6696d1e1c..7d4681a5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,12 @@ xorg-server (2:1.1.1-19) unstable; urgency=high (/usr/X11R6/lib/X11/fonts/Type1 not "/usr/X11R6/lib/ X11/fonts/Type1") [ David Nusinow ] - * Conflict with xserver-common, because that package used to provide the - SecurityPolicy file. This is an RC bugfix because it breaks upgrades, - so it gets a high urgency. Thanks Christian Tsotras and Lionel Elie Mamane - for reporting and it. Closes: #402658 + * Conflict with and replace xserver-common, because that package used to + provide the SecurityPolicy file. This is an RC bugfix because it breaks + upgrades, so it gets a high urgency. Thanks Christian Tsotras and Lionel + Elie Mamane for reporting and it. Closes: #402658 - -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 21:20:45 -0500 + -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 21:48:19 -0500 xorg-server (2:1.1.1-18) unstable; urgency=medium diff --git a/debian/control b/debian/control index cd1e8ec55..84a89d1f3 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xo Recommends: xkb-data, xfonts-base Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common -Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0) +Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common Provides: xserver Description: X.Org X server -- core server The X.Org X server is an X server for several architectures and operating |