Move patches specific to Debian packaging under debian/, and bug fixes that could go upstream belong under bugfix/. Put them in two separate groups in the series.