Remove the workaround for buggy CDBS $(CC) splitting (fixed upstream).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 050c2f2ba7377d00b3df5e0c4138f51165481050..5a65e7287b794eefef99de263c9ecc1ee7c0c9b3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libnss-nonlocal (1.11-0debathena3) UNRELEASED; urgency=low
+
+  * Remove the workaround for buggy CDBS $(CC) splitting (fixed upstream).
+
+ -- Anders Kaseorg <andersk@mit.edu>  Wed, 23 Jun 2010 21:04:41 -0400
+
 libnss-nonlocal (1.11-0debathena2) unstable; urgency=low
 
   * Install lib32nss-nonlocal to the right place on Ubuntu.

diff --git a/debian/rules b/debian/rules
index 0598e896fa8c3981a7ab42949e9c149093c1702c..982e1916007d8f68674677ce0d4894f5b354f8a9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,6 @@ DEB_AUTO_UPDATE_AUTOMAKE = 1.9
 DEB_AUTO_UPDATE_ACLOCAL = 1.9
 DEB_AUTO_UPDATE_LIBTOOL = pre
 
-# Fix http://bugs.debian.org/576967 : CDBS 0.4.77 in squeeze
-# incorrectly splits multiword $(CC) and $(CXX).
-override cdbs_set_nondefaultvars = $(foreach var,$1,$(if $(filter-out $(origin $(var)),default),$(var)='$($(var))'))
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk