[med-svn] [nut-nutrition] 01/02: Update paths in Makefile to fix bugs #750930 and #750932

[Iain Learmonth]

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

irl-guest pushed a commit to branch master
in repository nut-nutrition.

commit 46b50988c9a10c2a866ac73d9f8ade25bb6da0ef
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Wed Jun 11 08:51:58 2014 +0100

    Update paths in Makefile to fix bugs #750930 and #750932
---
 debian/changelog               |  7 +++++++
 debian/patches/fix_paths.patch | 27 ++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed0cfc5..ab45d14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nut-nutrition (19.1-2) UNRELEASED; urgency=medium
+
+  * Corrected path to the food database (closes: #750930)
+  * Corrected path to user database (closes: #750932)
+
+ -- Iain R. Learmonth <irl at fsfe.org>  Wed, 11 Jun 2014 08:46:55 +0100
+
 nut-nutrition (19.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/fix_paths.patch b/debian/patches/fix_paths.patch
index 6b4e69c..8c573ed 100644
--- a/debian/patches/fix_paths.patch
+++ b/debian/patches/fix_paths.patch
@@ -7,33 +7,38 @@ Description: Fix the installation paths in the Makefile
 @@ -1,11 +1,11 @@
 -prefix = /usr/local
 -libdir = $(prefix)/lib/nut
-+prefix = debian/nut-nutrition/usr
++prefix = /usr
 +libdir = $(prefix)/share/nut-nutrition
  bindir = $(prefix)/bin
 -mandir = $(prefix)/man/man1
 +mandir = $(prefix)/share/man/man1
  
- NUTDIR := \".nutdb\"
+-NUTDIR := \".nutdb\"
++NUTDIR := \".nut-nutrition\"
  FOODDIR := \"$(libdir)\"
 -EXECUTABLE := nut
 +EXECUTABLE := nut-nutrition
  LIBS := -lm
  
  FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
-@@ -57,11 +57,12 @@
+@@ -56,12 +56,13 @@
+ endif
  
  install: all
- 	-mkdir -p -m 755 $(bindir) $(libdir) $(mandir)
+-	-mkdir -p -m 755 $(bindir) $(libdir) $(mandir)
 -	-cp nut $(FLTK_NUT) $(bindir)
 -	-cd $(bindir); strip nut Nut
-+	-cp nut-nutrition $(bindir)
-+	-cp $(FLTK_NUT) $(bindir)
-+	-cd $(bindir); strip nut-nutrition Nut
- 	-rm -f $(libdir)/sr*.nut 2>/dev/null
- 	-cp raw.data/* $(libdir)
+-	-rm -f $(libdir)/sr*.nut 2>/dev/null
+-	-cp raw.data/* $(libdir)
 -	-cp nut.1 $(mandir)
 -	-chmod a+r $(libdir)/* $(mandir)/nut.1
-+	-cp nut.1 $(mandir)/nut-nutrition.1
-+	-chmod a+r $(libdir)/* $(mandir)/nut-nutrition.1
++	-mkdir -p -m 755 debian/nut-nutrition/$(bindir) debian/nut-nutrition/$(libdir) debian/nut-nutrition/$(mandir)
++	-cp nut-nutrition debian/nut-nutrition/$(bindir)
++	-cp $(FLTK_NUT) debian/nut-nutrition/$(bindir)
++	-cd debian/nut-nutrition/$(bindir); strip nut-nutrition Nut
++	-rm -f debian/nut-nutrition/$(libdir)/sr*.nut 2>/dev/null
++	-cp raw.data/* debian/nut-nutrition/$(libdir)
++	-cp nut.1 debian/nut-nutrition/$(mandir)/nut-nutrition.1
++	-chmod a+r debian/nut-nutrition/$(libdir)/* debian/nut-nutrition/$(mandir)/nut-nutrition.1
  
  # DO NOT DELETE

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