* Merge from debian unstable, remaining changes: - patches/20_add_debdiff_as_diff_type.dpatch: Also recognize .dpatch files as diff's - debian/geany.xpm: Replace icon with a .xpm of the new one - Modify Maintainer value to match the DebianMaintainerField specification.