[med-svn] [nut-nutrition] 03/04: Break out database into arch-indep package

[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 425e6b76c27990412654b007b072a2a2d7be3c5a
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon Sep 15 18:34:21 2014 +0100

    Break out database into arch-indep package
---
 debian/control                 | 13 ++++++++++++-
 debian/patches/fix_paths.patch |  9 ++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index e34e262..8cb969e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,19 @@ Homepage: http://nut.sourceforge.net/
 Package: nut-nutrition
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         nut-nutrition-data
 Description: dietary nutrition analysis software
  This software help you record what you eat and then analyzes your meals for
  nutrient levels in terms of the USDA "Daily Value" (the standard for food
  labeling in the US.
+
+Package: nut-nutrition-data
+Architecture: all
+Description: dietary nutrition analysis software - common data
+ This software help you record what you eat and then analyzes your meals for
+ nutrient levels in terms of the USDA "Daily Value" (the standard for food
+ labeling in the US.
+ .
+ This package contains the architecture independent databases for
+ nut-nutrition.
diff --git a/debian/patches/fix_paths.patch b/debian/patches/fix_paths.patch
index 8c573ed..eb240ec 100644
--- a/debian/patches/fix_paths.patch
+++ b/debian/patches/fix_paths.patch
@@ -21,7 +21,7 @@ Description: Fix the installation paths in the Makefile
  LIBS := -lm
  
  FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
-@@ -56,12 +56,13 @@
+@@ -56,12 +56,12 @@
  endif
  
  install: all
@@ -32,13 +32,12 @@ Description: Fix the installation paths in the Makefile
 -	-cp raw.data/* $(libdir)
 -	-cp nut.1 $(mandir)
 -	-chmod a+r $(libdir)/* $(mandir)/nut.1
-+	-mkdir -p -m 755 debian/nut-nutrition/$(bindir) debian/nut-nutrition/$(libdir) debian/nut-nutrition/$(mandir)
++	-mkdir -p -m 755 debian/nut-nutrition/$(bindir) debian/nut-nutrition-data/$(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 raw.data/* debian/nut-nutrition-data/$(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
++	-chmod a+r debian/nut-nutrition-data/$(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