r9188: sync packaging with SAMBA_3_0 tree