aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-08-30 11:55:59 -0400
committerJoey Hess <joey@kitenet.net>2012-08-30 11:57:20 -0400
commit150d2c09008d029f8fd85edc365966328ee73214 (patch)
treea99a4ceca74f4588fdbaead7423fe3bde569c73f
parent34923d1abb76ba3b367ad7ab9221b1d6c09ef439 (diff)
downloadikiwiki-150d2c09008d029f8fd85edc365966328ee73214.tar
ikiwiki-150d2c09008d029f8fd85edc365966328ee73214.tar.gz
update copyright and changelog
-rw-r--r--debian/changelog6
-rw-r--r--debian/copyright4
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c2c58861a..5aa937d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20120726) UNRELEASED; urgency=low
+
+ * monochrome: New theme, contributed by Jon Dowland.
+
+ -- Joey Hess <joeyh@debian.org> Thu, 30 Aug 2012 11:56:12 -0400
+
ikiwiki (3.20120725) unstable; urgency=low
* recentchangesdiff: When diffurl is not set, provide inline diffs
diff --git a/debian/copyright b/debian/copyright
index ee52c0eda..e1a81932b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -248,6 +248,10 @@ Files: underlays/themes/goldtype/*
Copyright: © Lars Wirzenius
License: GPL-2+
+Files: underlays/themes/monochrome/*
+Copyright: © 2012 Jon Dowland
+License: GPL-2+
+
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions