[med-svn] [Git][med-team/pilercr][master] 2 commits: Merge patch from Helmut Grohne

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / pilercr


Commits:
ccb4574b by Andreas Tille at 2020-12-15T18:28:11+01:00
Merge patch from Helmut Grohne

- - - - -
f3b8c315 by Andreas Tille at 2020-12-15T18:34:44+01:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+pilercr (1.06+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTCBFS: (Closes: #977482)
+    + Pass C++ compiler as GPP variable.
+    + Add native build pass for help2man.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 15 Dec 2020 15:37:19 +0100
+
 pilercr (1.06+dfsg-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -7,13 +8,17 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
-override_dh_installman:
+override_dh_auto_build:
+	dpkg-architecture -f -a$(DEB_BUILD_ARCH) -c dh_auto_build -- 'GPP=$$(CXX)'
 	help2man ./pilercr \
 	    --name 'software for finding CRISPR repeats' \
 	    --help-option '-options' --no-discard-stderr \
             --version-string ${DEB_VERSION_UPSTREAM} \
 	    --no-info > pilercr.1
-	dh_installman
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+	$(RM) pilercr *.o
+	dh_auto_build -- 'GPP=$$(CXX)'
+endif
 
 override_dh_auto_clean:
 	rm -f *.o pilercr pilercr.1



View it on GitLab: https://salsa.debian.org/med-team/pilercr/-/compare/56aa4ba1fc079a38cf6c73bcb8a392f4be76757a...f3b8c315e0cdd09a99d16bcc5caa11e9c033f3d6

-- 
View it on GitLab: https://salsa.debian.org/med-team/pilercr/-/compare/56aa4ba1fc079a38cf6c73bcb8a392f4be76757a...f3b8c315e0cdd09a99d16bcc5caa11e9c033f3d6
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/20201215/1dccf6bf/attachment-0001.html>