aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-04-04 18:38:16 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-04-04 18:38:16 -0400
commit760e1009470d624b272020d5e4abc17483b23a33 (patch)
tree4047897a615277d9564d0a426dcba0653e4b0261 /debian
parent3fb4653d8a0824fb182da0346a7a80b282564cd5 (diff)
parent6a7eb63ca534bdad7ab13f840cdee33ea391d9bf (diff)
downloadikiwiki-760e1009470d624b272020d5e4abc17483b23a33.tar
ikiwiki-760e1009470d624b272020d5e4abc17483b23a33.tar.gz
Merge branch 'darcs'
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
-rw-r--r--debian/copyright10
2 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 781024146..bbc7e6f13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
ikiwiki (3.10) UNRELEASED; urgency=low
+ * darcs: Finally added support for this VCS, thanks to many
+ contributors:
+ - Thomas Schwinge wrote the original file, implementing only rcs_commit.
+ - Benjamin A'Lee contributed an alternative implementation.
+ - Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges.
+ - Simon Michael contributed multiple changes.
+ - Petr Ročkai fixed rcs_recentchanges.
+ - Sven M. Hallberg merged the above and added missing features.
* Add missing newline to Confirm Password prompt.
- -- Joey Hess <joeyh@debian.org> Sat, 04 Apr 2009 18:25:33 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 04 Apr 2009 17:47:36 -0400
ikiwiki (3.09) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 67f0ac540..5fc55f5c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,6 +32,16 @@ Files: tla.pm
Copyright: © 2006 Clint Adams <schizo@debian.org>
License: GPL-2+
+Files: darcs.pm
+Copyright:
+ © 2006 Thomas Schwinge <tschwinge@gnu.org>
+ 2007 Benjamin A'Lee <bma@bmalee.eu>
+ Tuomo Valkonen <tuomov@iki.fi>
+ 2008 Simon Michael <simon@joyful.com>
+ Petr Ročkai <me@mornfall.net>
+ Sven M. Hallberg <pesco@khjk.org>
+License: GPL-2+
+
Files: teximg.pm
Copyright: © 2007 Patrick Winnertz <patrick.winnertz@skolelinux.org>
License: GPL-2+