deleted debian dir
Merge branch 'upstream'

Conflicts:
	debian/changelog
	debian/compat
	debian/control
	debian/rules
re-added debian dir