[GNUtrition-commits] /srv/bzr/gnutrition/trunk r3: Updating copyright statements based on previous commits

[Jason Self]

------------------------------------------------------------
revno: 3
committer: Jason Self <address@hidden>
branch nick: trunk
timestamp: Mon 2012-06-04 10:05:21 -0700
message:
  Updating copyright statements based on previous commits
modified:
  data/Makefile.in
  data/prep_data.py
  src/base_win.py
  src/base_win_ui.py
  src/config.py
  src/druid.py
  src/druid_ui.py
  src/file_select_dlg.py
  src/food_edit_dlg.py
  src/food_edit_dlg_ui.py
  src/food_srch_dlg_ui.py
  src/food_srch_res_dlg.py
  src/food_srch_res_dlg_ui.py
  src/food_win.py
  src/food_win_ui.py
  src/gnutr_stock.py
  src/gnutr_widgets.py
  src/help.py
  src/nutr_composition_dlg_ui.py
  src/nutr_goal_dlg_ui.py
  src/plan_add_dlg.py
  src/plan_add_dlg_ui.py
  src/plan_compute_dlg_ui.py
  src/plan_win_ui.py
  src/recipe_edit_dlg.py
  src/recipe_edit_dlg_ui.py
  src/recipe_srch_dlg.py
  src/recipe_srch_dlg_ui.py
  src/recipe_srch_res_dlg_ui.py
  src/recipe_win.py
  src/recipe_win_ui.py
  src/save_as.py

=== modified file 'data/Makefile.in'
--- a/data/Makefile.in  2012-05-29 13:27:02 +0000
+++ b/data/Makefile.in  2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 # GNUtrition - a nutrition and diet analysis program.
 # Copyright (C) 2001 Edgar Denny (address@hidden)
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'data/prep_data.py'
--- a/data/prep_data.py 2012-05-28 14:46:37 +0000
+++ b/data/prep_data.py 2012-06-04 17:05:21 +0000
@@ -1,4 +1,22 @@
 #!/usr/bin/env python
+#
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This file is part of GNUtrition.
+# 
+# GNUtrition is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNUtrition is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNUtrition.  If not, see <http://www.gnu.org/licenses/>.
+
 from os import path, rename
 
 pfx = path.join('..', 'data')

=== modified file 'src/base_win.py'
--- a/src/base_win.py   2012-05-28 03:12:23 +0000
+++ b/src/base_win.py   2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000 - 2002 Edgar Denny (address@hidden)
-#  Copuright (C) 2010 Free Software Foundation, Inc.
+#  Copuright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/base_win_ui.py'
--- a/src/base_win_ui.py        2012-05-28 14:53:51 +0000
+++ b/src/base_win_ui.py        2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000 - 2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/config.py'
--- a/src/config.py     2012-05-28 03:12:23 +0000
+++ b/src/config.py     2012-06-04 17:05:21 +0000
@@ -1,5 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000 - 2002 Edgar Denny (address@hidden)
+#  Copyright (C) 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/druid.py'
--- a/src/druid.py      2012-05-28 03:12:23 +0000
+++ b/src/druid.py      2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copryight (C) 2010 Free Software Foundation, Inc.
+#  Copryight (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/druid_ui.py'
--- a/src/druid_ui.py   2012-05-28 03:12:23 +0000
+++ b/src/druid_ui.py   2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 # GNUtrition - a nutrition and diet analysis program.
 # Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/file_select_dlg.py'
--- a/src/file_select_dlg.py    2012-05-28 03:12:23 +0000
+++ b/src/file_select_dlg.py    2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/food_edit_dlg.py'
--- a/src/food_edit_dlg.py      2012-05-28 03:12:23 +0000
+++ b/src/food_edit_dlg.py      2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  Guntrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/food_edit_dlg_ui.py'
--- a/src/food_edit_dlg_ui.py   2012-05-28 03:12:23 +0000
+++ b/src/food_edit_dlg_ui.py   2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/food_srch_dlg_ui.py'
--- a/src/food_srch_dlg_ui.py   2012-05-28 03:12:23 +0000
+++ b/src/food_srch_dlg_ui.py   2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/food_srch_res_dlg.py'
--- a/src/food_srch_res_dlg.py  2012-05-28 03:12:23 +0000
+++ b/src/food_srch_res_dlg.py  2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/food_srch_res_dlg_ui.py'
--- a/src/food_srch_res_dlg_ui.py       2012-05-28 03:12:23 +0000
+++ b/src/food_srch_res_dlg_ui.py       2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/food_win.py'
--- a/src/food_win.py   2012-05-28 03:12:23 +0000
+++ b/src/food_win.py   2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000 - 2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/food_win_ui.py'
--- a/src/food_win_ui.py        2012-05-28 03:12:23 +0000
+++ b/src/food_win_ui.py        2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/gnutr_stock.py'
--- a/src/gnutr_stock.py        2012-05-28 03:12:23 +0000
+++ b/src/gnutr_stock.py        2012-06-04 17:05:21 +0000
@@ -1,5 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
+#  Copyright (C) 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/gnutr_widgets.py'
--- a/src/gnutr_widgets.py      2012-05-28 03:12:23 +0000
+++ b/src/gnutr_widgets.py      2012-06-04 17:05:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This file is part of GNUtrition.
 # 

=== modified file 'src/help.py'
--- a/src/help.py       2012-05-28 03:12:23 +0000
+++ b/src/help.py       2012-06-04 17:05:21 +0000
@@ -1,5 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
+#  Copyright (C) 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/nutr_composition_dlg_ui.py'
--- a/src/nutr_composition_dlg_ui.py    2012-05-28 03:12:23 +0000
+++ b/src/nutr_composition_dlg_ui.py    2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 # GNUtrition - a nutrition and diet analysis program.
 # Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/nutr_goal_dlg_ui.py'
--- a/src/nutr_goal_dlg_ui.py   2012-05-28 03:12:23 +0000
+++ b/src/nutr_goal_dlg_ui.py   2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 # GNUtrition - a nutrition and diet analysis program.
 # Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/plan_add_dlg.py'
--- a/src/plan_add_dlg.py       2012-05-28 03:12:23 +0000
+++ b/src/plan_add_dlg.py       2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000 - 2002 Edgar Denny (address@hidden)
-# Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/plan_add_dlg_ui.py'
--- a/src/plan_add_dlg_ui.py    2012-05-28 03:12:23 +0000
+++ b/src/plan_add_dlg_ui.py    2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/plan_compute_dlg_ui.py'
--- a/src/plan_compute_dlg_ui.py        2012-05-28 03:12:23 +0000
+++ b/src/plan_compute_dlg_ui.py        2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 # GNUtrition - a nutrition and diet analysis program.
 # Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/plan_win_ui.py'
--- a/src/plan_win_ui.py        2012-05-28 03:12:23 +0000
+++ b/src/plan_win_ui.py        2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/recipe_edit_dlg.py'
--- a/src/recipe_edit_dlg.py    2012-05-28 03:12:23 +0000
+++ b/src/recipe_edit_dlg.py    2012-06-04 17:05:21 +0000
@@ -1,5 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
+#  Copyright (C) 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/recipe_edit_dlg_ui.py'
--- a/src/recipe_edit_dlg_ui.py 2012-05-28 03:12:23 +0000
+++ b/src/recipe_edit_dlg_ui.py 2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/recipe_srch_dlg.py'
--- a/src/recipe_srch_dlg.py    2012-05-28 03:12:23 +0000
+++ b/src/recipe_srch_dlg.py    2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/recipe_srch_dlg_ui.py'
--- a/src/recipe_srch_dlg_ui.py 2012-05-28 03:12:23 +0000
+++ b/src/recipe_srch_dlg_ui.py 2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/recipe_srch_res_dlg_ui.py'
--- a/src/recipe_srch_res_dlg_ui.py     2012-05-28 03:12:23 +0000
+++ b/src/recipe_srch_res_dlg_ui.py     2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/recipe_win.py'
--- a/src/recipe_win.py 2012-05-29 13:25:40 +0000
+++ b/src/recipe_win.py 2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000 - 2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/recipe_win_ui.py'
--- a/src/recipe_win_ui.py      2012-05-28 03:12:23 +0000
+++ b/src/recipe_win_ui.py      2012-06-04 17:05:21 +0000
@@ -1,6 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 Free Software Foundation, Inc.
+#  Copyright (C) 2010 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'src/save_as.py'
--- a/src/save_as.py    2012-05-28 03:12:23 +0000
+++ b/src/save_as.py    2012-06-04 17:05:21 +0000
@@ -1,5 +1,6 @@
 #  GNUtrition - a nutrition and diet analysis program.
 #  Copyright(C) 2000-2002 Edgar Denny (address@hidden)
+#  Copyright (C) 2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by