[med-svn] [aghermann] 02/08: debian: remove g++ version selection workarounds

andrei zavada hmmr-guest at moszumanska.debian.org
Wed May 14 21:23:32 UTC 2014


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

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 27853593a302d5b65258b2eca681b272e391cae0
Author: Andrei Zavada <hmmr at ra>
Date:   Wed May 14 02:37:18 2014 +0300

    debian: remove g++ version selection workarounds
---
 debian/control |  5 ++++-
 debian/rules   | 12 ------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 400513e..2c8d6b8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,10 @@ Source: aghermann
 Section: science
 Priority: optional
 Maintainer: Andrei Zavada <johnhommer at gmail.com>
-Build-Depends: debhelper (>= 9), dh-autoreconf, hardening-wrapper, hardening-includes, autoconf-archive, g++-4.7 | g++-4.8, pkg-config, libgomp1, libconfig++-dev, libgsl0-dev, libfftw3-dev, libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.90-dev, liblua5.2-dev, lua5.2, libxml2-utils
+Build-Depends: debhelper (>= 9), dh-autoreconf, hardening-wrapper, hardening-includes,
+ autoconf-archive, pkg-config, libgomp1, libconfig++-dev, libgsl0-dev, libfftw3-dev,
+ libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.90-dev,
+ liblua5.2-dev, lua5.2, libxml2-utils
 Standards-Version: 3.9.5
 Homepage: http://johnhommer.com/academic/code/aghermann
 Vcs-Git: git://git.debian.org/git/debian-med/aghermann.git
diff --git a/debian/rules b/debian/rules
index eb96d3e..8ae0382 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,18 +21,6 @@ LDFLAGS+=$(HARDENING_LDFLAGS)
 %:
 	dh $@ --with autoreconf
 
-override_dh_auto_configure:
-# Take care to select an appropriate version of gcc
-	for v in 4.8 4.7; do \
-	  g=`which g++-$$v`; \
-	  if test -n "$$g"; then \
-	    $$g >/dev/null 2>&1; \
-	    if [ $$? != 127 ]; then export CXX=`which g++-$$v`; break; fi \
-	  fi \
-	done; \
-	autoreconf -f && \
-	./configure --prefix=/usr
-
 override_dh_clean:
 	rm -f config.log
 	dh_clean

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



More information about the debian-med-commit mailing list