diff -Nru aptik-16.5.1~196~ubuntu14.04.1/aptik.geany aptik-16.5.2~200~ubuntu14.04.1/aptik.geany --- aptik-16.5.1~196~ubuntu14.04.1/aptik.geany 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/aptik.geany 2016-05-31 18:19:53.000000000 +0000 @@ -17,9 +17,9 @@ long_line_column=80 [files] -current_page=21 +current_page=3 FILE_NAME_0=11501;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FUtility.vala;0;4 -FILE_NAME_1=18138;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FMain.vala;0;4 +FILE_NAME_1=56820;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FMain.vala;0;4 FILE_NAME_2=2559;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FPpaWindow.vala;0;4 FILE_NAME_3=22721;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FMainWindow.vala;0;4 FILE_NAME_4=225;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2Fmakefile;0;4 @@ -36,18 +36,16 @@ FILE_NAME_15=2585;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FConfigWindow.vala;0;4 FILE_NAME_16=2893;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FMountWindow.vala;0;4 FILE_NAME_17=3020;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FOneClickSettingsDialog.vala;0;4 -FILE_NAME_18=16874;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4 -FILE_NAME_19=145;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fdebian%2Fchangelog;0;4 -FILE_NAME_20=468;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fdebian%2Fcontrol;0;4 -FILE_NAME_21=1883;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FFileItem.vala;0;4 -FILE_NAME_22=1872;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FUserDataSettingsDialog.vala;0;4 -FILE_NAME_23=1751;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FDownloadWindow.vala;0;4 -FILE_NAME_24=4730;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FTheme.vala;0;4 -FILE_NAME_25=1204;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FAptikGtk.vala;0;4 -FILE_NAME_26=559;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FCronTab.vala;0;4 -FILE_NAME_27=996;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fukuu%2Fsrc%2FCommon%2FUtility.vala;0;4 -FILE_NAME_28=8669;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FAboutWindow.vala;0;4 -FILE_NAME_29=2624;Make;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4 +FILE_NAME_18=374;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fdebian%2Fchangelog;0;4 +FILE_NAME_19=159;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fdebian%2Fcontrol;0;4 +FILE_NAME_20=1883;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FFileItem.vala;0;4 +FILE_NAME_21=1872;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FUserDataSettingsDialog.vala;0;4 +FILE_NAME_22=1751;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FDownloadWindow.vala;0;4 +FILE_NAME_23=4730;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FTheme.vala;0;4 +FILE_NAME_24=1204;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FAptikGtk.vala;0;4 +FILE_NAME_25=559;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FCronTab.vala;0;4 +FILE_NAME_26=8669;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FAboutWindow.vala;0;4 +FILE_NAME_27=2045;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FAdminWindow.vala;0;4 [VTE] last_dir=/home/teejee diff -Nru aptik-16.5.1~196~ubuntu14.04.1/aptik.pot aptik-16.5.2~200~ubuntu14.04.1/aptik.pot --- aptik-16.5.1~196~ubuntu14.04.1/aptik.pot 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/aptik.pot 2016-05-31 18:19:53.000000000 +0000 @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Tony George (teejee2008@gmail.com) -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the aptik package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: aptik 1.6\n" "Report-Msgid-Bugs-To: teejee2008@gmail.com\n" -"POT-Creation-Date: 2016-05-04 22:49+0530\n" +"POT-Creation-Date: 2016-05-31 23:02+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -124,6 +124,10 @@ msgid "Adding PPA" msgstr "" +#: AdminWindow.vala:62 +msgid "Admin" +msgstr "" + #: AptikGtk.vala:60 msgid "Admin Access Required" msgstr "" @@ -1086,7 +1090,7 @@ msgid "One-Click Restore" msgstr "" -#: OneClickSettingsDialog.vala:54 +#: AdminWindow.vala:56 OneClickSettingsDialog.vala:54 msgid "One-Click Settings" msgstr "" @@ -1125,8 +1129,7 @@ msgid "PPA is Not Added" msgstr "" -#: DownloadWindow.vala:218 PackageManagerWindow.vala:381 -#: PackageWindow.vala:295 +#: DownloadWindow.vala:218 PackageManagerWindow.vala:381 PackageWindow.vala:295 msgid "Package" msgstr "" diff -Nru aptik-16.5.1~196~ubuntu14.04.1/debian/bzr-builder.manifest aptik-16.5.2~200~ubuntu14.04.1/debian/bzr-builder.manifest --- aptik-16.5.1~196~ubuntu14.04.1/debian/bzr-builder.manifest 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/debian/bzr-builder.manifest 2016-05-31 18:19:53.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}~196 -lp:apt-toolkit revid:tony.george.kol@gmail.com-20160505105816-y2i4ufuc31jktd9r +# bzr-builder format 0.3 deb-version {debupstream}~200 +lp:apt-toolkit revid:tony.george.kol@gmail.com-20160531173214-q0h43i3eioph5c5c diff -Nru aptik-16.5.1~196~ubuntu14.04.1/debian/changelog aptik-16.5.2~200~ubuntu14.04.1/debian/changelog --- aptik-16.5.1~196~ubuntu14.04.1/debian/changelog 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/debian/changelog 2016-05-31 18:19:53.000000000 +0000 @@ -1,24 +1,15 @@ -aptik (16.5.1~196~ubuntu14.04.1) trusty; urgency=low +aptik (16.5.2~200~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Tony George Thu, 05 May 2016 11:41:59 +0000 + -- Tony George Tue, 31 May 2016 18:19:53 +0000 -aptik (16.5.1) xenial; urgency=medium +aptik (16.5.2) xenial; urgency=medium - * Merged changes from lp:~shemgp/apt-toolkit/apt-toolkit + * Fixed: Restore mounts: keyfiles were not restored correctly - * Added Czech translation by Radek Otáhal + * Fixed: PPA description was empty instead of listing packages - * Fixed build errors on trusty by reverting to valac-0.26; Newer - versions of valac requires GTK+ 3.16 and higher. Trusty is still - on GTK+ 3.14. - - -- Tony George Thu, 05 May 2016 10:00:00 +0530 - -aptik (16.4.3ubuntu1) xenial; urgency=medium - - * Add proxy support taken from 'apt-config dump' - - -- Shem Pasamba Tue, 03 May 2016 20:39:45 +0800 + * Fixed some minor UI issues + -- Tony George Tue, 31 May 2016 10:00:00 +0530 diff -Nru aptik-16.5.1~196~ubuntu14.04.1/src/AptikConsole.vala aptik-16.5.2~200~ubuntu14.04.1/src/AptikConsole.vala --- aptik-16.5.1~196~ubuntu14.04.1/src/AptikConsole.vala 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/src/AptikConsole.vala 2016-05-31 18:19:53.000000000 +0000 @@ -39,7 +39,7 @@ public Main App; public const string AppName = "Aptik Migration Utility"; public const string AppShortName = "aptik"; -public const string AppVersion = "16.5.1"; +public const string AppVersion = "16.5.2"; public const string AppAuthor = "Tony George"; public const string AppAuthorEmail = "teejeetech@gmail.com"; diff -Nru aptik-16.5.1~196~ubuntu14.04.1/src/AptikGtk.vala aptik-16.5.2~200~ubuntu14.04.1/src/AptikGtk.vala --- aptik-16.5.1~196~ubuntu14.04.1/src/AptikGtk.vala 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/src/AptikGtk.vala 2016-05-31 18:19:53.000000000 +0000 @@ -38,7 +38,7 @@ public Main App; public const string AppName = "Aptik Migration Utility"; public const string AppShortName = "aptik"; -public const string AppVersion = "16.5.1"; +public const string AppVersion = "16.5.2"; public const string AppAuthor = "Tony George"; public const string AppAuthorEmail = "teejeetech@gmail.com"; diff -Nru aptik-16.5.1~196~ubuntu14.04.1/src/Main.vala aptik-16.5.2~200~ubuntu14.04.1/src/Main.vala --- aptik-16.5.1~196~ubuntu14.04.1/src/Main.vala 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/src/Main.vala 2016-05-31 18:19:53.000000000 +0000 @@ -1075,7 +1075,7 @@ regex_pkg = new Regex("""^([^ \t]*):$"""); regex_installed_version = new Regex("""^[ \t]*[*]*[ \t]*([^ \t]*)[ \t]*[0-9]*"""); regex_source = new Regex("""[ \t]*[0-9]+[ \t]*([^ \t]*ubuntu.com[^ \t])[ \t]*([^ \t]*)[ \t]*([^ \t]*)"""); - regex_launchpad = new Regex("""[ \t]*[0-9]+[ \t]*([https:/]+ppa.launchpad.net/([^ \t]*)/ubuntu/)[ \t]*([^ \t]*)[ \t]*([^ \t]*)"""); + regex_launchpad = new Regex("""[ \t]*[0-9]+[ \t]*(http[s]*:\/\/ppa.launchpad.net\/([^ \t]*)\/ubuntu[\/]*)[ \t]*([^ \t]*)[ \t]*([^ \t]*)[ \t]*[^ \t]*"""); } catch (Error e) { log_error (e.message); @@ -2225,7 +2225,7 @@ foreach(var fs in list){ if (fs.uses_keyfile() && file_exists(fs.password)){ string src_file = fs.password; - string dst_file = "%s/%s.tar.gpg".printf(mounts_dir, fs.keyfile_archive_name); + string dst_file = "%s/%s".printf(mounts_dir, fs.keyfile_archive_name); ok = file_tar_encrypt(src_file, dst_file, arg_password); diff -Nru aptik-16.5.1~196~ubuntu14.04.1/src/Theme.vala aptik-16.5.2~200~ubuntu14.04.1/src/Theme.vala --- aptik-16.5.1~196~ubuntu14.04.1/src/Theme.vala 2016-05-05 11:41:59.000000000 +0000 +++ aptik-16.5.2~200~ubuntu14.04.1/src/Theme.vala 2016-05-31 18:19:53.000000000 +0000 @@ -655,7 +655,7 @@ dir_create(theme_dir_path); string cmd = "tar xzvf '%s' --directory='%s'".printf(archive_path, file_parent(theme_dir_path)); - status_line = archive_path; + status_line = file_basename(archive_path); if (gui_mode) { log_msg("Extract: %s, Dest: %s".printf(archive_path, file_parent(theme_dir_path)));