From: Simon McVittie <smcv@debian.org>
Date: Fri, 9 Mar 2018 10:45:41 +0000 (+0000)
Subject: (Build-)Depend on libmarkdown2 (>= 2.2), and opt-in to the new test that assumes... 
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d7d6cb894f154fa22325a852f57130c3f19724a5

(Build-)Depend on libmarkdown2 (>= 2.2), and opt-in to the new test that assumes that version
---

diff --git a/debian/changelog b/debian/changelog
index a8fc4e92c..2ae8eebce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20180311-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * (Build-)Depend on libmarkdown2 (>= 2.2), and opt-in to the new test
+    that assumes that version
 
  -- Simon McVittie <smcv@debian.org>  Sun, 11 Mar 2018 15:58:05 +0000
 
diff --git a/debian/control b/debian/control
index f6fbcbe0a..457a1c7f1 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends-Indep:
  libipc-run-perl,
  libimage-magick-perl | perlmagick,
  libmagickcore-6.q16-3-extra | libmagickcore-extra,
+ libmarkdown2 (>= 2.2.0),
  libnet-openid-consumer-perl,
  librpc-xml-perl,
  libtext-markdown-discount-perl,
@@ -46,6 +47,7 @@ Depends:
  libhtml-scrubber-perl,
  libhtml-template-perl,
  libjson-perl,
+ libmarkdown2 (>= 2.2.0),
  libtext-markdown-discount-perl,
  liburi-perl (>= 1.36),
  libyaml-libyaml-perl,
diff --git a/debian/rules b/debian/rules
index cf3087d1d..b4ec0bbe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,11 @@
 #!/usr/bin/make -f
+
+export IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT=1
+export LC_ALL=C.UTF-8
+export TZ=UTC
+
 %:
-	LC_ALL=C.UTF-8 TZ=UTC dh $@
+	dh $@
 
 override_dh_auto_configure:
 	# keeps it out of /usr/local
diff --git a/debian/tests/pkg-perl/smoke-env b/debian/tests/pkg-perl/smoke-env
index 774738148..f46ec9b99 100644
--- a/debian/tests/pkg-perl/smoke-env
+++ b/debian/tests/pkg-perl/smoke-env
@@ -1 +1,2 @@
+IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT=1
 INSTALLED_TESTS=1