diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
| commit | fe6927d79e02d01cce20ecf56c8721fcadc2d278 (patch) | |
| tree | 7c8ae5a40c3e2cd7825097c06c87f01ab85a24f0 /xorg-server/xkbdata.src/symbols/macintosh_vndr | |
| parent | c035ec13d812ca609dd31590b86952f14394b5ec (diff) | |
| download | vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.gz vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.bz2 vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/xkbdata.src/symbols/macintosh_vndr')
4 files changed, 6 insertions, 11 deletions
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am index d409eff93..8a4ca9fc4 100644 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am +++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am @@ -2,7 +2,7 @@ symbolsdir = $(xkb_base)/symbols/macintosh_vndr dist_symbols_DATA = \ apple ch de dk \ -es fi fr \ +fi fr \ gb is it \ latam nl no pt \ se us diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in index 801f8ab0d..e4e5eb4e2 100644 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -166,7 +167,7 @@ xkb_rules_symlink = @xkb_rules_symlink@ symbolsdir = $(xkb_base)/symbols/macintosh_vndr dist_symbols_DATA = \ apple ch de dk \ -es fi fr \ +fi fr \ gb is it \ latam nl no pt \ se us @@ -183,9 +184,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/macintosh_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/macintosh_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/macintosh_vndr/Makefile + $(AUTOMAKE) --foreign symbols/macintosh_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es b/xorg-server/xkbdata.src/symbols/macintosh_vndr/es deleted file mode 100644 index 61f12498f..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es +++ /dev/null @@ -1,6 +0,0 @@ - -partial default alphanumeric_keys -xkb_symbols "basic" { - include "es" - name[Group1]= "Spain - Mac"; -}; diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile index 542b7a665..eb65d93a0 100644 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile +++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile @@ -6,7 +6,7 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\macintosh_vndr dist_symbols_DATA = \ apple ch de dk \ -es fi fr \ +fi fr \ gb is it \ latam nl no pt \ se us |