Merge lp:~bregma/geis/flush-trunk-through-ci-train-to-ubuntu into lp:geis

[Stephen M. Webb]

include and acknowledge NMU from Matthias Klose

- acknowledge NMU from Matthias Klose
- flush trunk through the ci-train into ubuntu

[Stephen M. Webb (bregma)]

This is effectively a formalism to synch trunk with Ubuntu for the CI-train.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/geis-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-trusty-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/geis-ci/15/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-19 22:07:37 +0000
+++ debian/changelog	2014-03-03 15:40:41 +0000
@@ -1,3 +1,9 @@
+geis (2.2.16+13.10.20130919.4-0ubuntu2) trusty; urgency=medium
+
+  * Rename python-geis to python3-geis.
+
+ -- Matthias Klose <[e-mail]>  Wed, 19 Feb 2014 11:49:45 +0100
+
 geis (2.2.16+13.10.20130919.4-0ubuntu1) saucy; urgency=low
 
   [ Stephen M. Webb ]

=== modified file 'debian/control'
--- debian/control	2013-11-19 17:16:51 +0000
+++ debian/control	2014-03-03 15:40:41 +0000
@@ -56,7 +56,6 @@
 
 Package: python3-geis
 Section: python
-XB-Python-Version: ${python:Versions}
 Architecture: any
 Depends: ${misc:Depends},
          ${python3:Depends},