diff options
author | Eric Sandall | 2008-03-19 12:53:40 -0700 |
---|---|---|
committer | Eric Sandall | 2008-03-19 12:53:40 -0700 |
commit | e4dd6a3e0048aadc8ecbf23bd5945ba40da59537 (patch) | |
tree | 81cbe643a613a1e1b3456a20477ce2e95d801277 /xorg-data | |
parent | 665c1bbfc4abe3a716632c28e29eeb528308c835 (diff) | |
parent | 35d410a1481266f0d8e160cf14f413fc5e501cb9 (diff) |
Merge branch 'devel-xorg-modular' of ssh://scm.sourcemage.org/smgl/grimoire into xorg-modular
Conflicts:
xorg-app/compiz/HISTORY
xorg-app/luit/HISTORY
xorg-data/xkbdata/CONFLICTS
xorg-data/xkbdata/HISTORY
xorg-driver/xf86-input-acecad/HISTORY
xorg-driver/xf86-video-ati/HISTORY
xorg-driver/xf86-video-intel/HISTORY
xorg-driver/xf86-video-mga/HISTORY
xorg-driver/xf86-video-trident/HISTORY
xorg-lib/pixman/CONFLICTS
xorg-lib/pixman/HISTORY
Diffstat (limited to 'xorg-data')
-rwxr-xr-x | xorg-data/xkbdata/BUILD | 1 | ||||
-rwxr-xr-x | xorg-data/xkbdata/DEPENDS | 3 | ||||
-rwxr-xr-x | xorg-data/xkbdata/DETAILS | 7 | ||||
-rw-r--r-- | xorg-data/xkbdata/HISTORY | 4 | ||||
-rwxr-xr-x | xorg-data/xkbdata/INSTALL | 1 | ||||
-rwxr-xr-x | xorg-data/xkbdata/PRE_BUILD | 1 | ||||
-rwxr-xr-x | xorg-data/xkbdata/TRIGGERS | 1 |
7 files changed, 13 insertions, 5 deletions
diff --git a/xorg-data/xkbdata/BUILD b/xorg-data/xkbdata/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/xorg-data/xkbdata/BUILD @@ -0,0 +1 @@ +true diff --git a/xorg-data/xkbdata/DEPENDS b/xorg-data/xkbdata/DEPENDS index 7382800e7d..ccfe10cc79 100755 --- a/xorg-data/xkbdata/DEPENDS +++ b/xorg-data/xkbdata/DEPENDS @@ -1,2 +1 @@ -depends util-macros && -depends xkbcomp +depends xkeyboard-config diff --git a/xorg-data/xkbdata/DETAILS b/xorg-data/xkbdata/DETAILS index 7f818b3521..14ae9f01e6 100755 --- a/xorg-data/xkbdata/DETAILS +++ b/xorg-data/xkbdata/DETAILS @@ -2,13 +2,14 @@ PKG=xkbdata VERSION=1.0.1 XORG_VER=X11R7.0 - SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2 - SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/data/${SOURCE} - SOURCE_GPG="gurus.gpg:${SOURCE}.sig" +# SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2 +# SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/data/${SOURCE} +# SOURCE_GPG="gurus.gpg:${SOURCE}.sig" SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION} WEB_SITE=http://xorg.freedesktop.org ENTERED=20051125 UPDATED=20051125 + PATCHLEVEL=1 LICENSE[0]=XCL BUILD_API=2 SHORT="xkb data files for the X.Org server" diff --git a/xorg-data/xkbdata/HISTORY b/xorg-data/xkbdata/HISTORY index c01b707f0d..14ed0377cc 100644 --- a/xorg-data/xkbdata/HISTORY +++ b/xorg-data/xkbdata/HISTORY @@ -4,6 +4,10 @@ 2008-03-16 Eric Sandall <sandalle@sourcemage.org> * CONFLICTS: Auto-conflicts with all prior monolithic X providers +2008-02-10 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS, PRE_BUILD, BUILD, INSTALL, DEPENDS, TRIGGERS, CONFLICTS: + deprecated in favor of xkeyboard-config + 2007-08-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: update description & short (automated) diff --git a/xorg-data/xkbdata/INSTALL b/xorg-data/xkbdata/INSTALL new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/xorg-data/xkbdata/INSTALL @@ -0,0 +1 @@ +true diff --git a/xorg-data/xkbdata/PRE_BUILD b/xorg-data/xkbdata/PRE_BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/xorg-data/xkbdata/PRE_BUILD @@ -0,0 +1 @@ +true diff --git a/xorg-data/xkbdata/TRIGGERS b/xorg-data/xkbdata/TRIGGERS new file mode 100755 index 0000000000..035f5b2053 --- /dev/null +++ b/xorg-data/xkbdata/TRIGGERS @@ -0,0 +1 @@ +on_cast xkbdata dispel_self |