1.694: ruby-2.0 packaging fixes