remove directories with clean
update-upstream target
fetch from upstream
Merge branch 'upstream'

Conflicts:
	pkg/debian/changelog
update version