[PATCH] Merge packaging changes from Debian