diff options
author | Treeve Jelbert | 2013-11-29 14:12:17 +0100 |
---|---|---|
committer | Treeve Jelbert | 2013-11-29 14:12:17 +0100 |
commit | 449767b3b741742a3383c5d6bb4ed5930e5051c9 (patch) | |
tree | eec002cb24b60d0542c0312f036807b2e92e94dd /xorg-data | |
parent | 4a7d5a57c12f98a9f450f80f87a4ee393f4962df (diff) | |
parent | 0019e392d9a5427fa2007bd795a5a0ef0b3882ce (diff) |
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts:
xorg-app/xkbcomp/DETAILS
xorg-data/xkeyboard-config/DETAILS
xorg-data/xkeyboard-config/HISTORY
xorg-lib/libx11/DETAILS
xorg-lib/libx11/HISTORY
Diffstat (limited to 'xorg-data')
-rwxr-xr-x | xorg-data/xkeyboard-config/DETAILS | 4 | ||||
-rw-r--r-- | xorg-data/xkeyboard-config/HISTORY | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/xorg-data/xkeyboard-config/DETAILS b/xorg-data/xkeyboard-config/DETAILS index 0171af7f18..5d583821ae 100755 --- a/xorg-data/xkeyboard-config/DETAILS +++ b/xorg-data/xkeyboard-config/DETAILS @@ -1,10 +1,8 @@ SPELL=xkeyboard-config VERSION=2.10.1 SOURCE_HASH=sha512:e21927e365f4742d710bf414c312a9bcaf46d881ee274f1baa0a288339477fa8aa24c338473f96ec658133205f21db43d1737d6c59c77999344244c43cff1be2 -# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME" SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_URL[0]=http://xorg.freedesktop.org/archive/individual/data/$SPELL/$SOURCE - SOURCE_URL[1]=http://people.freedesktop.org/~svu/$SOURCE + SOURCE_URL[0]=http://www.x.org/releases/individual/data/$SPELL/$SOURCE SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://xorg.freedesktop.org/ ENTERED=20051125 diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY index d64757864b..5536ce009b 100644 --- a/xorg-data/xkeyboard-config/HISTORY +++ b/xorg-data/xkeyboard-config/HISTORY @@ -1,6 +1,12 @@ +2013-11-23 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: Fixed SOURCE_URL[0] + 2013-10-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.10.1 +2011-08-19 Bor Kraljič <pyrobor@ver.si> + * BUILD: commented unrecognized option (issue #30) + 2013-05-29 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.9 |