[med-svn] [biosquid] 01/01: Avoid duplicated definitions of several variables which are mostly unused anyway

[Andreas Tille]

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

tille pushed a commit to branch master
in repository biosquid.

commit 5dba99e56bb24c65fb8ac9000bb2439f60c24228
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 12 20:37:29 2017 +0200

    Avoid duplicated definitions of several variables which are mostly unused anyway
---
 debian/changelog |  7 +++++++
 debian/rules     | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3f233e5..cc88359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+biosquid (1.9g+cvs20050121-9) UNRELEASED; urgency=medium
+
+  * Avoid duplicated definitions of PACKAGE_NAME, PACKAGE_VERSION,
+    LARGEFILE*_SOURCE
+
+ -- Andreas Tille <tille at debian.org>  Wed, 12 Apr 2017 16:18:17 +0200
+
 biosquid (1.9g+cvs20050121-8) experimental; urgency=medium
 
   [Andreas Tille]
diff --git a/debian/rules b/debian/rules
index daaa95e..4605bfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,18 @@ override_dh_auto_configure:
 	# autoreconf && true
 	autoconf
 	dh_auto_configure --  --enable-lfs --enable-pvm
+	# avoid duplicated definition of PACKAGE_NAME (basically conflicting with hmmer2 when used together)
+	sed -i -e '/^#define PACKAGE_NAME /i #ifndef PACKAGE_NAME' \
+	       -e '/^#define PACKAGE_NAME /a #endif' \
+	       -e '/^#define PACKAGE_VERSION /i #ifndef PACKAGE_NAME' \
+	       -e '/^#define PACKAGE_VERSION /a #endif' \
+	       -e '/^#define _LARGEFILE_SOURCE /i #ifndef _LARGEFILE_SOURCE' \
+	       -e '/^#define _LARGEFILE_SOURCE /a #endif' \
+	       -e '/^#define _LARGEFILE64_SOURCE /i #ifndef _LARGEFILE64_SOURCE' \
+	       -e '/^#define _LARGEFILE64_SOURCE /a #endif' \
+	       -e '/^#define VERSION /i #ifndef VERSION' \
+	       -e '/^#define VERSION /a #endif' \
+	       squidconf.h
 
 override_dh_install:
 	mv $(CURDIR)/debian/tmp/usr/bin/translate $(CURDIR)/debian/tmp/usr/bin/stranslate

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