Update Vcs-Browser field.
Update Standards-Version to 3.9.5.
Imported Upstream version 2.6.0
Merge tag 'upstream/2.6.0'

Upstream version 2.6.0
Drop patches that have been merged upstream.
Refresh patches.
Update Debian changelog.
U05-make-xlock-optional.diff has been rejected upstream.
Shuffle patches around.
Make x-terminal-emulator optional, too.