GitLab

Fix getting branch type for debian branches with distribution

With rstrip we specify a set of characters to be removed.
We want to remove a substring hence the use of re.sub.
(rstrip produces wrong results in many cases)

Debian branches are searched with the following order:

-feature-X:
  * debian-feature-X-distro
  * debian-feature-X
  * debian-develop-distro
  * debian-develop

Conflicts:
	devflow/utils.py

Conflicts:
	version

Debian branch should always be named from the original branch, because
version should be corrected correctly. e.g. if making a package for
release-X, debian branch should be debian-release-X, and the
debian-release-X branch should point to debian-develop.

Get the type and not the name of the branch to check for correct
branch name.

* Debian tag should be derived from debian version
* Python tag will be the same for different debian revisions