Please add the appropriate Conflicts/Replaces: jenkins-common Debian package headers so that the 'jenkins' package from http://pkg.jenkins-ci.org/debian can be used to upgrade from 'jenkins' in Ubuntu's primary repository.

Testing procedure:

• get a virtual machine running Ubuntu 12.04 or later (older releases did not have a 'jenkins' package)
• sudo apt-get install jenkins # this also pulls in jenkins-common etc.
• wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add -
• echo deb http://pkg.jenkins-ci.org/debian binary/ | sudo tee /etc/apt/sources.list.d/jenkins.list
• sudo apt-get update
• sudo apt-get dist-upgrade

Expected result:

• the 'jenkins' package from pkg.jenkins-ci.org replaces the jenkins/jenkins-common packages from Ubuntu

Actual result:

• dpkg: error processing /var/cache/apt/archives/jenkins_1.523_all.deb (--unpack): trying to overwrite '/usr/share/jenkins/jenkins.war', which is also in package jenkins-common 1.424.6+dfsg-1ubuntu0.1