aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-15 19:15:06 -0400
committerJoey Hess <joey@kitenet.net>2011-06-15 19:15:06 -0400
commita695b5b2f8876873e934f8ad3410eb92be3c6fe1 (patch)
tree19ad212bcb1fed21efacc8bb8306adcd34906adc /debian
parente2b43578a677894d23fa526d9201e5a89b231abc (diff)
downloadikiwiki-a695b5b2f8876873e934f8ad3410eb92be3c6fe1.tar
ikiwiki-a695b5b2f8876873e934f8ad3410eb92be3c6fe1.tar.gz
updated jquery and made it its own underlay
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/copyright5
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 4fe011f4a..cb0ee6856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low
* userlist: New plugin, lets admins see a list of users and their info.
* aggregate: Improve checking for too long aggregated filenames.
+ * Updated to jQuery 1.6.1.
-- Joey Hess <joeyh@debian.org> Thu, 09 Jun 2011 10:06:44 -0400
diff --git a/debian/copyright b/debian/copyright
index 16e0b3583..0571bdf8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -203,8 +203,9 @@ Comment:
From http://code.google.com/p/openid-selector/
License: BSD-2-clause
-Files: underlays/openid-selector/ikiwiki/openid/jquery.js
-Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
+Files: underlays/jquery/*
+Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
+ © 2011 The Dojo Foundation
License: GPL-2
Files: underlays/attachments/ikiwiki/