diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-07-19 00:15:00 +0200 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2011-07-19 00:15:00 +0200 |
| commit | 8b875e7d86d9887be51b2d88aeef1a740eeeba0e (patch) | |
| tree | b29d80d8918b0e553aed5caf213a64c5cbe15682 | |
| parent | ee36c142c37e114c442fcccf755cbda4dbbdd836 (diff) | |
Support upgrades from squeeze and to wheezy.debian-squeeze-backports
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6c06229cb..06e0735c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ xorg-server (2:1.10.3-1~bpo60+1) UNRELEASED; urgency=low * Rebuild for squeeze-backports. + * Support upgrades from squeeze and to wheezy: + - Remove all Breaks on libgl1-mesa-dri*, only needed when multiarch + support got added. + - Add Provides: xserver-xorg-core-no-multiarch to handle upgrades to + wheezy (which has multiarch support). -- Cyril Brulebois <kibi@debian.org> Tue, 19 Jul 2011 00:09:47 +0200 diff --git a/debian/control b/debian/control index 1ea69565c..5b5266cd7 100644 --- a/debian/control +++ b/debian/control @@ -111,12 +111,10 @@ Breaks: xserver-xorg-input-tslib (<= 0.0.6-3), xserver-xorg-input-vmmouse (<= 1:12.6.5-4), xserver-xorg-input-wacom (<= 0.10.5+20100415-1), - libgl1-mesa-dri (<< 7.10.2-4), - libgl1-mesa-dri-experimental (<< 7.10.2-4), - libgl1-mesa-dri-no-multiarch, Provides: ${videoabi}, ${inputabi}, + xserver-xorg-core-no-multiarch, Description: Xorg X server - core server The Xorg X server is an X server for several architectures and operating systems, which is derived from the XFree86 4.x series of X servers. |