[SCM] clam/master: Imported Debian patch 1.4.0-5.1

[jcowgill-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d743097bb15a98b07f6f3ce8c54dab8773eb7f8a
Author: Matthias Klose <doko at debian.org>
Date:   Tue May 29 04:29:23 2012 +0000

    Imported Debian patch 1.4.0-5.1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 845ca06..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pc
diff --git a/debian/changelog b/debian/changelog
index d146093..e590246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clam (1.4.0-5.1) unstable; urgency=low
+
+  * Non maintainer upload
+  * Build with -fpermissive. Closes: #667136.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 29 May 2012 04:29:23 +0000
+
 clam (1.4.0-5) unstable; urgency=low
 
   [ Adrian Knoth ]
diff --git a/debian/rules b/debian/rules
index 82a08ec..409e440 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,20 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PATH := $(CURDIR)/bin:$(PATH)
+export PATH
+
 %:
 	dh $@ 
 override_dh_auto_clean:
 	mkdir -p $(CURDIR)/debian/tmp/usr
 	scons -c
+	rm -rf bin
 
 override_dh_auto_configure:
+	mkdir -p bin
+	echo 'exec /usr/bin/g++ -fpermissive "$$@"' > bin/g++
+	chmod 755 bin/g++
 	mkdir -p $(CURDIR)/debian/tmp/usr
 	scons configure prefix=/usr \
 		prefix_for_packaging=$(CURDIR)/debian/tmp/usr \

-- 
clam packaging