← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xorg/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2014-10-09 11:55:01 UTC
  • Revision ID: package-import@ubuntu.com-20141009115501-zbpl0rfzoghi33pw
Tags: 1:7.7+1ubuntu8.1
Fixup the xorg packages to work correctly with the renamed lts stack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/control
34
34
Architecture: any
35
35
Depends:
36
36
 xserver-xorg-core (>= 2:1.11) | xserver-xorg-core-omap-revert [armhf],
37
 
 xserver-xorg-video-all  | xserver-xorg-video-omap-revert [armhf] | xorg-driver-video,
38
 
 xserver-xorg-input-all | xorg-driver-input,
39
 
 xserver-xorg-input-evdev [linux-any],
 
37
 xserver-xorg-video-all (>= 0~) | xorg-driver-video,
 
38
 xserver-xorg-input-all (>= 0~) | xorg-driver-input,
 
39
 xserver-xorg-input-evdev (>= 0~) [linux-any],
40
40
 hal (>= 0.5.14-4~) [kfreebsd-any],
41
41
 ${shlibs:Depends},
42
42
 ${misc:Depends},
44
44
 x11-xkb-utils
45
45
Recommends:
46
46
 libgl1-mesa-dri,
47
 
Provides: xserver
 
47
Provides:
 
48
 xserver-xorg-renamed,
 
49
 xserver,
 
50
Replaces:
 
51
 xserver-xorg-renamed,
 
52
 xorg-renamed-package,
 
53
Conflicts:
 
54
 xserver-xorg-renamed,
 
55
 xorg-renamed-package,
48
56
Description: X.Org X server
49
57
 This package depends on the full suite of the server and drivers for the
50
58
 X.Org X server.  It does not provide the actual server itself.
78
86
Package: xorg
79
87
Architecture: any
80
88
Depends:
81
 
 xserver-xorg (>= ${binary:Version}),
 
89
 xserver-xorg (>= ${binary:Version}) | xserver-xorg-renamed,
82
90
 libgl1-mesa-glx | libgl1 [!armhf],
83
91
 libgl1-mesa-dri [!armhf],
84
92
 libglu1-mesa [!armhf],