 +patch-stamp: patch
 +patch:
 +	for patch in $(PATCHES); \
-+	    do \
-+		if ! test -f debian/patches/$$patch.stamp; \
-+		  then \
-+		     patch -p0 < debian/patches/$$patch; \
-+		     touch debian/patches/$$patch.stamp; \
-+	        fi; \
-+	  done; \
-+	fi
++	do \
++	  if ! test -f debian/patches/$$patch.stamp; \
++	  then \
++	      patch -p0 < debian/patches/$$patch; \
++	      touch debian/patches/$$patch.stamp; \
++	  fi; \
++	done
 +	touch patch-stamp
 +
 +unpatch:
 +	if test -f patch-stamp; \
-+	  then for patch in $(PATCHES); \
++	then \
++	    for patch in $(PATCHES); \
 +	    do \
-+		patch -p0 -R < debian/patches/$$patch; \
-+		rm -f debian/patches/$$patch.stamp; \
-+	  done; \
++	      patch -p0 -R < debian/patches/$$patch; \
++	      rm -f debian/patches/$$patch.stamp; \
++	    done; \
 +	fi
 +	rm -f patch-stamp
 +

+-		$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
+-endif
++		$(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
+Index: sope-appserver/NGObjWeb/ChangeLog
+===================================================================
+--- sope-appserver/NGObjWeb/ChangeLog	(revision 1660)
++++ sope-appserver/NGObjWeb/ChangeLog	(working copy)
+@@ -1,3 +1,22 @@
++2009-07-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
++
++	* WOMessage.m (-setHeaders:, -setHeader:forKey:, headerForKey:,

+--include fhs.make
--- sope-4.9.r1660.orig/debian/patches/sope-patchset-r1660.diff
+++ sope-4.9.r1660/debian/patches/sope-patchset-r1660.diff
@@ -0,0 +1,4889 @@
+Index: sope-ldap/NGLdap/NGLdapEntry.m
+===================================================================
+--- sope-ldap/NGLdap/NGLdapEntry.m	(revision 1660)
