[med-svn] [centrifuge] 01/01: Patches kindly provided by Alexis Murzeau <amubtdx at gmail.com>

[Andreas Tille]

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

tille pushed a commit to branch master
in repository centrifuge.

commit c5a3f9b758f8044cfb5017f91b0b5820acba9432
Author: Andreas Tille <tille at debian.org>
Date:   Mon Nov 27 08:47:42 2017 +0100

    Patches kindly provided by Alexis Murzeau <amubtdx at gmail.com>
---
 debian/patches/0002-Fix-build-with-rank.patch      | 21 +++++++++++
 debian/patches/0003-Fix-make-install-DESTDIR.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 debian/rules                                       |  5 ++-
 4 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0002-Fix-build-with-rank.patch b/debian/patches/0002-Fix-build-with-rank.patch
new file mode 100644
index 0000000..d83dcf8
--- /dev/null
+++ b/debian/patches/0002-Fix-build-with-rank.patch
@@ -0,0 +1,21 @@
+From: Alexis Murzeau <amubtdx at gmail.com>
+Date: Mon, 27 Nov 2017 00:04:21 +0100
+Subject: Fix build with rank
+
+---
+ classifier.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/classifier.h b/classifier.h
+index f61a7f0..13b110b 100644
+--- a/classifier.h
++++ b/classifier.h
+@@ -425,7 +425,7 @@ public:
+             while(_hitMap.size() > (size_t)rp.khits) {
+                 _hitTaxCount.clear();
+                 for(size_t i = 0; i < _hitMap.size(); i++) {
+-                    while(_hitMap[i].rank < rank) {
++                    while(rank > _hitMap[i].rank) {
+                         if(_hitMap[i].rank + 1 >= _hitMap[i].path.size()) {
+                             _hitMap[i].rank = std::numeric_limits<uint8_t>::max();
+                             break;
diff --git a/debian/patches/0003-Fix-make-install-DESTDIR.patch b/debian/patches/0003-Fix-make-install-DESTDIR.patch
new file mode 100644
index 0000000..08f30dd
--- /dev/null
+++ b/debian/patches/0003-Fix-make-install-DESTDIR.patch
@@ -0,0 +1,41 @@
+From: Alexis Murzeau <amubtdx at gmail.com>
+Date: Mon, 27 Nov 2017 00:14:09 +0100
+Subject: Fix make install DESTDIR
+
+---
+ Makefile | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8d66b3c..1889b09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -412,20 +412,20 @@ prefix=/usr/local
+ 
+ .PHONY: install
+ install: all
+-	mkdir -p $(prefix)/bin
+-	mkdir -p $(prefix)/share/centrifuge/indices
+-	install -m 0644 indices/Makefile $(prefix)/share/centrifuge/indices
+-	install -d -m 0755 $(prefix)/share/centrifuge/doc
+-	install -m 0644 doc/* $(prefix)/share/centrifuge/doc
++	mkdir -p $(DESTDIR)$(prefix)/bin
++	mkdir -p $(DESTDIR)$(prefix)/share/centrifuge/indices
++	install -m 0644 indices/Makefile $(DESTDIR)$(prefix)/share/centrifuge/indices
++	install -d -m 0755 $(DESTDIR)$(prefix)/share/centrifuge/doc
++	install -m 0644 doc/* $(DESTDIR)$(prefix)/share/centrifuge/doc
+ 	for file in $(CENTRIFUGE_BIN_LIST) $(CENTRIFUGE_SCRIPT_LIST); do \
+-		install -m 0755 $$file $(prefix)/bin ; \
++		install -m 0755 $$file $(DESTDIR)$(prefix)/bin ; \
+ 	done
+ 
+ .PHONY: uninstall
+ uninstall: all
+ 	for file in $(CENTRIFUGE_BIN_LIST) $(CENTRIFUGE_SCRIPT_LIST); do \
+-		rm -v $(prefix)/bin/$$file ; \
+-		rm -v $(prefix)/share/centrifuge; \
++		rm -v $(DESTDIR)$(prefix)/bin/$$file ; \
++		rm -v $(DESTDIR)$(prefix)/share/centrifuge; \
+ 	done
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a0e148b..484d59a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 fix_auto_ptr_usage_in_gcc-7.patch
+0002-Fix-build-with-rank.patch
+0003-Fix-make-install-DESTDIR.patch
diff --git a/debian/rules b/debian/rules
index f01a354..14450ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 # DH_VERBOSE := 1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
+export POPCNT_CAPABILITY=0
 %:
 	dh $@
+
+override_dh_auto_install:
+	dh_auto_install -- prefix=/usr

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