[jenkins-trilead-ssh2] 06/08: debian/copyright: Fixed the short name of the licenses
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 25 15:11:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jenkins-trilead-ssh2.
commit 8dd912af69d53a876d38405bbc1827b46159a67b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 25 16:58:06 2014 +0200
debian/copyright: Fixed the short name of the licenses
---
debian/changelog | 1 +
debian/copyright | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ccd58cf..75b510e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ jenkins-trilead-ssh2 (217-jenkins-6-1) UNRELEASED; urgency=medium
- Use canonical URLs for the Vcs-* fields
- Standards-Version updated to 3.9.6 (no changes)
* Switch to debhelper level 9
+ * debian/copyright: Fixed the short name of the licenses
-- Emmanuel Bourg <ebourg at apache.org> Thu, 25 Sep 2014 16:44:41 +0200
diff --git a/debian/copyright b/debian/copyright
index 4092d9b..162fb55 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Copyright: 2007-2008 Trilead AG (http://www.trilead.com)
2005 - 2006 Swiss Federal Institute of Technology (ETH Zurich),
Department of Computer Science (http://www.inf.ethz.ch),
Christian Plattner. All rights reserved.
-License: BSD
+License: BSD-3-clause
Files: src/com/trilead/ssh2/crypto/cipher/BlowFish.java
src/com/trilead/ssh2/crypto/cipher/DES.java
@@ -20,7 +20,7 @@ License: MIT
Files: src/com/trilead/ssh2/crypto/digest/MD5.java
Copyright: 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved.
2007 Christian Plattner
-License: MD5 license
+License: MD5-license
License to copy and use this software is granted provided that it is
identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in
all material mentioning or referencing this software or this function.
@@ -40,9 +40,9 @@ License: MD5 license
Files: debian/*
Copyright: 2010, Canonical Ltd (http://www.canonical.com)
-License: BSD
+License: BSD-3-clause
-License: BSD
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-trilead-ssh2.git
More information about the pkg-java-commits
mailing list