[Forensics-changes] [grokevt] 01/01: d/patches: merge the 3 patches into one

[Samuel Henrique]

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

samueloph-guest pushed a commit to branch debian/master
in repository grokevt.

commit c8b592bb642da3b50523537410f19bdc2207735f
Author: Samuel Henrique <samueloph at gmail.com>
Date:   Fri Nov 17 01:07:11 2017 -0200

    d/patches: merge the 3 patches into one
---
 debian/patches/install_prefix.patch                | 17 ----------
 .../{01-config-path.patch => makefile.patch}       | 38 ++++++++++++----------
 debian/patches/python3_path.patch                  | 15 ---------
 debian/patches/series                              |  4 +--
 4 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/debian/patches/install_prefix.patch b/debian/patches/install_prefix.patch
deleted file mode 100644
index f24e5c1..0000000
--- a/debian/patches/install_prefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: use $(PREFIX) variable on Makefile
-Author: Hugo Lefeuvre <hle at debian.org>
-Index: grokevt/Makefile
-===================================================================
---- grokevt.orig/Makefile
-+++ grokevt/Makefile
-@@ -35,8 +35,8 @@ install: all
- 	cp -r $(BUILD_BIN)/* $(BIN_PREFIX)
- 	cp -r $(BUILD_ETC)/* $(ETC_PREFIX)
- 	cp -r $(BUILD_DOC)/* $(DOC_PREFIX)
--	if [ "x$(PYTHON_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb; fi
--	if [ "x$(PYTHON3_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb; fi
-+	if [ "x$(PYTHON_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb --prefix $(PREFIX); fi
-+	if [ "x$(PYTHON3_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb --prefix $(PREFIX); fi
- 	$(MAKE) -C doc install
- 
- 
diff --git a/debian/patches/01-config-path.patch b/debian/patches/makefile.patch
similarity index 79%
rename from debian/patches/01-config-path.patch
rename to debian/patches/makefile.patch
index ae883dd..63bf680 100644
--- a/debian/patches/01-config-path.patch
+++ b/debian/patches/makefile.patch
@@ -1,20 +1,11 @@
-Description: Fixing config path.
+Description: Patches makefile and grokevy.py
+ Use $(PREFIX) variable on Makefile
+ Fixing config path
+ Get correct python3 PATH
+
 Author: Christophe Monniez <christophe.monniez at fccu.be>
 Author: Samuel Henrique <samueloph at gmail.com>
-Last-Update: 2017-07-03
-Index: grokevt/lib/grokevt.py
-===================================================================
---- grokevt.orig/lib/grokevt.py
-+++ grokevt/lib/grokevt.py
-@@ -688,7 +688,7 @@ class grokevtConfig:
- 
- # This is only here to aide in debugging.
- # It will be overridden during a 'make install' below.
--PATH_CONFIG='/usr/local/etc/grokevt'
-+PATH_CONFIG='/etc/grokevt'
- 
- 
- ################################################################################
+Author: Hugo Lefeuvre <hle at debian.org>
 Index: grokevt/Makefile
 ===================================================================
 --- grokevt.orig/Makefile
@@ -37,8 +28,21 @@ Index: grokevt/Makefile
  	cp -r $(BUILD_DOC)/* $(DOC_PREFIX)
 -	if [ "x$(PYTHON_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install; fi
 -	if [ "x$(PYTHON3_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install; fi
-+	if [ "x$(PYTHON_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb; fi
-+	if [ "x$(PYTHON3_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb; fi
++	if [ "x$(PYTHON_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb --prefix $(PREFIX); fi
++	if [ "x$(PYTHON3_PATH)" != "x" ]; then $(PYTHON3_PATH) grokevt-distutils.py install --install-layout=deb --prefix $(PREFIX); fi
  	$(MAKE) -C doc install
  
  
+Index: grokevt/lib/grokevt.py
+===================================================================
+--- grokevt.orig/lib/grokevt.py
++++ grokevt/lib/grokevt.py
+@@ -688,7 +688,7 @@ class grokevtConfig:
+ 
+ # This is only here to aide in debugging.
+ # It will be overridden during a 'make install' below.
+-PATH_CONFIG='/usr/local/etc/grokevt'
++PATH_CONFIG='/etc/grokevt'
+ 
+ 
+ ################################################################################
diff --git a/debian/patches/python3_path.patch b/debian/patches/python3_path.patch
deleted file mode 100644
index f892f83..0000000
--- a/debian/patches/python3_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Get correct python3 PATH
-Author: Samuel Henrique <samueloph at gmail.com>
-Index: grokevt/Makefile
-===================================================================
---- grokevt.orig/Makefile
-+++ grokevt/Makefile
-@@ -36,7 +36,7 @@ install: all
- 	cp -r $(BUILD_ETC)/* $(ETC_PREFIX)
- 	cp -r $(BUILD_DOC)/* $(DOC_PREFIX)
- 	if [ "x$(PYTHON_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb --prefix $(PREFIX); fi
--	if [ "x$(PYTHON3_PATH)" != "x" ]; then $(PYTHON_PATH) grokevt-distutils.py install --install-layout=deb --prefix $(PREFIX); fi
-+	if [ "x$(PYTHON3_PATH)" != "x" ]; then $(PYTHON3_PATH) grokevt-distutils.py install --install-layout=deb --prefix $(PREFIX); fi
- 	$(MAKE) -C doc install
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7463c90..82374e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-01-config-path.patch
-install_prefix.patch
-python3_path.patch
+makefile.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/grokevt.git