Merge branch 'master' into debian-jessie-backports

diff --git a/debian/changelog b/debian/changelog
index 40045d17ae2c4833daaebc1abbce2af7f839e35d..3327be340da2e2924a7056b876845877145e3846 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,15 @@ ikiwiki (3.20160728) unstable; urgency=medium
 
  -- Simon McVittie <smcv@debian.org>  Thu, 28 Jul 2016 10:41:56 +0100
 
+ikiwiki (3.20160509~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports
+    - debian/tests/control: set INSTALLED_TESTS=1 here,
+      pkg-perl-autopkgtest in jessie didn't support
+      debian/tests/pkg-perl/smoke-env
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 22:19:05 +0100
+
 ikiwiki (3.20160509) unstable; urgency=high
 
   [ Amitai Schlair ]
@@ -28,6 +37,14 @@ ikiwiki (3.20160509) unstable; urgency=high
 
  -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 21:57:09 +0100
 
+ikiwiki (3.20160506~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports
+  * debian/tests/control: set INSTALLED_TESTS=1 here, pkg-perl-autopkgtest
+    in jessie didn't support debian/tests/pkg-perl/smoke-env
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 08:58:18 +0100
+
 ikiwiki (3.20160506) unstable; urgency=medium
 
   [ Simon McVittie ]
@@ -63,6 +80,12 @@ ikiwiki (3.20160506) unstable; urgency=medium
 
  -- 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
 
   [ Amitai Schlair ]
@@ -114,6 +137,12 @@ ikiwiki (3.20160121) unstable; urgency=medium
 
  -- 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

diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644 (file)
index 0000000..8b0ce72
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,12 @@
+Test-Command: env INSTALLED_TESTS=1 /usr/share/pkg-perl-autopkgtest/runner build-deps
+Depends: @, @builddeps@, pkg-perl-autopkgtest
+
+Test-Command: env INSTALLED_TESTS=1 /usr/share/pkg-perl-autopkgtest/runner runtime-deps
+Depends: @, pkg-perl-autopkgtest
+
+Test-Command: env INSTALLED_TESTS=1 /usr/share/pkg-perl-autopkgtest/runner runtime-deps-and-recommends
+Depends: @, pkg-perl-autopkgtest
+Restrictions: needs-recommends
+
+Test-Command: env INSTALLED_TESTS=1 /usr/share/pkg-perl-autopkgtest/runner heavy-deps
+Depends: @, pkg-perl-autopkgtest, pkg-perl-autopkgtest-heavy