[med-svn] [disulfinder] 01/02: Avoid duplicated definition of guard macro

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to tag debian/1.2.11-7
in repository disulfinder.

commit 6ee528d8d505f49dae1d8620551c6cd353f223f4
Author: Andreas Tille <tille at debian.org>
Date:   Sun Aug 27 00:04:32 2017 +0200

    Avoid duplicated definition of guard macro
---
 debian/changelog           |  3 +++
 debian/patches/gcc-7.patch | 16 ++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  5 ++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c275298..171ed91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ disulfinder (1.2.11-7) UNRELEASED; urgency=medium
   * Moved packaging from SVN to Git
   * debhelper 10
   * Standards-Version: 4.1.0 (no changes needed)
+  * Avoid duplicated definition of guard macro (Thanks for the tip to
+    Christian Seiler <christian at iwakd.de>)
+    Closes: #853375
 
  -- Andreas Tille <tille at debian.org>  Sat, 26 Aug 2017 21:02:12 +0200
 
diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
new file mode 100644
index 0000000..be6a2fa
--- /dev/null
+++ b/debian/patches/gcc-7.patch
@@ -0,0 +1,16 @@
+Author: Christian Seiler <christian at iwakd.de>
+Last-Update: Sat, 26 Aug 2017 23:05:16 +0200
+Bug-Debian: https://bugs.debian.org/853375
+Description: Avoid duplicated definition of guard macro.  Double underscore
+ start is reserved for gcc.
+
+--- a/disulfind/src/Common/Exception.h
++++ b/disulfind/src/Common/Exception.h
+@@ -1,5 +1,5 @@
+-#ifndef __EXCEPTION_H
+-#define __EXCEPTION_H
++#ifndef DISULFIND_COMMON_EXCEPTION_H
++#define DISULFIND_COMMON_EXCEPTION_H
+ 
+ #include <string>
+ #include <iostream>
diff --git a/debian/patches/series b/debian/patches/series
index 31fa676..4d56159 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
 variable_length_array
 unknown_escape
 gcc-6.patch
+gcc-7.patch
diff --git a/debian/rules b/debian/rules
index 3754eaa..491e357 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,10 @@ pkg := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 pkgdata := $(pkg)-data
 
 %:
-	dh $@ --parallel 
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build --no-parallel
 
 override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/$(pkg) prefix=/usr install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/disulfinder.git