Hello community, here is the log from the commit of package jgmenu for openSUSE:Factory checked in at 2020-05-20 18:46:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jgmenu (Old) and /work/SRC/openSUSE:Factory/.jgmenu.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jgmenu" Wed May 20 18:46:23 2020 rev:16 rq:807447 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/jgmenu/jgmenu.changes 2020-05-07 14:55:44.870429328 +0200 +++ /work/SRC/openSUSE:Factory/.jgmenu.new.2738/jgmenu.changes 2020-05-20 18:46:34.345431955 +0200 @@ -1,0 +2,6 @@ +Wed May 20 06:09:56 UTC 2020 - Michael Vetter <mvet...@suse.com> + +- Update to 4.2.1: + * Fix apps module bug (issue #119) + +------------------------------------------------------------------- Old: ---- v4.2.0.tar.gz New: ---- v4.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jgmenu.spec ++++++ --- /var/tmp/diff_new_pack.O8ZEWO/_old 2020-05-20 18:46:35.205433888 +0200 +++ /var/tmp/diff_new_pack.O8ZEWO/_new 2020-05-20 18:46:35.209433896 +0200 @@ -17,7 +17,7 @@ Name: jgmenu -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: Small X11 menu intended to be used with openbox and tint2 License: GPL-2.0-only ++++++ v4.2.0.tar.gz -> v4.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/NEWS.md new/jgmenu-4.2.1/NEWS.md --- old/jgmenu-4.2.0/NEWS.md 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/NEWS.md 2020-05-19 23:06:42.000000000 +0200 @@ -8,6 +8,7 @@ | Date | Release Notes | |------------|-----------------------------------| +| 2020-05-19 | [v4.2.1](docs/relnotes/4.2.1.txt) | | 2020-05-06 | [v4.2.0](docs/relnotes/4.2.0.txt) | | 2020-03-02 | [v4.1.0](docs/relnotes/4.1.0.txt) | | 2020-02-02 | [v4.0.2](docs/relnotes/4.0.2.txt) | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/debian/changelog new/jgmenu-4.2.1/debian/changelog --- old/jgmenu-4.2.0/debian/changelog 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/debian/changelog 2020-05-19 23:06:42.000000000 +0200 @@ -1,3 +1,9 @@ +jgmenu (4.2.1-1) unstable; urgency=medium + + * New upstream release + + -- Johan Malm <jgm...@gmail.com> Tue, 19 May 2020 22:04:21 +0100 + jgmenu (4.2.0-1) unstable; urgency=medium * New upstream release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/debian/control new/jgmenu-4.2.1/debian/control --- old/jgmenu-4.2.0/debian/control 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/debian/control 2020-05-19 23:06:42.000000000 +0200 @@ -6,7 +6,7 @@ Homepage: https://jgmenu.github.io/ Build-Depends: debhelper (>= 10), libx11-dev, libxrandr-dev, libcairo2-dev, libpango1.0-dev, librsvg2-dev, libxml2-dev, libglib2.0-dev, libmenu-cache-dev, - pkg-config, xfce4-panel-dev + pkg-config, libxfce4panel-2.0-dev Package: jgmenu Architecture: any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/debian/jgmenu-xfce4-panel-applet.install new/jgmenu-4.2.1/debian/jgmenu-xfce4-panel-applet.install --- old/jgmenu-4.2.0/debian/jgmenu-xfce4-panel-applet.install 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/debian/jgmenu-xfce4-panel-applet.install 2020-05-19 23:06:42.000000000 +0200 @@ -1,2 +1,2 @@ -usr/lib/*/xfce4/* -usr/share/xfce4/panel/plugins/* +usr/lib/xfce4/* +usr/share/xfce4/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/docs/relnotes/4.2.1.txt new/jgmenu-4.2.1/docs/relnotes/4.2.1.txt --- old/jgmenu-4.2.0/docs/relnotes/4.2.1.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/jgmenu-4.2.1/docs/relnotes/4.2.1.txt 2020-05-19 23:06:42.000000000 +0200 @@ -0,0 +1,7 @@ +jgmenu v4.2.1 release notes +=========================== + +Updates since v4.2.0 +-------------------- + + * Fix apps module bug (issue #119) Helped-by: @geolaw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/scripts/check new/jgmenu-4.2.1/scripts/check --- old/jgmenu-4.2.0/scripts/check 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/scripts/check 2020-05-19 23:06:42.000000000 +0200 @@ -38,14 +38,15 @@ analyse () { [[ -e $1 ]] || die "file ($1) does not exist" + say " CHECK $1" if [[ $(file $1) == *shell\ script* ]]; then + say " [checkbashisms]" + perl ./scripts/checkbashisms.pl --force "$1" [[ $g_shellcheck = f ]] && return - say " CHECK $1" say " [shellcheck]" shellcheck "$1" fi if [[ $(file $1) == *C\ source* ]]; then - say " CHECK $1" if [[ $g_cppcheck = t ]]; then say " [cppcheck]" ./scripts/cppcheck-wrapper.sh "$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/scripts/checkbashisms-wrapper.sh new/jgmenu-4.2.1/scripts/checkbashisms-wrapper.sh --- old/jgmenu-4.2.0/scripts/checkbashisms-wrapper.sh 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/scripts/checkbashisms-wrapper.sh 2020-05-19 23:06:42.000000000 +0200 @@ -2,7 +2,7 @@ printf "%s\n" "Checking shell scripts for bashisms..." -find . -name "*.sh" | xargs perl ./scripts/checkbashisms.pl --force 2>&1 \ +find src/ -name "*.sh" | xargs perl ./scripts/checkbashisms.pl --force 2>&1 \ | grep -v "^could not find" printf "%s\n" "Searching for files staring with '#!/bin/bash'..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/scripts/pbuild new/jgmenu-4.2.1/scripts/pbuild --- old/jgmenu-4.2.0/scripts/pbuild 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/scripts/pbuild 2020-05-19 23:06:42.000000000 +0200 @@ -37,6 +37,8 @@ export DH_VERBOSE=1 " + +# fallbacks dist=buster arch=amd64 @@ -189,6 +191,11 @@ Using pdebuild with ${base_stem}-${dist}-${arch}.tgz... " +echo "Press Enter to continue, any other key to exit:" + +read -srn1 +[[ -n $REPLY ]] && exit + pdebuild $sign_arg --architecture "${arch}" --buildresult "$results_dir" --logfile "${logfile}.pbuild" --debbuildopts -b -- --basetgz "${base_stem}-${dist}-${arch}.tgz" || error_exit "pdebuild failed" cat "${logfile}.pbuild" >> "${logfile}" || error_exit "failed to merge ${logfile}.pbuild with ${logfile}" @@ -199,5 +206,4 @@ log ' running Lintian...' -lintian --pedantic --info "$results_dir/${pkg_name}_${pkg_ver}_${arch}.changes" | tee -a "$logfile" - +lintian --pedantic --info "$results_dir/${pkg_name}_${pkg_ver}_${arch}.changes" | tee -a "$logfile" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/scripts/version-gen.sh new/jgmenu-4.2.1/scripts/version-gen.sh --- old/jgmenu-4.2.0/scripts/version-gen.sh 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/scripts/version-gen.sh 2020-05-19 23:06:42.000000000 +0200 @@ -8,7 +8,7 @@ # Change "default_version" before doing a `git tag -a ...` # -default_version="4.2.0" +default_version="4.2.1" v=$(git describe --dirty --abbrev=1 2>/dev/null) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/src/desktop.c new/jgmenu-4.2.1/src/desktop.c --- old/jgmenu-4.2.0/src/desktop.c 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/src/desktop.c 2020-05-19 23:06:42.000000000 +0200 @@ -188,6 +188,7 @@ struct sbuf *dir; struct sbuf s; static int has_already_run; + struct app *app; BUG_ON(has_already_run); has_already_run = 1; @@ -207,6 +208,7 @@ sbuf_list_free(&xdg_data_dirs); /* NULL terminate vector */ - grow_vector_by_one_app(); + app = grow_vector_by_one_app(); + app->end = true; return apps; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/src/desktop.h new/jgmenu-4.2.1/src/desktop.h --- old/jgmenu-4.2.0/src/desktop.h 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/src/desktop.h 2020-05-19 23:06:42.000000000 +0200 @@ -17,6 +17,7 @@ char filename[128]; bool terminal; bool has_been_mapped; + bool end; }; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-4.2.0/src/jgmenu-apps.c new/jgmenu-4.2.1/src/jgmenu-apps.c --- old/jgmenu-4.2.0/src/jgmenu-apps.c 2020-05-06 20:58:06.000000000 +0200 +++ new/jgmenu-4.2.1/src/jgmenu-apps.c 2020-05-19 23:06:42.000000000 +0200 @@ -93,7 +93,7 @@ { struct app *app; - for (app = apps; app->name[0] != '\0'; app += 1) { + for (app = apps; !app->end; app += 1) { if (app->nodisplay) continue; if (app->has_been_mapped) @@ -114,7 +114,7 @@ argv_strdup(&categories, dir->categories); argv_parse(&categories); - for (app = apps; app->name[0] != '\0'; app += 1) { + for (app = apps; !app->end; app += 1) { if (app->nodisplay) continue; @@ -193,7 +193,7 @@ sbuf_init(&buf); if (!no_prepend) cat("~/.config/jgmenu/prepend.csv"); - for (app = apps; app->name[0] != '\0'; app += 1) { + for (app = apps; !app->end; app += 1) { if (app->nodisplay) continue; print_app_to_buffer(app, &buf);
