[med-svn] [nut-nutrition] branch master updated (3e0767b -> 450a4af)

Iain Learmonth irl-guest at moszumanska.debian.org
Fri Jun 6 22:55:36 UTC 2014


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

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

      from  3e0767b   Update changelog for 15.5-1
       new  3d2d703   Imported Upstream version 19.1
       new  450a4af   Merge tag 'upstream/19.1'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CREDITS                                   |    5 +
 Makefile                                  |   65 +-
 README                                    |   76 +-
 README.DOS                                |   60 +-
 abbrev.h                                  |    6 +-
 addfood.c                                 |   14 +-
 addfood.h                                 |   11 +-
 anameal.c                                 |  155 +-
 anameal.h                                 |   13 +-
 blurb                                     |    2 +-
 db.c                                      |  286 +-
 db.h                                      |   30 +-
 fdgrp.h                                   |    4 +-
 fltk/AddRecipe.cc                         |  322 ++
 fltk/AddRecipe.h                          |   58 +
 fltk/AddToMealWidget.cc                   |   80 +
 anameal.h => fltk/AddToMealWidget.h       |   28 +-
 fltk/AnalyzeMeals.cc                      |  204 +
 fltk/AnalyzeMeals.h                       |   61 +
 ranking.h => fltk/BackToMenu.cc           |   48 +-
 anameal.h => fltk/BackToMenu.h            |   27 +-
 menu.h => fltk/BodyFatValueOutput.cc      |   29 +-
 anameal.h => fltk/BodyFatValueOutput.h    |   23 +-
 fltk/CalorieValueOutput.cc                |   54 +
 anameal.h => fltk/CalorieValueOutput.h    |   27 +-
 ranking.h => fltk/CancelWidget.cc         |   40 +-
 anameal.h => fltk/CancelWidget.h          |   29 +-
 fltk/DVValueOutput.cc                     |  256 +
 anameal.h => fltk/DVValueOutput.h         |   24 +-
 menu.h => fltk/DeficNut.cc                |   30 +-
 anameal.h => fltk/DeficNut.h              |   24 +-
 fltk/FoodButton.cc                        |   58 +
 anameal.h => fltk/FoodButton.h            |   26 +-
 fltk/FoodChoice.cc                        |  258 +
 ranking.h => fltk/FoodChoice.h            |   46 +-
 fltk/FoodRanking.cc                       |  468 ++
 fltk/FoodRanking.h                        |   61 +
 fltk/FoodSuggestions.cc                   |  209 +
 ranking.h => fltk/FoodSuggestions.h       |   44 +-
 fltk/GOLightButton.cc                     |   59 +
 anameal.h => fltk/GOLightButton.h         |   24 +-
 ranking.h => fltk/GramValueOutput.cc      |   38 +-
 anameal.h => fltk/GramValueOutput.h       |   24 +-
 fltk/Makefile                             |   52 +
 ranking.h => fltk/MealCountValueOutput.cc |   27 +-
 anameal.h => fltk/MealCountValueOutput.h  |   21 +-
 fltk/MealFood.cc                          |   74 +
 ranking.h => fltk/MealFood.h              |   41 +-
 fltk/MealFoodValueOutput.cc               |   56 +
 anameal.h => fltk/MealFoodValueOutput.h   |   24 +-
 fltk/MealValueOutput.cc                   |  105 +
 ranking.h => fltk/MealValueOutput.h       |   34 +-
 fltk/MissMealWidget.cc                    |  123 +
 anameal.h => fltk/MissMealWidget.h        |   29 +-
 ranking.h => fltk/NewRecipeWidget.cc      |   39 +-
 anameal.h => fltk/NewRecipeWidget.h       |   29 +-
 fltk/Nut.cc                               |  349 ++
 fltk/Nut.h                                |   66 +
 menu.h => fltk/NutButton.cc               |   31 +-
 anameal.h => fltk/NutButton.h             |   24 +-
 fltk/NutButtonWidget.cc                   |  243 +
 ranking.h => fltk/NutButtonWidget.h       |   37 +-
 fltk/NutCharts.cc                         |  176 +
 ranking.h => fltk/NutCharts.h             |   41 +-
 fltk/NutValue.cc                          |  204 +
 fltk/NutValue.h                           |   63 +
 menu.h => fltk/Nut_Box.cc                 |   22 +-
 ranking.h => fltk/Nut_Box.h               |   22 +-
 menu.h => fltk/Nut_Button.cc              |   22 +-
 ranking.h => fltk/Nut_Button.h            |   22 +-
 menu.h => fltk/Nut_Input.cc               |   22 +-
 ranking.h => fltk/Nut_Input.h             |   22 +-
 menu.h => fltk/Nut_LightButton.cc         |   22 +-
 anameal.h => fltk/Nut_LightButton.h       |   21 +-
 ranking.h => fltk/Nut_LineChart.cc        |   41 +-
 anameal.h => fltk/Nut_LineChart.h         |   24 +-
 menu.h => fltk/Nut_MenuButton.cc          |   22 +-
 anameal.h => fltk/Nut_MenuButton.h        |   21 +-
 menu.h => fltk/Nut_Pack.cc                |   24 +-
 ranking.h => fltk/Nut_Pack.h              |   24 +-
 menu.h => fltk/Nut_ReturnButton.cc        |   22 +-
 anameal.h => fltk/Nut_ReturnButton.h      |   21 +-
 menu.h => fltk/Nut_Scroll.cc              |   23 +-
 ranking.h => fltk/Nut_Scroll.h            |   24 +-
 menu.h => fltk/Nut_ToggleButton.cc        |   22 +-
 anameal.h => fltk/Nut_ToggleButton.h      |   21 +-
 fltk/Nut_ValueOutput.cc                   |   55 +
 anameal.h => fltk/Nut_ValueOutput.h       |   24 +-
 menu.h => fltk/Nut_Window.cc              |   38 +-
 ranking.h => fltk/Nut_Window.h            |   24 +-
 ranking.h => fltk/OunceValueOutput.cc     |   38 +-
 anameal.h => fltk/OunceValueOutput.h      |   24 +-
 fltk/PCF.cc                               |  190 +
 ranking.h => fltk/PCF.h                   |   34 +-
 fltk/PersonalOptions.cc                   | 1054 ++++
 ranking.h => fltk/PersonalOptions.h       |   40 +-
 ranking.h => fltk/PrintMenus.cc           |   46 +-
 anameal.h => fltk/PrintMenus.h            |   27 +-
 fltk/RecordMeals.cc                       |  450 ++
 fltk/RecordMeals.h                        |   77 +
 fltk/ServingMenuButton.cc                 |  104 +
 ranking.h => fltk/ServingMenuButton.h     |   31 +-
 fltk/ServingValueOutput.cc                |   58 +
 anameal.h => fltk/ServingValueOutput.h    |   27 +-
 fltk/TheStory.cc                          |  145 +
 ranking.h => fltk/TheStory.h              |   44 +-
 fltk/TheUsualMenuButton.cc                |  128 +
 anameal.h => fltk/TheUsualMenuButton.h    |   24 +-
 fltk/TheUsualNameWidget.cc                |   88 +
 anameal.h => fltk/TheUsualNameWidget.h    |   28 +-
 fltk/ViewFoods.cc                         |  371 ++
 fltk/ViewFoods.h                          |   71 +
 fltk/WeightCharts.cc                      |  146 +
 fltk/WeightCharts.h                       |   54 +
 fltk/WeightLogWidget.cc                   |  125 +
 ranking.h => fltk/WeightLogWidget.h       |   35 +-
 fltk/main.cc                              |  103 +
 food.c                                    |  150 +-
 food.h                                    |   27 +-
 lookup.h                                  |  400 +-
 main.c                                    |   15 +-
 meal.c                                    |  550 +-
 meal.h                                    |   18 +-
 menu.c                                    |  136 +-
 menu.h                                    |   10 +-
 nut.1                                     |  149 +-
 nut.h                                     |  237 +-
 nut.html                                  |  149 +-
 nut.xpm                                   |  883 ---
 nuticon.png                               |  Bin 0 -> 6816 bytes
 nuticon.xpm                               |   51 +
 nutrient.h                                |    6 +-
 options.c                                 | 1339 +++--
 options.h                                 |   66 +-
 preprocess/Makefile                       |    5 +
 preprocess/README                         |   15 +-
 preprocess/dbfoodname                     |    0
 preprocess/dbjoin                         |   11 +-
 preprocess/dbjoinheaders                  |   15 +-
 preprocess/dbjoinnuts                     |    0
 preprocess/dbjoinweight                   |    0
 preprocess/dbjoinwlib                     |    0
 preprocess/dbjw.c                         |    4 +
 preprocess/foodedits                      |   58 +
 preprocess/namedits                       |   15 +-
 prtmenu.c                                 |   51 +-
 prtmenu.h                                 |   12 +-
 ranking.c                                 |    4 +-
 ranking.h                                 |   10 +-
 raw.data/FOOD_DES.txt                     |    0
 raw.data/NUT_DATA.txt                     |    1 -
 raw.data/WEIGHT.lib                       | 4112 ++++++++------
 raw.data/WEIGHT.txt                       |    0
 raw.data/sr22.nut                         | 7538 -------------------------
 raw.data/sr26.nut                         | 8463 +++++++++++++++++++++++++++++
 recmeal.c                                 |  132 +-
 recmeal.h                                 |   12 +-
 remmeal.c                                 |    7 +-
 remmeal.h                                 |   10 +-
 theusual.c                                |   18 +-
 theusual.h                                |   10 +-
 trendy.c                                  |   40 +-
 trendy.h                                  |   12 +-
 util.c                                    |   11 +-
 util.h                                    |   10 +-
 viewfood.c                                |   21 +-
 viewfood.h                                |   10 +-
 167 files changed, 21759 insertions(+), 12495 deletions(-)
 create mode 100644 fltk/AddRecipe.cc
 create mode 100644 fltk/AddRecipe.h
 create mode 100644 fltk/AddToMealWidget.cc
 copy anameal.h => fltk/AddToMealWidget.h (65%)
 create mode 100644 fltk/AnalyzeMeals.cc
 create mode 100644 fltk/AnalyzeMeals.h
 copy ranking.h => fltk/BackToMenu.cc (51%)
 copy anameal.h => fltk/BackToMenu.h (70%)
 copy menu.h => fltk/BodyFatValueOutput.cc (52%)
 copy anameal.h => fltk/BodyFatValueOutput.h (69%)
 create mode 100644 fltk/CalorieValueOutput.cc
 copy anameal.h => fltk/CalorieValueOutput.h (65%)
 copy ranking.h => fltk/CancelWidget.cc (59%)
 copy anameal.h => fltk/CancelWidget.h (71%)
 create mode 100644 fltk/DVValueOutput.cc
 copy anameal.h => fltk/DVValueOutput.h (69%)
 copy menu.h => fltk/DeficNut.cc (53%)
 copy anameal.h => fltk/DeficNut.h (69%)
 create mode 100644 fltk/FoodButton.cc
 copy anameal.h => fltk/FoodButton.h (70%)
 create mode 100644 fltk/FoodChoice.cc
 copy ranking.h => fltk/FoodChoice.h (50%)
 create mode 100644 fltk/FoodRanking.cc
 create mode 100644 fltk/FoodRanking.h
 create mode 100644 fltk/FoodSuggestions.cc
 copy ranking.h => fltk/FoodSuggestions.h (50%)
 create mode 100644 fltk/GOLightButton.cc
 copy anameal.h => fltk/GOLightButton.h (69%)
 copy ranking.h => fltk/GramValueOutput.cc (54%)
 copy anameal.h => fltk/GramValueOutput.h (69%)
 create mode 100644 fltk/Makefile
 copy ranking.h => fltk/MealCountValueOutput.cc (58%)
 copy anameal.h => fltk/MealCountValueOutput.h (70%)
 create mode 100644 fltk/MealFood.cc
 copy ranking.h => fltk/MealFood.h (54%)
 create mode 100644 fltk/MealFoodValueOutput.cc
 copy anameal.h => fltk/MealFoodValueOutput.h (69%)
 create mode 100644 fltk/MealValueOutput.cc
 copy ranking.h => fltk/MealValueOutput.h (60%)
 create mode 100644 fltk/MissMealWidget.cc
 copy anameal.h => fltk/MissMealWidget.h (63%)
 copy ranking.h => fltk/NewRecipeWidget.cc (59%)
 copy anameal.h => fltk/NewRecipeWidget.h (70%)
 create mode 100644 fltk/Nut.cc
 create mode 100644 fltk/Nut.h
 copy menu.h => fltk/NutButton.cc (55%)
 copy anameal.h => fltk/NutButton.h (71%)
 create mode 100644 fltk/NutButtonWidget.cc
 copy ranking.h => fltk/NutButtonWidget.h (55%)
 create mode 100644 fltk/NutCharts.cc
 copy ranking.h => fltk/NutCharts.h (58%)
 create mode 100644 fltk/NutValue.cc
 create mode 100644 fltk/NutValue.h
 copy menu.h => fltk/Nut_Box.cc (71%)
 copy ranking.h => fltk/Nut_Box.h (74%)
 copy menu.h => fltk/Nut_Button.cc (70%)
 copy ranking.h => fltk/Nut_Button.h (72%)
 copy menu.h => fltk/Nut_Input.cc (70%)
 copy ranking.h => fltk/Nut_Input.h (73%)
 copy menu.h => fltk/Nut_LightButton.cc (67%)
 copy anameal.h => fltk/Nut_LightButton.h (70%)
 copy ranking.h => fltk/Nut_LineChart.cc (56%)
 copy anameal.h => fltk/Nut_LineChart.h (71%)
 copy menu.h => fltk/Nut_MenuButton.cc (68%)
 copy anameal.h => fltk/Nut_MenuButton.h (70%)
 copy menu.h => fltk/Nut_Pack.cc (69%)
 copy ranking.h => fltk/Nut_Pack.h (74%)
 copy menu.h => fltk/Nut_ReturnButton.cc (67%)
 copy anameal.h => fltk/Nut_ReturnButton.h (69%)
 copy menu.h => fltk/Nut_Scroll.cc (70%)
 copy ranking.h => fltk/Nut_Scroll.h (73%)
 copy menu.h => fltk/Nut_ToggleButton.cc (67%)
 copy anameal.h => fltk/Nut_ToggleButton.h (69%)
 create mode 100644 fltk/Nut_ValueOutput.cc
 copy anameal.h => fltk/Nut_ValueOutput.h (69%)
 copy menu.h => fltk/Nut_Window.cc (52%)
 copy ranking.h => fltk/Nut_Window.h (72%)
 copy ranking.h => fltk/OunceValueOutput.cc (52%)
 copy anameal.h => fltk/OunceValueOutput.h (69%)
 create mode 100644 fltk/PCF.cc
 copy ranking.h => fltk/PCF.h (59%)
 create mode 100644 fltk/PersonalOptions.cc
 copy ranking.h => fltk/PersonalOptions.h (51%)
 copy ranking.h => fltk/PrintMenus.cc (53%)
 copy anameal.h => fltk/PrintMenus.h (70%)
 create mode 100644 fltk/RecordMeals.cc
 create mode 100644 fltk/RecordMeals.h
 create mode 100644 fltk/ServingMenuButton.cc
 copy ranking.h => fltk/ServingMenuButton.h (60%)
 create mode 100644 fltk/ServingValueOutput.cc
 copy anameal.h => fltk/ServingValueOutput.h (64%)
 create mode 100644 fltk/TheStory.cc
 copy ranking.h => fltk/TheStory.h (53%)
 create mode 100644 fltk/TheUsualMenuButton.cc
 copy anameal.h => fltk/TheUsualMenuButton.h (64%)
 create mode 100644 fltk/TheUsualNameWidget.cc
 copy anameal.h => fltk/TheUsualNameWidget.h (64%)
 create mode 100644 fltk/ViewFoods.cc
 create mode 100644 fltk/ViewFoods.h
 create mode 100644 fltk/WeightCharts.cc
 create mode 100644 fltk/WeightCharts.h
 create mode 100644 fltk/WeightLogWidget.cc
 copy ranking.h => fltk/WeightLogWidget.h (54%)
 create mode 100644 fltk/main.cc
 delete mode 100644 nut.xpm
 create mode 100644 nuticon.png
 create mode 100644 nuticon.xpm
 mode change 100755 => 100644 preprocess/dbfoodname
 mode change 100755 => 100644 preprocess/dbjoin
 mode change 100755 => 100644 preprocess/dbjoinheaders
 mode change 100755 => 100644 preprocess/dbjoinnuts
 mode change 100755 => 100644 preprocess/dbjoinweight
 mode change 100755 => 100644 preprocess/dbjoinwlib
 delete mode 100644 raw.data/FOOD_DES.txt
 delete mode 100644 raw.data/NUT_DATA.txt
 delete mode 100644 raw.data/WEIGHT.txt
 delete mode 100644 raw.data/sr22.nut
 create mode 100644 raw.data/sr26.nut

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



More information about the debian-med-commit mailing list