Add git-debian-tarball rule
Update Makefile
Update git-debian-tarball
Merge remote-tracking branch 'origin/upstream'