diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2015-04-28 19:51:21 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2015-04-28 19:52:32 +0200 |
| commit | 6cf8fb0951870fb48d73932a2077b27068288d89 (patch) | |
| tree | 952e9b477c65f023e97470d8bb634bffa8112ee0 /debian | |
| parent | 75d0b17beee0c290926bcfe964c83735fbfa7fc2 (diff) | |
Revert to support versioned data dir: Still needed with oldstable haskell-devscripts.
This reverts commit 0d60fab54cd8ada866f386f569a40b4b4ef74f0e.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 01d991370..2144a5123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,6 @@ pandoc (1.13.2.1~dfsg-1) UNRELEASED; urgency=medium pandoc (1.13.2~dfsg-4) unstable; urgency=medium * Upload to unstable - * Data dir is no longer versiond in haskell-devscripts -- Joachim Breitner <nomeata@debian.org> Tue, 28 Apr 2015 11:21:30 +0200 diff --git a/debian/rules b/debian/rules index b38d2cf72..78ca854a5 100755 --- a/debian/rules +++ b/debian/rules @@ -95,7 +95,11 @@ clean:: done rm -f debian/stamp-upstreamtmpstuff -DEB_DH_INSTALL_ARGS_pandoc-data = debian/tmp-inst-*/usr/share/pandoc/data /usr/share/$(datadir)/ +# install data to varying path, and add symlink when datadir versioned +# TODO: simplify after buster: unversioned since haskell-devscripts 0.8.19 +datadir := $(if $(shell grep datasubdir /usr/share/cdbs/1/class/hlibrary.mk),pandoc,pandoc-$(abi)) +DEB_DH_INSTALL_ARGS_$(pkg-data) = debian/tmp-inst-*/usr/share/$(datadir)/data /usr/share/$(datadir)/ +DEB_DH_LINK_$(pkg-data) = $(if $(call cdbs_streq,$(datadir),pandoc),,/usr/share/$(datadir) /usr/share/pandoc) # Haskell dependencies for any build from pandoc.cabal deps-ghc += unordered-containers,<<,3 |