Merged r6216:6221 from features/deb into trunk. Work-in-progress on Debian package generation; merging now to avoid file substitution issues in Subversion as deleted files are reintroduced.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6222 221aa14e-8319-0410-a670-987f0aec2ac5