Merge branch 'rc'

* rc:
  Fix dependency on Java2 runtime for both Debian and Ubuntu
  [FIXED JENKINS-4047] not admin, should be adm.
  [FIXED JENKINS-8159] back to java-runtime

debian/debian/control

@@ -8,7 +8,7 @@ Homepage: https://jenkins-ci.org/
 
 Package: jenkins
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, daemon, adduser, psmisc, default-jre
+Depends: ${shlibs:Depends}, ${misc:Depends}, daemon, adduser, psmisc, java2-runtime
 Conflicts: hudson
 Replaces: hudson
 Description: Continuous integration system written in Java

debian/debian/jenkins.postinst

@@ -42,12 +42,12 @@ case "$1" in
         fi
       
         # directories needed for jenkins
-        chown jenkins:admin /var/lib/jenkins /var/log/jenkins
-        chmod 750           /var/lib/jenkins /var/log/jenkins
+        chown jenkins:adm /var/lib/jenkins /var/log/jenkins
+        chmod 750         /var/lib/jenkins /var/log/jenkins
 
         # make sure jenkins can delete everything in /var/run/jenkins to re-explode war
-        chown -R jenkins:admin /var/run/jenkins
-        chmod -R 750           /var/run/jenkins
+        chown -R jenkins:adm /var/run/jenkins
+        chmod -R 750         /var/run/jenkins
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)