[Blends-commit] [SCM] blends-gsoc branch, master, updated. 51a7ad114f0b4920acf06baae9eb4a90a4b5f69e

[Emmanouil Kiagias]

The following commit has been merged in the master branch:
commit 51a7ad114f0b4920acf06baae9eb4a90a4b5f69e
Author: Emmanouil Kiagias <e.kiagias at gmail.com>
Date:   Wed Aug 21 19:24:22 2013 +0200

    Changed Makefile, remove trailing spaces with sed from generated control and taskdescription file

diff --git a/devtools/Makefile b/devtools/Makefile
index febd9f0..5274eff 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -40,11 +40,11 @@ debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL)
 	 echo "# This file is autogenerated via "make -f debian/rules dist".  Do not edit!"; \
 	 cat debian/control.stub; \
 	 test -f config/control && ( cat config/control; echo ) ; \
-	$(GENCONTROL) -S -D -c; cat control-sec.temp ) > $@.new && mv $@.new $@ && rm control-sec.temp
+	$(GENCONTROL) -S -D -c; cat control-sec.temp ) > $@.new && sed -i 's/[ \t]*$$//' $@.new && mv $@.new $@ && rm control-sec.temp
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog
-	LC_ALL=C $(GENCONTROL) -S -t && mv taskdesc-sec.template $(BLEND)-tasks.desc.template
+	LC_ALL=C $(GENCONTROL) -S -t && sed -i 's/[ \t]*$$//' taskdesc-sec.template && mv taskdesc-sec.template $(BLEND)-tasks.desc.template
 
 statusdump: dependency_data/
 	$(TASKSDIFF) --status-dump --tasks .  --output dependency_data/$(BLEND)_$(VERSION).json

-- 
Git repository for blends-gsoc code