diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-03-12 14:47:57 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-03-12 14:47:57 +0100 |
| commit | b8ca03a253b1f13fa2d6860560ad7c2da25dccf5 (patch) | |
| tree | 8a8089ac855bbba5ae15216f685850a853ded7cc | |
| parent | d9f1f22fae96ecfdd31b3e46ff16ffb79f3fd31e (diff) | |
| download | embtoolkit-b8ca03a253b1f13fa2d6860560ad7c2da25dccf5.tar.gz embtoolkit-b8ca03a253b1f13fa2d6860560ad7c2da25dccf5.tar.bz2 embtoolkit-b8ca03a253b1f13fa2d6860560ad7c2da25dccf5.tar.xz | |
Packages: xkeyboard-config: add xkeyboard-config-2.1 and convert to use install macros
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | packages/x11/xkeyboardconfig/xkeyboardconfig.kconfig | 24 | ||||
| -rw-r--r-- | packages/x11/xkeyboardconfig/xkeyboardconfig.mk | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.kconfig b/packages/x11/xkeyboardconfig/xkeyboardconfig.kconfig index 329540d..bef6f5a 100644 --- a/packages/x11/xkeyboardconfig/xkeyboardconfig.kconfig +++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.kconfig @@ -2,18 +2,19 @@ # Embtoolkit # Copyright(C) 2010-2011 GAYE Abdoulaye Walsimou. All rights reserved. # -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License -# (Version 2 or later) published by the Free Software Foundation. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ################################################################################ # # \file xkeyboardconfig.kconfig @@ -34,12 +35,15 @@ choice help Here you can choose which version of xkeyboardconfig you want to use. + config EMBTK_XKEYBOARDCONFIG_VERSION_2_1 + bool "xkeyboard-config-2.1" config EMBTK_XKEYBOARDCONFIG_VERSION_1_8 bool "xkeyboard-config-1.8" endchoice config EMBTK_XKEYBOARDCONFIG_VERSION_STRING string + default "2.1" if EMBTK_XKEYBOARDCONFIG_VERSION_2_1 default "1.8" if EMBTK_XKEYBOARDCONFIG_VERSION_1_8 config EMBTK_XKEYBOARDCONFIG_NEED_PATCH diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk index 7ca4f40..06a9160 100644 --- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk +++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk @@ -25,7 +25,7 @@ XKEYBOARDCONFIG_NAME := xkeyboard-config XKEYBOARDCONFIG_VERSION := $(call EMBTK_GET_PKG_VERSION,XKEYBOARDCONFIG) -XKEYBOARDCONFIG_SITE := http://xlibs.freedesktop.org/xkbdesc +XKEYBOARDCONFIG_SITE := http://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARDCONFIG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror XKEYBOARDCONFIG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xkeyboard-config/$(XKEYBOARDCONFIG_VERSION) XKEYBOARDCONFIG_PACKAGE := xkeyboard-config-$(XKEYBOARDCONFIG_VERSION).tar.bz2 |