diff options
| author | Treeve Jelbert | 2014-09-25 18:49:15 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2014-09-25 18:49:15 +0200 |
| commit | 270abc29b86e857e7d92d0926a67cc7b97c45acc (patch) | |
| tree | 91762554b013870a249bcce9467cb921fcdfc12a /xorg-proto | |
| parent | bfb78bf3026408e88059939906f1231751703cf7 (diff) | |
| parent | accc9b812a427d80050c63a3a299089cd444a1c4 (diff) | |
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts:
xorg-driver/xf86-video-ati/DEPENDS
xorg-driver/xf86-video-ati/HISTORY
xorg-lib/libxaw/HISTORY
xorg-lib/libxcb/DEPENDS
xorg-lib/libxcb/HISTORY
xorg-lib/libxcomposite/HISTORY
xorg-lib/libxcursor/HISTORY
xorg-lib/libxdamage/HISTORY
xorg-lib/libxext/HISTORY
xorg-lib/libxfixes/HISTORY
xorg-lib/libxft/HISTORY
xorg-lib/libxi/HISTORY
xorg-lib/libxinerama/HISTORY
xorg-lib/libxkbfile/HISTORY
xorg-lib/libxmu/HISTORY
xorg-lib/libxpm/HISTORY
xorg-lib/libxrandr/HISTORY
xorg-lib/libxrender/HISTORY
xorg-lib/libxres/HISTORY
xorg-lib/libxtst/HISTORY
xorg-lib/libxv/HISTORY
xorg-lib/libxvmc/HISTORY
xorg-lib/libxxf86dga/HISTORY
xorg-lib/libxxf86vm/HISTORY
xorg-proto/kbproto/DEPENDS
xorg-xserver/xorg-server/DEPENDS
Diffstat (limited to 'xorg-proto')
33 files changed, 33 insertions, 33 deletions
diff --git a/xorg-proto/applewmproto/DEPENDS b/xorg-proto/applewmproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/applewmproto/DEPENDS +++ b/xorg-proto/applewmproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/bigreqsproto/DEPENDS b/xorg-proto/bigreqsproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/bigreqsproto/DEPENDS +++ b/xorg-proto/bigreqsproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/compositeproto/DEPENDS b/xorg-proto/compositeproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/compositeproto/DEPENDS +++ b/xorg-proto/compositeproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/damageproto/DEPENDS b/xorg-proto/damageproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/damageproto/DEPENDS +++ b/xorg-proto/damageproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/dmxproto/DEPENDS b/xorg-proto/dmxproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/dmxproto/DEPENDS +++ b/xorg-proto/dmxproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/dri2proto/DEPENDS b/xorg-proto/dri2proto/DEPENDS index bc6dc206ea..442c17fd3a 100755 --- a/xorg-proto/dri2proto/DEPENDS +++ b/xorg-proto/dri2proto/DEPENDS @@ -1,5 +1,5 @@ . $GRIMOIRE/FUNCTIONS depends util-macros && simple_version_check_force_depends util-macros 12 2 && -depends gawk +depends AWK diff --git a/xorg-proto/evieext/DEPENDS b/xorg-proto/evieext/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/evieext/DEPENDS +++ b/xorg-proto/evieext/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/fixesproto/DEPENDS b/xorg-proto/fixesproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/fixesproto/DEPENDS +++ b/xorg-proto/fixesproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/fontcacheproto/DEPENDS b/xorg-proto/fontcacheproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/fontcacheproto/DEPENDS +++ b/xorg-proto/fontcacheproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/fontsproto/DEPENDS b/xorg-proto/fontsproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/fontsproto/DEPENDS +++ b/xorg-proto/fontsproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/glproto/DEPENDS b/xorg-proto/glproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/glproto/DEPENDS +++ b/xorg-proto/glproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/inputproto/DEPENDS b/xorg-proto/inputproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/inputproto/DEPENDS +++ b/xorg-proto/inputproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/kbproto/DEPENDS b/xorg-proto/kbproto/DEPENDS index e3840bf546..1e9976edd2 100755 --- a/xorg-proto/kbproto/DEPENDS +++ b/xorg-proto/kbproto/DEPENDS @@ -1,3 +1,3 @@ depends util-macros && -depends gawk && +depends AWK && optional_depends xorg-sgml-doctools '' '' 'build documentation' diff --git a/xorg-proto/printproto/DEPENDS b/xorg-proto/printproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/printproto/DEPENDS +++ b/xorg-proto/printproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/randrproto/DEPENDS b/xorg-proto/randrproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/randrproto/DEPENDS +++ b/xorg-proto/randrproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/recordproto/DEPENDS b/xorg-proto/recordproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/recordproto/DEPENDS +++ b/xorg-proto/recordproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/renderproto/DEPENDS b/xorg-proto/renderproto/DEPENDS index 5d210d6a7e..8adbe8d775 100755 --- a/xorg-proto/renderproto/DEPENDS +++ b/xorg-proto/renderproto/DEPENDS @@ -1,3 +1,3 @@ depends xproto && depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/resourceproto/DEPENDS b/xorg-proto/resourceproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/resourceproto/DEPENDS +++ b/xorg-proto/resourceproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/scrnsaverproto/DEPENDS b/xorg-proto/scrnsaverproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/scrnsaverproto/DEPENDS +++ b/xorg-proto/scrnsaverproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/trapproto/DEPENDS b/xorg-proto/trapproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/trapproto/DEPENDS +++ b/xorg-proto/trapproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/videoproto/DEPENDS b/xorg-proto/videoproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/videoproto/DEPENDS +++ b/xorg-proto/videoproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/windowswmproto/DEPENDS b/xorg-proto/windowswmproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/windowswmproto/DEPENDS +++ b/xorg-proto/windowswmproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xcmiscproto/DEPENDS b/xorg-proto/xcmiscproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xcmiscproto/DEPENDS +++ b/xorg-proto/xcmiscproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xextproto/DEPENDS b/xorg-proto/xextproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xextproto/DEPENDS +++ b/xorg-proto/xextproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86bigfontproto/DEPENDS b/xorg-proto/xf86bigfontproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86bigfontproto/DEPENDS +++ b/xorg-proto/xf86bigfontproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86dgaproto/DEPENDS b/xorg-proto/xf86dgaproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86dgaproto/DEPENDS +++ b/xorg-proto/xf86dgaproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86driproto/DEPENDS b/xorg-proto/xf86driproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86driproto/DEPENDS +++ b/xorg-proto/xf86driproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86miscproto/DEPENDS b/xorg-proto/xf86miscproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86miscproto/DEPENDS +++ b/xorg-proto/xf86miscproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86rushproto/DEPENDS b/xorg-proto/xf86rushproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86rushproto/DEPENDS +++ b/xorg-proto/xf86rushproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xf86vidmodeproto/DEPENDS b/xorg-proto/xf86vidmodeproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xf86vidmodeproto/DEPENDS +++ b/xorg-proto/xf86vidmodeproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xineramaproto/DEPENDS b/xorg-proto/xineramaproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xineramaproto/DEPENDS +++ b/xorg-proto/xineramaproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xproto/DEPENDS b/xorg-proto/xproto/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xproto/DEPENDS +++ b/xorg-proto/xproto/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK diff --git a/xorg-proto/xproxymanagementprotocol/DEPENDS b/xorg-proto/xproxymanagementprotocol/DEPENDS index 18ecac596e..e585ab8892 100755 --- a/xorg-proto/xproxymanagementprotocol/DEPENDS +++ b/xorg-proto/xproxymanagementprotocol/DEPENDS @@ -1,2 +1,2 @@ depends util-macros && -depends gawk +depends AWK |