[Pkg-javascript-commits] [rainloop] 29/38: Moved bundled library removal to post-build step to avoid modifying source directory.

[Daniel Ring]

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

techwolf-guest pushed a commit to branch master
in repository rainloop.

commit 566ce76657dc3145b3ff0b37e4681f4e00bebb34
Author: Techwolf <dring at g33kworld.net>
Date:   Sun Sep 24 01:34:36 2017 -0700

    Moved bundled library removal to post-build step to avoid modifying source directory.
---
 debian/Makefile | 6 ++++++
 debian/rules    | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 8f8d402..3a2a51c 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -216,6 +216,12 @@ copy: | jsMin cssMin vendors
 	cp -r rainloop/v/0.0.0/* build/dist/rainloop
 	find build/dist/rainloop/ -type d -exec chmod 0755 {} +
 	find build/dist/rainloop/ -type f -exec chmod 0644 {} +
+	#Remove libraries already in Debian
+	rm -rf build/dist/rainloop/app/libraries/pclzip/
+	rm -rf build/dist/rainloop/app/libraries/GuzzleHttp/
+	rm -rf build/dist/rainloop/app/libraries/phpseclib/
+	rm -rf build/dist/rainloop/app/libraries/Predis/
+	rm -rf build/dist/rainloop/app/libraries/SabreForRainLoop/
 
 .PHONY: setup
 setup: | copy
diff --git a/debian/rules b/debian/rules
index 518ed87..6058f66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,6 @@ export DH_VERBOSE = 1
 	dh $@
 
 override_dh_auto_build:
-	rm -rf rainloop/v/0.0.0/app/libraries/pclzip/
-	rm -rf rainloop/v/0.0.0/app/libraries/GuzzleHttp/
-	rm -rf rainloop/v/0.0.0/app/libraries/phpseclib/
-	rm -rf rainloop/v/0.0.0/app/libraries/Predis/
-	rm -rf rainloop/v/0.0.0/app/libraries/SabreForRainLoop/
 	make -sf debian/Makefile
 
 override_dh_fixperms:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rainloop.git