This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository ncview.
commit b5a335d7d7c24893cee6b1d37574838a3380f52a Author: Bas Couwenberg <[email protected]> Date: Thu Mar 9 07:48:23 2017 +0100 Add patch to fix 'group' typo. --- debian/changelog | 1 + debian/patches/group-typo.patch | 37 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 39 insertions(+) diff --git a/debian/changelog b/debian/changelog index fefbc0c..09332bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ncview (2.1.8+ds-1) UNRELEASED; urgency=medium * New upstream release. * Bump Standards-Version to 3.9.8, no changes. * Drop autotools-dev from Build-Depends, pulled in via dh-autoreconf. + * Add patch to fix 'group' typo. -- Bas Couwenberg <[email protected]> Thu, 09 Mar 2017 07:31:25 +0100 diff --git a/debian/patches/group-typo.patch b/debian/patches/group-typo.patch new file mode 100644 index 0000000..9ab4111 --- /dev/null +++ b/debian/patches/group-typo.patch @@ -0,0 +1,37 @@ +Description: Fix 'gruop' typo, replace with 'group'. +Author: Bas Couwenberg <[email protected]> + +--- a/src/file_netcdf.c ++++ b/src/file_netcdf.c +@@ -755,7 +755,7 @@ int nc_inq_varid_grp( int ncid, char *va + if( debug ) printf( "nc_inq_varid_grp: should now be on the LAST group, here is groupname: >%s<\n", ncview_groupname( cur_gid )); + + varname_no_groups( varname, varname_sans_groups ); +- if( debug ) printf( "nc_inq_varid_grp: calling regular nc_inq_varid with group %d (%s) and varname_sans_gruops >%s<\n", ++ if( debug ) printf( "nc_inq_varid_grp: calling regular nc_inq_varid with group %d (%s) and varname_sans_groups >%s<\n", + cur_gid, ncview_groupname(cur_gid), varname_sans_groups ); + retval = nc_inq_varid( cur_gid, varname_sans_groups, varid ); + +--- a/src/interface/x_interface.c ++++ b/src/interface/x_interface.c +@@ -1334,16 +1334,16 @@ void x_init_widgets_varsel_menu_grp( Wid + * the group named "/" + */ + if( (count_nslashes( var_cursor->name )==0) && (strncmp( "/", group_cursor->string, 1)==0)) { +-printf( "root check: putting var %s in gruop %s\n", var_cursor->name, group_cursor->string ); ++printf( "root check: putting var %s in group %s\n", var_cursor->name, group_cursor->string ); + my_grp_num[i] = igrp; + break; + } + /* Var has at least one slash in its name */ + else if( strncmp( var_cursor->name, group_cursor->string, strlen(group_cursor->string) ) == 0 ) { +-printf( "non root check: putting var %s in gruop %s\n", var_cursor->name, group_cursor->string ); +- /* At this point a var with a group name that STARTS with another gruop name, ++printf( "non root check: putting var %s in group %s\n", var_cursor->name, group_cursor->string ); ++ /* At this point a var with a group name that STARTS with another group name, + * but is longer, will match. So we check to see if the var's name actually +- * ends with a slash where it should, if this is the right gruop. If it does ++ * ends with a slash where it should, if this is the right group. If it does + * end with a slash, then it's the right group name + */ + if( var_cursor->name[ strlen(group_cursor->string) ] == '/' ) { diff --git a/debian/patches/series b/debian/patches/series index 6d97d6f..449b58f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ manpage.patch autoreconf.patch netcdf-cc.patch determining-typo.patch +group-typo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ncview.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
