[med-svn] [Git][med-team/abyss][master] 2 commits: Remove markdown from the nodoc build profile, to allow for cross-building

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / abyss


Commits:
80d805f3 by Michael R. Crusoe at 2020-02-11T15:20:31+01:00
Remove markdown from the nodoc build profile, to allow for cross-building

- - - - -
d97e4818 by Michael R. Crusoe at 2020-02-11T15:39:55+01:00
2.2.4-1

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-abyss (2.2.4-1) UNRELEASED; urgency=medium
+abyss (2.2.4-1) unstable; urgency=medium
 
   * New upstream version
   * spelling patch incorporated upstream, removed it
+  * Remove markdown from the nodoc build profile, to allow for cross-building
 
- -- Michael R. Crusoe <michael.crusoe at gmail.com>  Thu, 30 Jan 2020 20:52:22 +0100
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Tue, 11 Feb 2020 15:39:45 +0100
 
 abyss (2.2.3-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (= 12),
                libboost-graph-dev,
                libopenmpi-dev,
                libsparsehash-dev,
-               libtext-multimarkdown-perl,
+               libtext-multimarkdown-perl <!nodoc>,
                libsqlite3-dev,
                pkg-config,
                help2man


=====================================
debian/rules
=====================================
@@ -15,7 +15,9 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES) $(DEB_BUILD_OPTIONS)))
 	markdown README.md > README.html
+endif
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp



View it on GitLab: https://salsa.debian.org/med-team/abyss/-/compare/a2913540b7f3ba36402d91cb184641d6de20c3ef...d97e4818d7ff4227b32de84a0376e0a299ff0324

-- 
View it on GitLab: https://salsa.debian.org/med-team/abyss/-/compare/a2913540b7f3ba36402d91cb184641d6de20c3ef...d97e4818d7ff4227b32de84a0376e0a299ff0324
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200510/119a60cb/attachment-0001.html>