[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUtrition-commits] /srv/bzr/gnutrition/development r26: Added REVISION
|
From: |
Thomas Sinclair |
|
Subject: |
[GNUtrition-commits] /srv/bzr/gnutrition/development r26: Added REVISION token (number) to versioning scheme to be incremented |
|
Date: |
Wed, 25 Jul 2012 00:49:08 -0400 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 26
committer: Thomas Sinclair <address@hidden>
branch nick: development
timestamp: Wed 2012-07-25 00:49:08 -0400
message:
Added REVISION token (number) to versioning scheme to be incremented
for minor changes when it is judged inappropriate to increment MINOR number.
Version number now is MAJOR.MINOR.REVISION.
Eliminated a save dialog when a recipe is displayed but not modified and
'Quit'
is selected from menu.
modified:
autom4te.cache/output.0
autom4te.cache/traces.0
configure
configure.in
src/install.py.in
src/recipe_win.py
=== modified file 'autom4te.cache/output.0'
--- a/autom4te.cache/output.0 2012-07-22 20:00:57 +0000
+++ b/autom4te.cache/output.0 2012-07-25 04:49:08 +0000
@@ -573,6 +573,7 @@
PYTHON_VERSION
PYTHON
VERSION
+REVISION
MINOR_VERSION
MAJOR_VERSION
PACKAGE
@@ -1660,7 +1661,9 @@
MAJOR_VERSION=0
MINOR_VERSION=32
-VERSION="0.32"
+REVISION=1
+VERSION="0.32.1"
+
=== modified file 'autom4te.cache/traces.0'
--- a/autom4te.cache/traces.0 2012-07-22 20:00:57 +0000
+++ b/autom4te.cache/traces.0 2012-07-25 04:49:08 +0000
@@ -149,56 +149,59 @@
m4trace:configure.in:23: -1- AC_SUBST([PACKAGE])
m4trace:configure.in:23: -1- AC_SUBST_TRACE([PACKAGE])
m4trace:configure.in:23: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.in:28: -1- AC_SUBST([MAJOR_VERSION])
-m4trace:configure.in:28: -1- AC_SUBST_TRACE([MAJOR_VERSION])
-m4trace:configure.in:28: -1- m4_pattern_allow([^MAJOR_VERSION$])
-m4trace:configure.in:29: -1- AC_SUBST([MINOR_VERSION])
-m4trace:configure.in:29: -1- AC_SUBST_TRACE([MINOR_VERSION])
-m4trace:configure.in:29: -1- m4_pattern_allow([^MINOR_VERSION$])
-m4trace:configure.in:30: -1- AC_SUBST([VERSION])
-m4trace:configure.in:30: -1- AC_SUBST_TRACE([VERSION])
-m4trace:configure.in:30: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.in:33: -1- AC_SUBST([PYTHON])
-m4trace:configure.in:33: -1- AC_SUBST_TRACE([PYTHON])
-m4trace:configure.in:33: -1- m4_pattern_allow([^PYTHON$])
-m4trace:configure.in:34: -1- AC_SUBST([PYTHON])
-m4trace:configure.in:34: -1- AC_SUBST_TRACE([PYTHON])
-m4trace:configure.in:34: -1- m4_pattern_allow([^PYTHON$])
-m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:49: the top level])
-m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:49: the top level])
-m4trace:configure.in:64: -1- AC_SUBST([PYTHON_VERSION])
-m4trace:configure.in:64: -1- AC_SUBST_TRACE([PYTHON_VERSION])
-m4trace:configure.in:64: -1- m4_pattern_allow([^PYTHON_VERSION$])
-m4trace:configure.in:65: -1- AC_SUBST([PYTHON_PREFIX])
-m4trace:configure.in:65: -1- AC_SUBST_TRACE([PYTHON_PREFIX])
-m4trace:configure.in:65: -1- m4_pattern_allow([^PYTHON_PREFIX$])
-m4trace:configure.in:66: -1- AC_SUBST([PYTHON_SITE_DIR])
-m4trace:configure.in:66: -1- AC_SUBST_TRACE([PYTHON_SITE_DIR])
-m4trace:configure.in:66: -1- m4_pattern_allow([^PYTHON_SITE_DIR$])
-m4trace:configure.in:68: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.in:68: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.in:68: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.in:68: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.in:68: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.in:68: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.in:68: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.in:68: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.in:68: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.in:68: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.in:69: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.in:69: -1- AC_SUBST_TRACE([SET_MAKE])
-m4trace:configure.in:69: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:80: the top level])
-m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:80: the top level])
-m4trace:configure.in:88: -1- AC_CONFIG_FILES([run-gnutrition.py\
+m4trace:configure.in:29: -1- AC_SUBST([MAJOR_VERSION])
+m4trace:configure.in:29: -1- AC_SUBST_TRACE([MAJOR_VERSION])
+m4trace:configure.in:29: -1- m4_pattern_allow([^MAJOR_VERSION$])
+m4trace:configure.in:30: -1- AC_SUBST([MINOR_VERSION])
+m4trace:configure.in:30: -1- AC_SUBST_TRACE([MINOR_VERSION])
+m4trace:configure.in:30: -1- m4_pattern_allow([^MINOR_VERSION$])
+m4trace:configure.in:31: -1- AC_SUBST([REVISION])
+m4trace:configure.in:31: -1- AC_SUBST_TRACE([REVISION])
+m4trace:configure.in:31: -1- m4_pattern_allow([^REVISION$])
+m4trace:configure.in:32: -1- AC_SUBST([VERSION])
+m4trace:configure.in:32: -1- AC_SUBST_TRACE([VERSION])
+m4trace:configure.in:32: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.in:35: -1- AC_SUBST([PYTHON])
+m4trace:configure.in:35: -1- AC_SUBST_TRACE([PYTHON])
+m4trace:configure.in:35: -1- m4_pattern_allow([^PYTHON$])
+m4trace:configure.in:36: -1- AC_SUBST([PYTHON])
+m4trace:configure.in:36: -1- AC_SUBST_TRACE([PYTHON])
+m4trace:configure.in:36: -1- m4_pattern_allow([^PYTHON$])
+m4trace:configure.in:51: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:51: the top level])
+m4trace:configure.in:51: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:51: the top level])
+m4trace:configure.in:66: -1- AC_SUBST([PYTHON_VERSION])
+m4trace:configure.in:66: -1- AC_SUBST_TRACE([PYTHON_VERSION])
+m4trace:configure.in:66: -1- m4_pattern_allow([^PYTHON_VERSION$])
+m4trace:configure.in:67: -1- AC_SUBST([PYTHON_PREFIX])
+m4trace:configure.in:67: -1- AC_SUBST_TRACE([PYTHON_PREFIX])
+m4trace:configure.in:67: -1- m4_pattern_allow([^PYTHON_PREFIX$])
+m4trace:configure.in:68: -1- AC_SUBST([PYTHON_SITE_DIR])
+m4trace:configure.in:68: -1- AC_SUBST_TRACE([PYTHON_SITE_DIR])
+m4trace:configure.in:68: -1- m4_pattern_allow([^PYTHON_SITE_DIR$])
+m4trace:configure.in:70: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.in:70: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.in:70: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.in:70: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.in:70: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.in:70: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.in:70: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.in:70: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.in:70: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.in:70: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.in:71: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.in:71: -1- AC_SUBST_TRACE([SET_MAKE])
+m4trace:configure.in:71: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.in:82: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:82: the top level])
+m4trace:configure.in:82: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:82: the top level])
+m4trace:configure.in:90: -1- AC_CONFIG_FILES([run-gnutrition.py\
src/install.py\
Makefile\
src/Makefile\
@@ -208,21 +211,21 @@
rpm/Makefile\
rpm/gnutrition.spec\
debian/Makefile])
-m4trace:configure.in:88: -1- _m4_warn([obsolete], [AC_OUTPUT should be used
without arguments.
+m4trace:configure.in:90: -1- _m4_warn([obsolete], [AC_OUTPUT should be used
without arguments.
You should run autoupdate.], [])
-m4trace:configure.in:88: -1- AC_SUBST([LIB@&address@hidden, [$ac_libobjs])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([LIB@&address@hidden)
-m4trace:configure.in:88: -1- m4_pattern_allow([^LIB@&address@hidden)
-m4trace:configure.in:88: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.in:88: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.in:90: -1- AC_SUBST([LIB@&address@hidden, [$ac_libobjs])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([LIB@&address@hidden)
+m4trace:configure.in:90: -1- m4_pattern_allow([^LIB@&address@hidden)
+m4trace:configure.in:90: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.in:90: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.in:90: -1- AC_SUBST_TRACE([INSTALL])
=== modified file 'configure'
--- a/configure 2012-07-22 20:00:57 +0000
+++ b/configure 2012-07-25 04:49:08 +0000
@@ -573,6 +573,7 @@
PYTHON_VERSION
PYTHON
VERSION
+REVISION
MINOR_VERSION
MAJOR_VERSION
PACKAGE
@@ -1660,7 +1661,9 @@
MAJOR_VERSION=0
MINOR_VERSION=32
-VERSION="0.32"
+REVISION=1
+VERSION="0.32.1"
+
=== modified file 'configure.in'
--- a/configure.in 2012-07-22 20:00:57 +0000
+++ b/configure.in 2012-07-25 04:49:08 +0000
@@ -24,9 +24,11 @@
MAJOR_VERSION=0
MINOR_VERSION=32
-VERSION="0.32"
+REVISION=1
+VERSION="0.32.1"
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
+AC_SUBST(REVISION)
AC_SUBST(VERSION)
dnl Get the default Python
=== modified file 'src/install.py.in'
--- a/src/install.py.in 2012-06-26 19:06:03 +0000
+++ b/src/install.py.in 2012-07-25 04:49:08 +0000
@@ -15,5 +15,6 @@
MAJOR_VERSION = @MAJOR_VERSION@
MINOR_VERSION = @MINOR_VERSION@
-VERSION = "@address@hidden@MINOR_VERSION@"
+REVISION = @REVISION@
+VERSION = "@address@hidden@address@hidden@REVISION@"
idir = "@prefix@/share/gnutrition"
=== modified file 'src/recipe_win.py'
--- a/src/recipe_win.py 2012-07-25 02:47:59 +0000
+++ b/src/recipe_win.py 2012-07-25 04:49:08 +0000
@@ -107,8 +107,9 @@
self.food_edit_dlg.show(ingr, gnutr_consts.RECIPE)
def on_exit_activate(self, w, d=None):
- if self.is_dirty:
- self.ask_save("Save your work?")
+ if len(self.get_ingredient_list()) > 0 or self.prep_description():
+ if self.is_dirty():
+ self.ask_save("Save your work?")
gtk.main_quit()
def on_about_activate(self, w, d=None):
@@ -220,35 +221,50 @@
self.db.query("DELETE FROM preparation WHERE recipe_no = '%s'"
% (recipe_num))
+ def prep_description(self):
+ start = self.ui.text_buffer.get_start_iter();
+ end = self.ui.text_buffer.get_end_iter();
+ return self.ui.text_buffer.get_text(start, end, True)
+
+ def grab_window(self):
+ desc = self.ui.recipe_entry.get_text()
+ num_serv = self.ui.num_serv_entry.get_text()
+ cat_desc = self.ui.category_combo.get_active_text()
+ prep_desc = self.prep_description()
+ return (desc,num_serv,cat_desc,prep_desc)
+
def get_recipe(self):
- recipe = gnutr.Recipe()
- recipe.num_serv = self.ui.num_serv_entry.get_text()
- recipe.desc = self.ui.recipe_entry.get_text()
- recipe.cat_desc = self.ui.category_combo.get_active_text()
-
- start = self.ui.text_buffer.get_start_iter();
- end = self.ui.text_buffer.get_end_iter();
- recipe.prep_desc = self.ui.text_buffer.get_text(start, end, True)
+ r = gnutr.Recipe()
+ (r.desc,r.num_serv,r.cat_desc,r.prep_desc) = self.grab_window()
- if not recipe.desc:
+ if not r.desc:
gnutr.Dialog('error', 'No recipe name is defined.', self.parent)
return None
- if not recipe.num_serv:
+ if not r.num_serv:
gnutr.Dialog('error',
"""The number of servings is not defined,
or is not a number.""", self.parent)
return None
- recipe.cat_num = self.store.cat_desc2num[recipe.cat_desc]
- recipe.ingr_list = self.get_ingredient_list()
- return recipe
+ r.cat_num = self.store.cat_desc2num[r.cat_desc]
+ r.ingr_list = self.get_ingredient_list()
+ return r
+ def empty_window(self):
+ (desc, num_serv, cat_desc, prep_desc) = self.grab_window()
+ if desc or num_serv or cat_desc or prep_desc: return False
+ return True
+
def is_dirty(self):
if self.dirty:
print 'Dirty flag is set.'
return True
+ if self.empty_window():
+ print 'No recipe displayed.'
+ return False
showing = self.get_recipe()
+ if not showing: return False
if not self.check_recipe_exists(showing.desc):
print 'Recipe name has changed.'
return True
@@ -274,7 +290,7 @@
start = self.ui.text_buffer.get_start_iter();
end = self.ui.text_buffer.get_end_iter();
- curr_prep_desc = self.ui.text_buffer.get_text(start, end, True)
+ curr_prep_desc = self.prep_description()
if prep_desc != curr_prep_desc:
print 'Recipe Instructions have changed.'
return True
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUtrition-commits] /srv/bzr/gnutrition/development r26: Added REVISION token (number) to versioning scheme to be incremented,
Thomas Sinclair <=