More packaging updates

Signed-off-by: Tom Swindell <t.swindell@rubyx.co.uk>
More packaging updates

Signed-off-by: Tom Swindell <t.swindell@rubyx.co.uk>