aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/copyright2
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 03d871a5a..3f809a7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ikiwiki (2.13) UNRELEASED; urgency=low
* Add liblwpx-paranoidagent-perl to recommends of Debian package,
this is needed to do OpenID really securely.
+ * ikiwiki.setup is licensed same as the basewiki, not GPLed.
- -- Joey Hess <joeyh@debian.org> Tue, 13 Nov 2007 14:37:54 -0500
+ -- Joey Hess <joeyh@debian.org> Tue, 13 Nov 2007 16:03:46 -0500
ikiwiki (2.12) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 5ccbf9bf9..e6e164aca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ License: GPL-2+
The full text of the GPL is distributed as doc/GPL in ikiwiki's source,
and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
-Files: templates/*, underlays/basewiki/*
+Files: templates/*, underlays/basewiki/*, ikiwiki.setup
Copyright: © 2006-2007 Joey Hess <joey@ikiwiki.info>
License: other
Redistribution and use in source and compiled forms, with or without