diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-16 19:17:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-16 19:17:18 -0400 |
| commit | 184f68efa88d6b8b4763ca18619b25e7d8ae1668 (patch) | |
| tree | a9b27047c49246c694b1c465a05c15fe2dba81d5 /debian | |
| parent | eff5e233a2a3bf5e965c17734a3ad765c5fe9df5 (diff) | |
| parent | bc32754f1f1ca334078f788a346c27839e245cab (diff) | |
Merge branch 'themes'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/copyright | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 1f350912e..0d49df676 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low * git: Gix --gettime to properly support utf8 filenames. * attachment: Support Windows paths when taking basename of client-supplied file name. + * theme: New plugin, allows easily theming a site via the underlay. -- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400 diff --git a/debian/copyright b/debian/copyright index 7ef266151..72394eadc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -202,6 +202,14 @@ Files: underlays/openid-selector/ikiwiki/openid/jquery.js Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer License: GPL-2 +Files: underlays/themes/bzed/* +Copyright: + © 2009,2010 Bernd Zeimetz + © 2008 Yahoo! Inc. +License: GPL-2+ + Parts derived from BSD-C3 licensed YUI library. + http://developer.yahoo.com/yui/license.html + License: BSD-C2 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions |