diff options
| author | Julien Cristau <jcristau@debian.org> | 2007-09-04 17:38:25 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2007-09-04 17:38:25 +0200 |
| commit | d577a9e60f2a88e33ec4320b282e08aba610ee0a (patch) | |
| tree | f71e2ac3495bb5ed0242910feca4479c9301ca50 | |
| parent | 755a6beef8ac6cc8baa7e4283164c215aba35a29 (diff) | |
Bump video abi and serverminver.xorg-server-2_1.3.99.2-1
Also drop obsolete conflict with fglrx-driver.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/serverminver | 2 | ||||
| -rw-r--r-- | debian/videoabiver | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 04a7a5dfc..81088068d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,11 @@ xorg-server (2:1.3.99.2-1) experimental; urgency=low [ Julien Cristau ] * New upstream release candidate. + bump build dep on renderproto to >= 0.9.3, and on pixman to >= 0.9.4-2. + + bump video abi version and serverminver. + * Drop the Conflict on fglrx-driver, which is taken care of by the abi + version. - -- Julien Cristau <jcristau@debian.org> Mon, 03 Sep 2007 19:12:19 +0200 + -- Julien Cristau <jcristau@debian.org> Tue, 04 Sep 2007 17:32:19 +0200 xorg-server (2:1.3.99.0-2) experimental; urgency=low diff --git a/debian/control b/debian/control index 742e27280..31730bc72 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ Architecture: any Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg 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, fglrx-driver, xserver-xorg-video-1.0, xserver-xorg-input +Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input, xserver-xorg-video-1.9 Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common Provides: xserver Description: X.Org X server -- core server diff --git a/debian/serverminver b/debian/serverminver index 65e58bb86..55e3c24a2 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1 +1 @@ -2:1.3.99.0 +2:1.3.99.2 diff --git a/debian/videoabiver b/debian/videoabiver index 2e0e38c63..3e9926483 100644 --- a/debian/videoabiver +++ b/debian/videoabiver @@ -1 +1 @@ -1.9 +1.99 |