Set Debian package maintainer to Simon McVittie as I'm retiring from Debian.

Conflicts:
	debian/changelog
	debian/control

diff --git a/debian/changelog b/debian/changelog
index ce2ec060a09a2a5d3eabc5d0f39852bb2a5478fb..98b38d84bb9e1217d5df5867b182a611f725a411 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20120629.1) UNRELEASED; urgency=medium
+
+  * Set Debian package maintainer to Simon McVittie as I'm retiring from
+    Debian.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
+
 ikiwiki (3.20120629) unstable; urgency=low
 
   * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or

diff --git a/debian/control b/debian/control
index 9c6ab7ad989420c5fd1024a3ffd63c730ee7dc3d..c343d1a94dc3ed8b693674ec30e24cf614034b23 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libhtml-scrubber-perl, wdg-html-validator,
   libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),
   libfile-chdir-perl, libyaml-libyaml-perl, python-support
-Maintainer: Joey Hess <joeyh@debian.org>
+Maintainer: Simon McVittie <smcv@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.9.3
 Homepage: http://ikiwiki.info/