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

diff --git a/debian/changelog b/debian/changelog
index a8fc4e92c7c804fb5f9039f25fd7115d83e34431..2ae8eebce8ccf392be85d200ec82eea4cb5f11be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20180311-1) UNRELEASED; urgency=medium
 
   * New upstream release
 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
 
 
  -- Simon McVittie <smcv@debian.org>  Sun, 11 Mar 2018 15:58:05 +0000
 

diff --git a/debian/control b/debian/control
index f6fbcbe0a4b78e69985aaac4c226659618af070b..457a1c7f112a6c2d74167ac53cfc61787e3ebde7 100644 (file)
--- 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,
  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,
  libnet-openid-consumer-perl,
  librpc-xml-perl,
  libtext-markdown-discount-perl,


@@ -46,6 +47,7 @@ Depends:
  libhtml-scrubber-perl,
  libhtml-template-perl,
  libjson-perl,
  libhtml-scrubber-perl,
  libhtml-template-perl,
  libjson-perl,

+ libmarkdown2 (>= 2.2.0),

  libtext-markdown-discount-perl,
  liburi-perl (>= 1.36),
  libyaml-libyaml-perl,
  libtext-markdown-discount-perl,
  liburi-perl (>= 1.36),
  libyaml-libyaml-perl,

diff --git a/debian/rules b/debian/rules
index cf3087d1db711dc46539c908742b1983f2b70967..b4ec0bbe3618db91f190e3930ee5ffff7f8dc131 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,11 @@
 #!/usr/bin/make -f
 #!/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
 
 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 77473814824da39800eaf4e022d1e5474b0f2674..f46ec9b992b095abc0db7c0e29d78cc40f41a8c2 100644 (file)
--- 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
 INSTALLED_TESTS=1