Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 02894877df30737281e6adc8ef0ff8cddd2f9665..0eea2dbcace60a2aabb44d959b26b26c9df51c71 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20160122) UNRELEASED; urgency=medium
+ikiwiki (3.20160506) unstable; urgency=medium

 
   [ Simon McVittie ]
   * img: stop ImageMagick trying to be clever if filenames contain a colon,
 
   [ Simon McVittie ]
   * img: stop ImageMagick trying to be clever if filenames contain a colon,


@@ -30,7 +30,16 @@ ikiwiki (3.20160122) UNRELEASED; urgency=medium
   [ Amitai Schlair ]
   * mdwn: Process .md like .mdwn, but disallow web creation.
 
   [ Amitai Schlair ]
   * mdwn: Process .md like .mdwn, but disallow web creation.
 

- -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 22:34:04 +0000
+  [ Florian Wagner ]
+  * git: Correctly handle filenames starting with a dash in add/rm/mv.
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:54:26 +0100
+
+ikiwiki (3.20160121~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 10:18:07 +0000

 
 ikiwiki (3.20160121) unstable; urgency=medium
 
 
 ikiwiki (3.20160121) unstable; urgency=medium
 


@@ -83,6 +92,12 @@ ikiwiki (3.20160121) unstable; urgency=medium
 
  -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 09:53:07 +0000
 
 
  -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 09:53:07 +0000
 

+ikiwiki (3.20150614~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports, no source changes (Closes: #807452)
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 18 Jan 2016 07:03:11 +0000
+

 ikiwiki (3.20150614) unstable; urgency=medium
 
   * inline: change default sort order from age to "age title" for
 ikiwiki (3.20150614) unstable; urgency=medium
 
   * inline: change default sort order from age to "age title" for