diff -Nru aptik-gtk-18.6/debian/changelog aptik-gtk-18.8/debian/changelog --- aptik-gtk-18.6/debian/changelog 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/debian/changelog 2018-08-04 04:24:32.000000000 +0000 @@ -1,8 +1,15 @@ -aptik-gtk (18.6-0~201806300925~ubuntu18.04.1) bionic; urgency=low +aptik-gtk (18.8-0~201808040344~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Tony George Sat, 30 Jun 2018 09:38:19 +0000 + -- Tony George Sat, 04 Aug 2018 04:24:32 +0000 + +aptik-gtk (18.8) bionic; urgency=medium + + * Updated for Aptik v18.8 + + -- Tony George Sat, 04 Aug 2018 10:00:00 +0530 + aptik-gtk (18.6) xenial; urgency=medium diff -Nru aptik-gtk-18.6/debian/control aptik-gtk-18.8/debian/control --- aptik-gtk-18.6/debian/control 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/debian/control 2018-08-04 04:24:32.000000000 +0000 @@ -10,7 +10,7 @@ Package: aptik-gtk Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, apt, aptitude, apt-transport-https, pv +Depends: ${shlibs:Depends}, ${misc:Depends}, apt, aptitude, apt-transport-https, pv, dconf-cli #Recommends: Replaces: aptik Description: System migration utility for Linux (GTK Frontend) diff -Nru aptik-gtk-18.6/debian/git-build-recipe.manifest aptik-gtk-18.8/debian/git-build-recipe.manifest --- aptik-gtk-18.6/debian/git-build-recipe.manifest 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/debian/git-build-recipe.manifest 2018-08-04 04:24:32.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-0~201806300925 -lp:aptik-gtk-github git-commit:189130a99862e86893805cf1184b45586f574332 +# git-build-recipe format 0.4 deb-version {debupstream}-0~201808040344 +lp:aptik-gtk-github git-commit:c4359aca1f3ca9590e8e0db66f2b921e870fb53e diff -Nru aptik-gtk-18.6/makefile aptik-gtk-18.8/makefile --- aptik-gtk-18.6/makefile 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/makefile 2018-08-04 04:24:32.000000000 +0000 @@ -4,9 +4,6 @@ clean: cd src; make clean -aptik-console: - cd src; make aptik-console - install: cd src; make install diff -Nru aptik-gtk-18.6/release/sanity.config aptik-gtk-18.8/release/sanity.config --- aptik-gtk-18.6/release/sanity.config 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/release/sanity.config 2018-08-04 04:24:32.000000000 +0000 @@ -1,5 +1,5 @@ app_name: Aptik GTK -depends_debian: libgee-0.8-2 libjson-glib-1.0-0 apt aptitude apt-transport-https pv +depends_debian: libgee-0.8-2 libjson-glib-1.0-0 apt aptitude apt-transport-https pv dconf-cli depends_redhat: libgee json-glib pv depends_arch: libgee json-glib pv depends_generic: libgee json-glib pv diff -Nru aptik-gtk-18.6/src/Gtk/AptikGtk.vala aptik-gtk-18.8/src/Gtk/AptikGtk.vala --- aptik-gtk-18.6/src/Gtk/AptikGtk.vala 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/src/Gtk/AptikGtk.vala 2018-08-04 04:24:32.000000000 +0000 @@ -36,7 +36,8 @@ public const string AppName = "Aptik GTK"; public const string AppShortName = "aptik-gtk"; -public const string AppVersion = "18.6"; +public const string AppVersion = "18.8"; +public const string AptikVersionRequired = "18.08.0"; public const string AppAuthor = "Tony George"; public const string AppAuthorEmail = "teejeetech@gmail.com"; @@ -120,7 +121,7 @@ private static void set_locale() { - Intl.setlocale(GLib.LocaleCategory.MESSAGES, "aptik"); + Intl.setlocale(GLib.LocaleCategory.MESSAGES, "aptik-gtk"); Intl.textdomain(GETTEXT_PACKAGE); Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8"); Intl.bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR); diff -Nru aptik-gtk-18.6/src/Gtk/MainWindow.vala aptik-gtk-18.8/src/Gtk/MainWindow.vala --- aptik-gtk-18.6/src/Gtk/MainWindow.vala 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/src/Gtk/MainWindow.vala 2018-08-04 04:24:32.000000000 +0000 @@ -172,17 +172,28 @@ } string std_out, std_err; - exec_sync("aptik --version", out std_out, out std_err); - string aptik_version = std_out.strip(); - - if (AppVersion != aptik_version){ + exec_sync("aptik --version-cli", out std_out, out std_err); + string aptik_cli_version = std_out.strip(); + + int version_required = int.parse(AptikVersionRequired.replace(".","")); + + int version_found = 0; + + if (aptik_cli_version.length > 0){ + version_found = int.parse(aptik_cli_version.replace(".","")); + } + else{ + aptik_cli_version = "Unknown"; + } + + if (version_required != version_found){ string txt = _("Version Mismatch"); - string msg = "%s\n\n%s (v%s)\n\n%s (v%s)\n".printf( - _("GUI version does not match console version. Please install same version of 'aptik' and 'aptik-gtk' packages."), - _("aptik-gtk"), AppVersion, - _("aptik"), aptik_version + string msg = "%s\n\n%s: %s\n\n%s: %s\n".printf( + _("Please install the latest version of 'aptik'."), + _("Required"), AptikVersionRequired, + _("Found"), aptik_cli_version ); gtk_messagebox(txt, msg, this, true); diff -Nru aptik-gtk-18.6/src/Gtk/SettingsBox.vala aptik-gtk-18.8/src/Gtk/SettingsBox.vala --- aptik-gtk-18.6/src/Gtk/SettingsBox.vala 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/src/Gtk/SettingsBox.vala 2018-08-04 04:24:32.000000000 +0000 @@ -74,7 +74,7 @@ var vbox = new Gtk.Box(Orientation.VERTICAL, 6); box.add(vbox); - var label = new Gtk.Label(format_text(_("Select Items"), true, false, true)); + var label = new Gtk.Label(format_text(_("Backup/Restore Items"), true, false, true)); label.set_use_markup(true); label.halign = Align.START; //label.margin = 12; diff -Nru aptik-gtk-18.6/src/makefile aptik-gtk-18.8/src/makefile --- aptik-gtk-18.6/src/makefile 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/src/makefile 2018-08-04 04:24:32.000000000 +0000 @@ -10,7 +10,7 @@ man1dir=$(mandir)/man1 app_name=aptik-gtk -app_fullname='Aptik NG GTK' +app_fullname='Aptik GTK' # vte ----------------------------- @@ -29,7 +29,7 @@ all: # aptik-gtk - valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" ${symbols} --thread \ + valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" ${symbols} --Xcc="-O3" --thread \ *.vala Gtk/*.vala Utility/Console/*.vala Utility/Gtk/*.vala Utility/*.vala \ -o ${app_name} \ --pkg glib-2.0 \ diff -Nru aptik-gtk-18.6/src/Utility/Gtk/DonationWindow.vala aptik-gtk-18.8/src/Utility/Gtk/DonationWindow.vala --- aptik-gtk-18.6/src/Utility/Gtk/DonationWindow.vala 2018-06-30 09:38:19.000000000 +0000 +++ aptik-gtk-18.8/src/Utility/Gtk/DonationWindow.vala 2018-08-04 04:24:32.000000000 +0000 @@ -60,7 +60,7 @@ //get_action_area().visible = false; - string msg = _("Did you find this application useful?\n\nYou can buy me a coffee or make a donation via PayPal to show your support.\n\nThis application is free and will continue to remain that way. Your contributions will help keep the project alive and support future development."); + string msg = _("Did you find this application useful? You can buy me a coffee or make a donation via PayPal to show your support. This application is free and will continue to remain that way. Your contributions will help keep the project alive and support future development.\n\nI sometimes create exclusive plugins and addons for people who donate. You can make a donation for $10 or more by PayPal to receive the plugins by email. See the \"Donation Features\" link below for more details.\n\nPlease use the GitHub issue tracker for reporting issues and requesting features."); /*msg += "\n\nIf you make a donation to this project you will receive a plugin as a special gift. This plugin generates a stand-alone installer from the backup files. The installer can be executed on a fresh Linux installation to transform it to the original system. You can distribute this installer as a \"transformation pack\" to create your own customized distribution.\n\nThanks,\nTony George";*/ @@ -96,19 +96,19 @@ } // donation_features - //var button = new Gtk.LinkButton.with_label("", _("Donation Features")); - //button.set_tooltip_text("https://github.com/teejee2008/polo/wiki/Donation-Features"); - //vbox_main.add(button); - //button.clicked.connect(() => { - // xdg_open("https://github.com/teejee2008/polo/wiki/Donation-Features", username); - //}); + var button = new Gtk.LinkButton.with_label("", _("Donation Features")); + button.set_tooltip_text("https://github.com/teejee2008/aptik/wiki/Donation-Features"); + vbox_main.add(button); + button.clicked.connect(() => { + xdg_open("https://github.com/teejee2008/aptik/wiki/Donation-Features", username); + }); // donate paypal - var button = new Gtk.LinkButton.with_label("", _("Donate with PayPal")); + button = new Gtk.LinkButton.with_label("", _("Donate with PayPal")); button.set_tooltip_text("Donate to: teejeetech@gmail.com"); vbox_main.add(button); button.clicked.connect(() => { - xdg_open("https://www.paypal.com/cgi-bin/webscr?business=teejeetech@gmail.com&cmd=_xclick¤cy_code=USD&amount=10&item_name=Polo%20Donation", username); + xdg_open("https://www.paypal.com/cgi-bin/webscr?business=teejeetech@gmail.com&cmd=_xclick¤cy_code=USD&amount=10&item_name=Aptik%20Donation", username); }); // patreon