From: Simon McVittie Date: Thu, 29 Dec 2016 20:47:46 +0000 (+0000) Subject: Merge branch 'master' into debian-jessie-backports X-Git-Tag: debian/3.20170111_bpo8+1~3 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e15a490067991448c3b65323ad9ecdc774dbfe4?hp=e0341d0e887dc49849f7f496680f32a7ece44a4c Merge branch 'master' into debian-jessie-backports --- diff --git a/debian/changelog b/debian/changelog index 99081bcb0..1c989e515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,15 @@ ikiwiki (3.20161229.1) unstable; urgency=medium -- Simon McVittie Thu, 29 Dec 2016 20:46:24 +0000 +ikiwiki (3.20161229~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 Thu, 29 Dec 2016 17:38:19 +0000 + ikiwiki (3.20161229) unstable; urgency=medium * Security: force CGI::FormBuilder->field to scalar context where @@ -50,6 +59,15 @@ ikiwiki (3.20161219) unstable; urgency=medium -- Simon McVittie Mon, 19 Dec 2016 20:34:23 +0000 +ikiwiki (3.20160905~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 Mon, 05 Sep 2016 21:49:22 +0100 + ikiwiki (3.20160905) unstable; urgency=medium [ Joey Hess ] @@ -72,6 +90,15 @@ ikiwiki (3.20160728) unstable; urgency=medium -- Simon McVittie 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 Mon, 09 May 2016 22:19:05 +0100 + ikiwiki (3.20160509) unstable; urgency=high [ Amitai Schlair ] @@ -92,6 +119,14 @@ ikiwiki (3.20160509) unstable; urgency=high -- Simon McVittie 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 Fri, 06 May 2016 08:58:18 +0100 + ikiwiki (3.20160506) unstable; urgency=medium [ Simon McVittie ] @@ -127,6 +162,12 @@ ikiwiki (3.20160506) unstable; urgency=medium -- Simon McVittie Fri, 06 May 2016 07:54:26 +0100 +ikiwiki (3.20160121~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Simon McVittie Thu, 21 Jan 2016 10:18:07 +0000 + ikiwiki (3.20160121) unstable; urgency=medium [ Amitai Schlair ] @@ -178,6 +219,12 @@ ikiwiki (3.20160121) unstable; urgency=medium -- Simon McVittie 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 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 index 000000000..8b0ce72f9 --- /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