diff -Nru ukuu-16.7~32~ubuntu16.04.1/debian/bzr-builder.manifest ukuu-16.7.2~39~ubuntu16.04.1/debian/bzr-builder.manifest --- ukuu-16.7~32~ubuntu16.04.1/debian/bzr-builder.manifest 2016-07-08 17:13:13.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/debian/bzr-builder.manifest 2016-07-13 15:51:06.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}~32 -lp:ukuu revid:tony.george.kol@gmail.com-20160708165915-ow4igme40hd9929v +# bzr-builder format 0.3 deb-version {debupstream}~39 +lp:ukuu revid:tony.george.kol@gmail.com-20160713150259-tu5t13x10o2lqkd5 diff -Nru ukuu-16.7~32~ubuntu16.04.1/debian/changelog ukuu-16.7.2~39~ubuntu16.04.1/debian/changelog --- ukuu-16.7~32~ubuntu16.04.1/debian/changelog 2016-07-08 17:13:13.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/debian/changelog 2016-07-13 15:51:06.000000000 +0000 @@ -1,8 +1,31 @@ -ukuu (16.7~32~ubuntu16.04.1) xenial; urgency=low +ukuu (16.7.2~39~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Tony George Fri, 08 Jul 2016 17:13:13 +0000 + -- Tony George Wed, 13 Jul 2016 15:51:06 +0000 + +ukuu (16.7.2) trusty; urgency=medium + + * Fixed: Download progress status line is not refreshed correctly + in terminal window + + -- Tony George Wed, 13 Jul 2016 10:00:00 +0530 + + +ukuu (16.7.1) trusty; urgency=medium + + * Fixed: Update notification is not diplayed for minor update if the + 'notify major' option is selected in settings dialog + + * Fixed: Update notification should not be shown if the new kernel is + already installed on the system but not active + + * Fixed parsing of version string in format like '#40~14.04.1'(trusty) + + * Moved cache directory to ~/.cache/ukuu + + -- Tony George Tue, 12 Jul 2016 10:00:00 +0530 + ukuu (16.7) trusty; urgency=medium diff -Nru ukuu-16.7~32~ubuntu16.04.1/src/Common/DownloadManager.vala ukuu-16.7.2~39~ubuntu16.04.1/src/Common/DownloadManager.vala --- ukuu-16.7~32~ubuntu16.04.1/src/Common/DownloadManager.vala 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/src/Common/DownloadManager.vala 2016-07-13 15:51:05.000000000 +0000 @@ -309,14 +309,14 @@ format_file_size(progress_count, false, true), format_file_size(size, false, true), format_file_size(download_rate, false, true), - eta); + eta).replace("\n",""); } else{ status_line = "%s / %s, %s/s (%s)".printf( format_file_size(progress_count), format_file_size(size), format_file_size(download_rate), - eta); + eta).replace("\n",""); } //log_msg(status_line); diff -Nru ukuu-16.7~32~ubuntu16.04.1/src/Common/LinuxKernel.vala ukuu-16.7.2~39~ubuntu16.04.1/src/Common/LinuxKernel.vala --- ukuu-16.7~32~ubuntu16.04.1/src/Common/LinuxKernel.vala 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/src/Common/LinuxKernel.vala 2016-07-13 15:51:05.000000000 +0000 @@ -121,7 +121,7 @@ string[] arr = std_out.split(ver); if (arr.length > 0){ - string[] parts = arr[1].strip().split_set(" -_"); + string[] parts = arr[1].strip().split_set(" -_~"); string partnum = parts[0].strip(); if (partnum.has_prefix("#")){ partnum = partnum[1:partnum.length]; @@ -574,13 +574,22 @@ if (!kern.is_valid){ continue; } + // skip unstable if (kern.is_unstable){ continue; } + // skip installed + if (kern.is_installed){ + continue; + } + + //log_msg("check: %s".printf(kern.version_main)); + if (kernel_latest_stable == null){ kernel_latest_stable = kern; + log_debug("latest stable kernel -> %s".printf(kern.version_main)); } bool major_available = false; @@ -605,10 +614,12 @@ if (major_available && (kernel_update_major == null)){ kernel_update_major = kern; + log_debug("major update -> %s".printf(kern.version_main)); } if (minor_available && (kernel_update_minor == null)){ kernel_update_minor = kern; + log_debug("minor update -> %s".printf(kern.version_main)); } if ((kernel_update_major != null) @@ -1093,7 +1104,7 @@ while (mgr.is_running){ sleep(200); - stdout.printf("\r%-70s".printf(mgr.status_line)); + stdout.printf("\r%-60s".printf(mgr.status_line.replace("\n",""))); stdout.flush(); } diff -Nru ukuu-16.7~32~ubuntu16.04.1/src/Common/Main.vala ukuu-16.7.2~39~ubuntu16.04.1/src/Common/Main.vala --- ukuu-16.7~32~ubuntu16.04.1/src/Common/Main.vala 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/src/Common/Main.vala 2016-07-13 15:51:05.000000000 +0000 @@ -130,7 +130,7 @@ STARTUP_SCRIPT_FILE = user_home + "/.config/ukuu-notify.sh"; STARTUP_DESKTOP_FILE = user_home + "/.config/autostart/ukuu.desktop"; - LinuxKernel.CACHE_DIR = user_home + "/.config/ukuu"; + LinuxKernel.CACHE_DIR = user_home + "/.cache/ukuu"; LinuxKernel.CURRENT_USER = user_login; LinuxKernel.CURRENT_USER_HOME = user_home; } diff -Nru ukuu-16.7~32~ubuntu16.04.1/src/Console/AppConsole.vala ukuu-16.7.2~39~ubuntu16.04.1/src/Console/AppConsole.vala --- ukuu-16.7~32~ubuntu16.04.1/src/Console/AppConsole.vala 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/src/Console/AppConsole.vala 2016-07-13 15:51:05.000000000 +0000 @@ -36,9 +36,9 @@ using TeeJee.Misc; public Main App; -public const string AppName = "Ukuu Kernel Update Utility"; +public const string AppName = "Ubuntu Kernel Update Utility"; public const string AppShortName = "ukuu"; -public const string AppVersion = "16.7"; +public const string AppVersion = "16.7.2"; public const string AppAuthor = "Tony George"; public const string AppAuthorEmail = "teejeetech@gmail.com"; @@ -280,7 +280,7 @@ } kern = LinuxKernel.kernel_update_minor; - if ((kern != null) && App.notify_minor && !App.notify_major){ + if ((kern != null) && App.notify_minor){ var title = "Linux v%s Available".printf(kern.version_main); var message = "Minor update available for installation"; diff -Nru ukuu-16.7~32~ubuntu16.04.1/src/Gtk/AppGtk.vala ukuu-16.7.2~39~ubuntu16.04.1/src/Gtk/AppGtk.vala --- ukuu-16.7~32~ubuntu16.04.1/src/Gtk/AppGtk.vala 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/src/Gtk/AppGtk.vala 2016-07-13 15:51:05.000000000 +0000 @@ -36,9 +36,9 @@ using TeeJee.Misc; public Main App; -public const string AppName = "Ukuu Kernel Update Utility"; +public const string AppName = "Ubuntu Kernel Update Utility"; public const string AppShortName = "ukuu"; -public const string AppVersion = "16.7"; +public const string AppVersion = "16.7.2"; public const string AppAuthor = "Tony George"; public const string AppAuthorEmail = "teejeetech@gmail.com"; diff -Nru ukuu-16.7~32~ubuntu16.04.1/src/Gtk/TerminalWindow.vala ukuu-16.7.2~39~ubuntu16.04.1/src/Gtk/TerminalWindow.vala --- ukuu-16.7~32~ubuntu16.04.1/src/Gtk/TerminalWindow.vala 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/src/Gtk/TerminalWindow.vala 2016-07-13 15:51:05.000000000 +0000 @@ -41,8 +41,8 @@ private Gtk.Button btn_close; private Gtk.ScrolledWindow scroll_win; - private int def_width = 800; - private int def_height = 600; + private int def_width = 600; + private int def_height = 400; private Pid child_pid; private Gtk.Window parent_win = null; @@ -107,6 +107,8 @@ scroll_win.set_shadow_type (ShadowType.ETCHED_IN); scroll_win.add (term); scroll_win.expand = true; + scroll_win.hscrollbar_policy = PolicyType.AUTOMATIC; + scroll_win.vscrollbar_policy = PolicyType.AUTOMATIC; vbox_main.add(scroll_win); #if VTE_291 diff -Nru ukuu-16.7~32~ubuntu16.04.1/ukuu.geany ukuu-16.7.2~39~ubuntu16.04.1/ukuu.geany --- ukuu-16.7~32~ubuntu16.04.1/ukuu.geany 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/ukuu.geany 2016-07-13 15:51:05.000000000 +0000 @@ -17,21 +17,21 @@ long_line_column=80 [files] -current_page=21 -FILE_NAME_0=1628;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FMain.vala;0;4 -FILE_NAME_1=6749;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FConsole%2FAppConsole.vala;0;4 +current_page=1 +FILE_NAME_0=3321;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FMain.vala;0;4 +FILE_NAME_1=1092;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FConsole%2FAppConsole.vala;0;4 FILE_NAME_2=8925;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FAboutWindow.vala;0;4 -FILE_NAME_3=2163;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FAppGtk.vala;0;4 +FILE_NAME_3=1098;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FAppGtk.vala;0;4 FILE_NAME_4=813;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FCustomMessageDialog.vala;0;4 FILE_NAME_5=2700;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FDonationWindow.vala;0;4 -FILE_NAME_6=3268;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FMainWindow.vala;0;4 +FILE_NAME_6=15259;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FMainWindow.vala;0;4 FILE_NAME_7=2334;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2Fmakefile;0;4 FILE_NAME_8=545;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FDownloadManager.vala;0;4 -FILE_NAME_9=20511;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FUtility.vala;0;4 +FILE_NAME_9=1374;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FUtility.vala;0;4 FILE_NAME_10=3341;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FPackage.vala;0;4 -FILE_NAME_11=25173;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FLinuxKernel.vala;0;4 -FILE_NAME_12=6493;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FTerminalWindow.vala;0;4 -FILE_NAME_13=4627;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FProgressWindow.vala;0;4 +FILE_NAME_11=14425;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FLinuxKernel.vala;0;4 +FILE_NAME_12=2437;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FTerminalWindow.vala;0;4 +FILE_NAME_13=3865;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FProgressWindow.vala;0;4 FILE_NAME_14=5;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fmakefile;0;4 FILE_NAME_15=4718;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FSettingsDialog.vala;0;4 FILE_NAME_16=1900;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FCronTab.vala;0;4 @@ -39,7 +39,7 @@ FILE_NAME_18=71;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2Fukuu.desktop;0;4 FILE_NAME_19=4634;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FGtk%2FUpdateNotificationWindow.vala;0;4 FILE_NAME_20=18090;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fpolo%2Fsrc%2FGtk%2FMainWindow.vala;0;4 -FILE_NAME_21=763;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fdebian%2Fchangelog;0;4 +FILE_NAME_21=483;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fdebian%2Fchangelog;0;4 [VTE] last_dir=/home/teejee diff -Nru ukuu-16.7~32~ubuntu16.04.1/ukuu.pot ukuu-16.7.2~39~ubuntu16.04.1/ukuu.pot --- ukuu-16.7~32~ubuntu16.04.1/ukuu.pot 2016-07-08 17:13:12.000000000 +0000 +++ ukuu-16.7.2~39~ubuntu16.04.1/ukuu.pot 2016-07-13 15:51:05.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ukuu 2.2\n" "Report-Msgid-Bugs-To: teejeetech@gmail.com\n" -"POT-Creation-Date: 2016-07-08 22:20+0530\n" +"POT-Creation-Date: 2016-07-13 20:28+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,7 +35,7 @@ msgid "Authors" msgstr "" -#: Common/LinuxKernel.vala:1048 +#: Common/LinuxKernel.vala:1059 msgid "Available Kernels" msgstr "" @@ -44,7 +44,7 @@ msgstr "" #: Gtk/UpdateNotificationWindow.vala:177 Gtk/ProgressWindow.vala:139 -#: Gtk/TerminalWindow.vala:165 +#: Gtk/TerminalWindow.vala:167 msgid "Cancel" msgstr "" @@ -60,7 +60,7 @@ msgid "Check for kernel updates" msgstr "" -#: Gtk/TerminalWindow.vala:175 Gtk/AboutWindow.vala:295 +#: Gtk/TerminalWindow.vala:177 Gtk/AboutWindow.vala:295 msgid "Close" msgstr "" @@ -143,7 +143,7 @@ msgid "Download packages for specified kernel" msgstr "" -#: Common/LinuxKernel.vala:1086 +#: Common/LinuxKernel.vala:1097 #, c-format msgid "Downloading" msgstr "" @@ -152,7 +152,7 @@ msgid "E" msgstr "" -#: Common/LinuxKernel.vala:1109 +#: Common/LinuxKernel.vala:1120 #, c-format msgid "ERROR" msgstr "" @@ -197,12 +197,12 @@ msgid "Failed to write file" msgstr "" -#: Common/LinuxKernel.vala:943 +#: Common/LinuxKernel.vala:954 #, c-format msgid "Fetching changelog for" msgstr "" -#: Common/LinuxKernel.vala:901 +#: Common/LinuxKernel.vala:912 #, c-format msgid "Fetching index for" msgstr "" @@ -215,7 +215,7 @@ msgid "File is missing" msgstr "" -#: Common/LinuxKernel.vala:957 Common/DownloadManager.vala:346 +#: Common/LinuxKernel.vala:968 Common/DownloadManager.vala:346 #: Common/Utility.vala:271 Common/Utility.vala:457 msgid "File not found" msgstr "" @@ -261,15 +261,15 @@ msgid "Install this kernel" msgstr "" -#: Common/LinuxKernel.vala:1154 +#: Common/LinuxKernel.vala:1165 msgid "Installation completed with errors" msgstr "" -#: Common/LinuxKernel.vala:1151 +#: Common/LinuxKernel.vala:1162 msgid "Installation completed. A reboot is required to use the new kernel." msgstr "" -#: Common/LinuxKernel.vala:1065 +#: Gtk/MainWindow.vala:221 Common/LinuxKernel.vala:1076 msgid "Installed" msgstr "" @@ -313,7 +313,7 @@ msgid "Notify if kernel update is available" msgstr "" -#: Gtk/DonationWindow.vala:96 Common/LinuxKernel.vala:1101 +#: Gtk/DonationWindow.vala:96 Common/LinuxKernel.vala:1112 #, c-format msgid "OK" msgstr "" @@ -370,7 +370,7 @@ msgid "Run the application as root or using gksu/sudo." msgstr "" -#: Common/LinuxKernel.vala:1065 +#: Gtk/MainWindow.vala:221 Common/LinuxKernel.vala:1076 msgid "Running" msgstr "" @@ -415,11 +415,11 @@ msgid "Third Party Tools & Software" msgstr "" -#: Gtk/MainWindow.vala:602 Common/LinuxKernel.vala:1123 +#: Gtk/MainWindow.vala:602 Common/LinuxKernel.vala:1134 msgid "This kernel is already installed." msgstr "" -#: Common/LinuxKernel.vala:1168 +#: Common/LinuxKernel.vala:1179 msgid "" "This kernel is currently running and cannot be removed.\n" " Install another kernel before removing this one." @@ -430,11 +430,11 @@ msgid "Translators" msgstr "" -#: Common/LinuxKernel.vala:1208 +#: Common/LinuxKernel.vala:1219 msgid "Un-install completed" msgstr "" -#: Common/LinuxKernel.vala:1211 +#: Common/LinuxKernel.vala:1222 msgid "Un-install completed with errors" msgstr ""