aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/copyright6
2 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f417c47a9ed5..d748d4a99a87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.37~rc5-1~experimental.4) UNRELEASED; urgency=low
+
+ [ Ben Hutchings ]
+ * debian/copyright: Add explanation of indirect linking of perf to
+ OpenSSL (Closes: #606520)
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sat, 11 Dec 2010 21:21:10 +0000
+
linux-2.6 (2.6.37~rc5-1~experimental.3) experimental; urgency=low
* Really apply patches added in the previous version
diff --git a/debian/copyright b/debian/copyright
index a90d707ea410..efbbc08639f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,4 +45,10 @@ License for the Xen interface headers:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+The 'perf' tool is dynamically linked with the Python interpreter,
+which is itself dynamically linked with OpenSSL, which is not
+GPL-compatible. However, since perf itself does not link with or use
+OpenSSL, we believe that this indirect linking does not require
+additional permissions beyond the GPL.
+
The Debian packaging is licensed under the GPL, see above.