[GNUtrition-commits] /srv/bzr/gnutrition/trunk r18: Applying patch from Adam Rakowski

[Jason Self]

------------------------------------------------------------
revno: 18
committer: Jason Self <address@hidden>
branch nick: trunk
timestamp: Sat 2013-01-12 23:38:18 -0800
message:
  Applying patch from Adam Rakowski
removed:
  gnutr.py
  run-gnutrition.py.in
modified:
  Makefile.in
  configure
  configure.in

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-11-18 23:26:59 +0000
+++ b/Makefile.in       2013-01-13 07:38:18 +0000
@@ -30,7 +30,7 @@
 
 files = AUTHORS autogen.sh COPYING gnutrition.desktop py-compile \
        Changelog configure install-sh INSTALL configure.in \
-       run-gnutrition.py.in Makefile.in README
+       Makefile.in README
 
 all:
        for dir in $(SUBDIRS); do \

=== modified file 'configure'
--- a/configure 2012-11-18 23:26:59 +0000
+++ b/configure 2013-01-13 07:38:18 +0000
@@ -2632,7 +2632,6 @@
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "run-gnutrition.py") CONFIG_FILES="$CONFIG_FILES run-gnutrition.py" ;;
     "src/install.py") CONFIG_FILES="$CONFIG_FILES src/install.py" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;

=== modified file 'configure.in'
--- a/configure.in      2012-11-18 23:26:59 +0000
+++ b/configure.in      2013-01-13 07:38:18 +0000
@@ -87,8 +87,7 @@
 **** The python interpreter can't find the python bindings for gtk.])
 fi
 
-AC_OUTPUT( run-gnutrition.py\
-       src/install.py\
+AC_OUTPUT( src/install.py\
        Makefile\
        src/Makefile\
        src/util/Makefile\

=== removed file 'gnutr.py'
--- a/gnutr.py  2012-05-19 23:15:46 +0000
+++ b/gnutr.py  1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#!/usr/bin/python
-# Generated automatically from run-gnutrition.py.in by configure.
-#
-#  GNUtrition - a nutrition and diet analysis program.
-#  Copyright (C) 2001 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#  This file is installed as $(prefix)/bin/gnutrition and 
-
-import sys, os
-import src.run_app

=== removed file 'run-gnutrition.py.in'
--- a/run-gnutrition.py.in      2012-05-28 23:45:47 +0000
+++ b/run-gnutrition.py.in      1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-# @configure_input@
-#
-#  GNUtrition - a nutrition and diet analysis program.
-#  Copyright (C) 2001-2002 Edgar Denny (address@hidden)
-#  Copyright (C) 2010 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This file is installed as $(prefix)/bin/gnutrition and 
-
-import sys, os
-
-os.chdir("@prefix@/share/gnutrition/")
-sys.path.append("@prefix@/lib/gnutrition/")
-sys.path.append("@prefix@/share/gnutrition/")
-
-import src.run_app