[SCM] jenkins packaging branch, master, updated. debian/1.409.3+dfsg-1-1-g36217f1

James Page james.page at canonical.com
Tue Jan 10 22:50:59 UTC 2012


The following commit has been merged in the master branch:
commit 36217f1422add94968861ebe6ebbdd6c8857356e
Author: James Page <james.page at canonical.com>
Date:   Tue Jan 10 23:50:35 2012 +0100

    Update for missing copyright information and dependency not present in Debian

diff --git a/debian/control b/debian/control
index 4752eef..04b2a8b 100644
--- a/debian/control
+++ b/debian/control
@@ -204,7 +204,7 @@ Depends:
  ${jenkins-daemon-deps},
  default-jre-headless | java6-runtime-headless,
  ${misc:Depends}
-Recommends: jenkins-cli, ssh-import-id, ssh-server | openssh-server
+Recommends: jenkins-cli, ssh-server | openssh-server
 Description: Jenkins slave node helper
  Jenkins monitors executions of repeated jobs, such as building a software
  project or jobs run by cron. Among those things, current Jenkins focuses
diff --git a/debian/copyright b/debian/copyright
index 2345443..8ab3871 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -101,6 +101,10 @@ Copyright: 2004- Kohsuke Kawaguchi,
            2004- Sun Microsystems, Inc.
 License: CDDL
 
+Files: core/src/main/java/hudson/util/VersionNumber.java
+Copyright:
+License: CDDL or GPL-2
+
 Files: debian/*
 Copyright: 2011 Canonical Ltd (http://www.canonical.com)
 License: MIT
@@ -118,6 +122,10 @@ License: LGPL-2.1
   On Debian GNU/Linux system you can find the complete text of the
   LGPL-2.1 license in '/usr/share/common-licenses/LGPL-2.1'
 
+License: GPL-2
+  On Debian GNU/Linux system you can find the complete text of the
+  GPL-2 license in '/usr/share/common-licenses/GPL-2'
+
 License: MIT
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

-- 
jenkins packaging



More information about the pkg-java-commits mailing list