Created attachment 102676 [details]
Patch to add ctrl_rwin_ctl option

Originally from http://bugs.debian.org/752680:

Apple keyboards, when the hid_apple kernel module is loaded with
swap_opt_cmd=1, have two modifier keys on the right side of the space bar:
<Alt> <Win>. Having a right-side windows key is not nearly as useful
as having a right-side control key, so the attached patch adds an option to swap
them with a new ctrl:rwin_rctl option. I couldn't figure out how to get this to work locally in a clean fashion without modifying this package.  

I also noticed that there were a bunch of missing ctrl: options from
rules/base, which seemed to prevent them from being used in setxkbmap
-option, so I fixed that too.

#55311 is similar, but is only useful when the hid_apple is loaded with the default options.