prepare new release

update with autovala 1.1.3
change project number in pamac.pot
2017-10-29 17:33:48 -03:00 · 2017-10-29 17:32:20 -03:00 · 2017-10-29 17:27:45 -03:00 · 2017-10-29 17:23:58 -03:00 · 2017-10-29 15:18:24 -03:00 · 2017-10-29 14:28:26 -03:00
44 changed files with 503 additions and 549 deletions
--- a/.configure-custom.sh
+++ b/.configure-custom.sh
@@ -1,7 +1,8 @@
 #!/bin/bash

-ENABLE_VARS="kde-tray|ON|KDE_TRAY"
+ENABLE_VARS="kde-tray|ON|KDE_TRAY update-desktop|ON|ENABLE_UPDATE_ICON"
 ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray"
+ENABLE_ENABLE_UPDATE_ICON_DOC="install the update desktop entry"
 DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE"
 DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac"
 DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing"
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ PKGBUILD
 *.pkg.tar.xz
 *.pkg.tar.xz.sig
 /build
+.bzrignore
+.hgignore
+data/local/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 ### CMakeLists automatically created with AutoVala
 ### Do not edit

-project (pamac)
+project (pamac-classic)
 cmake_minimum_required (VERSION 2.6)
 cmake_policy (VERSION 2.8)
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -9,6 +9,7 @@ enable_testing ()
 option(ICON_UPDATE "Update the icon cache after installing" ON)
 option(BUILD_VALADOC "Build API documentation if Valadoc is available" OFF)
 option(DISABLE_AUR "DISABLE_AUR" OFF)
+option(ENABLE_UPDATE_ICON "ENABLE_UPDATE_ICON" OFF)
 option(KDE_TRAY "KDE_TRAY" OFF)

 if( NOT CMAKE_BUILD_TYPE )
@@ -64,16 +65,15 @@ add_subdirectory(data/pixmaps)
 add_subdirectory(data/mime)
 add_subdirectory(data/polkit)
 add_subdirectory(data/systemd)
-add_subdirectory(data/dbus)
 add_subdirectory(data/config)
 add_subdirectory(data)
+add_subdirectory(data/dbus)
 add_subdirectory(data/icons/24x24/status)
 add_subdirectory(data/icons/16x16/apps)
 add_subdirectory(data/config/noaur)
 add_subdirectory(data/icons/32x32/apps)
 add_subdirectory(data/interface)
 add_subdirectory(src)
-add_subdirectory(src/aur)
 add_subdirectory(src/pamac-user-daemon)
 add_subdirectory(src/pamac-tray)
 add_subdirectory(src/pamac-clean-cache)
--- a/README.md
+++ b/README.md
@@ -49,6 +49,8 @@ make

 - -DDISABLE_AUR=ON (to disable AUR in Pamac)
 - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
+- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry)
+- -DICON_UPDATE=OFF (to disable updating the icon cache)

 ## Using CMake with Ninja

@@ -66,6 +68,8 @@ ninja

 - -DDISABLE_AUR=ON (to disable AUR in Pamac)
 - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
+- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry)
+- -DICON_UPDATE=OFF (to disable updating the icon cache)

 ## Using Meson with Ninja

@@ -81,6 +85,8 @@ ninja

 - -DDISABLE_AUR=ON (to disable AUR in Pamac)
 - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
+- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry)
+- -DICON_UPDATE=OFF (to disable updating the icon cache)

 ## Using configure wrapper

@@ -96,4 +102,6 @@ make
 ### Extra configure options

 - --disable-aur (to disable Aur in Pamac)
- --enable-kde-tray (to build kde tray icon instead of gtk tray icon)
+- --enable-kde-tray (to build kde tray icon instead of gtk tray icon)
+- --enable-update-desktop (to install the update desktop entry)
+- --disable-icon-update (to disable updating the icon cache)
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -42,6 +42,9 @@ SET (pamac_transaction_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.tr
 SET (pamac_transaction_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.h PARENT_SCOPE)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-install.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ )
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-manager.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ )
+if (ENABLE_UPDATE_ICON)
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-updater.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ )
+endif ()
 if (KDE_TRAY)
 	if( NOT ( ${CMAKE_INSTALL_PREFIX} MATCHES "^/home/" ) )
 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-tray-appindicator.desktop DESTINATION /etc/xdg/autostart/ )
--- a/data/dbus/CMakeLists.txt
+++ b/data/dbus/CMakeLists.txt
@@ -1,45 +1,9 @@
 ### CMakeLists automatically created with AutoVala
 ### Do not edit

-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf
-	DESTINATION
-		/etc/dbus-1/system.d
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf
-	DESTINATION
-		/etc/dbus-1/system.d
-	)
-ENDIF()
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service
-	DESTINATION
-		/usr/share/dbus-1/services
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service
-	DESTINATION
-		/usr/share/dbus-1/services
-	)
-ENDIF()
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service
-	DESTINATION
-		/usr/share/dbus-1/system-services
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service
-	DESTINATION
-		/usr/share/dbus-1/system-services
-	)
-ENDIF()
-
+SET(DBUS_PREFIX ${CMAKE_INSTALL_PREFIX})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.system.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.system.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services/)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.user.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.user.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system.d/)
--- a/data/dbus/org.pamac.system.service
+++ b/data/dbus/org.pamac.system.service
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.pamac.system
-Exec=/usr/bin/pamac-system-daemon
+Exec=@DBUS_PREFIX@/bin/pamac-system-daemon
 User=root
 SystemdService=pamac-system.service
--- a/data/dbus/org.pamac.user.service
+++ b/data/dbus/org.pamac.user.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.pamac.user
-Exec=/usr/bin/pamac-user-daemon
+Exec=@DBUS_PREFIX@/bin/pamac-user-daemon
--- a/data/pamac-updater.desktop
+++ b/data/pamac-updater.desktop
@@ -0,0 +1,134 @@
+[Desktop Entry]
+Name=Software Update
+Name[af]=Sagtewarebywerking
+Name[ar]=تحديث البرمجيات
+Name[as]=চালনাজ্ঞান উন্নয়ন ব্যৱস্থা
+Name[ast]=Anovamientu de software
+Name[be]=Абнаўленне апраграмавання
+Name[bg]=Обновление на софтуера
+Name[bn]=সফ্টওয়্যার হালনাগাদ
+Name[bn_IN]=সফ্টওয়্যার আপডেট ব্যবস্থা
+Name[ca]=Actualització de programari
+Name[ca@valencia]=Actualització de programari
+Name[cs]=Aktualizace softwaru
+Name[da]=Softwareopdatering
+Name[de]=Software-Aktualisierungen
+Name[el]=Ενημέρωση λογισμικού
+Name[en@shaw]=𐑕𐑪𐑓𐑑𐑢𐑺 𐑳𐑐𐑛𐑱𐑑
+Name[en_GB]=Software Update
+Name[eo]=Programar-ĝistatigo
+Name[es]=Actualización de software
+Name[et]=Tarkvarauuendus
+Name[eu]=Softwarearen eguneraketa
+Name[fa]=بروزرسانی نرم‌افزار
+Name[fi]=Ohjelmistopäivitykset
+Name[fr]=Mise à jour des logiciels
+Name[gl]=Actualización de software
+Name[gu]=સોફ્ટવેર સુધારા
+Name[he]=עדכון תכנה
+Name[hi]=सॉफ्टवेयर अद्यतन
+Name[hu]=Szoftverfrissítés
+Name[id]=Pembaruan Perangkat Lunak
+Name[it]=Aggiornamento software
+Name[ja]=ソフトウェアの更新
+Name[kn]=ತಂತ್ರಾಂಶ ಅಪ್‌ಡೇಟ್‌
+Name[ko]=소프트웨어 업데이트
+Name[lt]=Programinės įrangos atnaujinimas
+Name[lv]=Programmatūras atjaunināšana
+Name[mk]=Ажурирање на софтвер
+Name[ml]=സോഫ്റ്റ്‌വെയര്‍ പരിഷ്കാരം
+Name[mr]=सॉफ्टवेअर अद्ययावत
+Name[nb]=Programvareoppdatering
+Name[nl]=Software bijwerken
+Name[nn]=Programvareoppdatering
+Name[or]=ସଫ୍ଟୱେର ଅଦ୍ୟତନ
+Name[pa]=ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ
+Name[pl]=Aktualizacja oprogramowania
+Name[pt]=Actualização de Software
+Name[pt_BR]=Atualizações de programas
+Name[ro]=Actualizări de programe
+Name[ru]=Обновление программ
+Name[sk]=Aktualizácia softvéru
+Name[sl]=Posodobitev programske opreme
+Name[sr]=Ажурирање програма
+Name[sr@latin]=Ažuriranje programa
+Name[sv]=Programuppdatering
+Name[ta]=மென்பொருள் மேம்படுத்தல்
+Name[te]=సాప్ట్‍వేర్ నవీకరణ
+Name[th]=ปรับรุ่นซอฟต์แวร์
+Name[tr]=Yazılım Güncelleme
+Name[ug]=يۇمشاق دېتال يېڭىلاش
+Name[uk]=Оновлення програм
+Name[vi]=Bản cập nhật phần mềm
+Name[zh_CN]=软件更新
+Name[zh_HK]=軟件更新
+Name[zh_TW]=軟體更新
+Comment=Update software installed on the system
+Comment[af]=Werk geïnstalleer sagteware op die stelsel by
+Comment[ar]=حدّث الحزم المُثبّتة على النظام
+Comment[as]=ব্যৱস্থাপ্ৰণালীত সংস্থাপিত চালনাজ্ঞান উন্নয়ন কৰক
+Comment[ast]=Anovar el software instaláu nel sistema
+Comment[be]=Абнаўленне апраграмавання, усталяванага ў сістэме
+Comment[bg]=Обновяване на софтуера инсталиран върху системата
+Comment[bn]=সিস্টেমে ইনস্টলকৃত সফ্টওয়্যার হালনাগাদ
+Comment[bn_IN]=সিস্টেমে ইনস্টল থাকা সফ্টওয়্যার আপডেট করুন
+Comment[ca]=Actualitza el programari instal·lat en el sistema
+Comment[ca@valencia]=Actualitza el programari instal·lat en el sistema
+Comment[cs]=Aktualizovat software instalovaný v tomto systému
+Comment[da]=Opdatér software installeret på systemet
+Comment[de]=Auf dem System installierte Software aktualisieren
+Comment[el]=Ενημέρωση εγκατεστημένου λογισμικού
+Comment[en@shaw]=𐑳𐑐𐑛𐑱𐑑 𐑕𐑪𐑓𐑑𐑢𐑺 𐑦𐑯𐑕𐑑𐑷𐑤𐑛 𐑪𐑯 𐑞 𐑕𐑦𐑕𐑑𐑩𐑥
+Comment[en_GB]=Update software installed on the system
+Comment[es]=Actualizar el software instalado en el sistema
+Comment[et]=Süsteemi paigaldatud tarkvara uuendamine
+Comment[eu]=Eguneratu sisteman instalatutako softwarea
+Comment[fa]=بروزرسانی نرم‌افزار نصب شده بر روی سیستم
+Comment[fi]=Päivitä järjestelmään asennettuja ohjelmistoja
+Comment[fr]=Met à jour les logiciels installés sur le système
+Comment[gl]=Actualizar o software instalado no sistema
+Comment[gu]=સિસ્ટમ પર સ્થાપિત થયેલ સોફ્ટવેરને સુધારો
+Comment[he]=עדכון תוכנות המותקנות על המערכת
+Comment[hi]=सिस्टम पर संस्थापित सॉफ्टवेयर अद्यतन करें
+Comment[hu]=A rendszerre telepített szoftverek frissítése
+Comment[id]=Mutakhirkan perangkat lunak yang terpasang pada sistem
+Comment[it]=Aggiorna il software installato sul sistema
+Comment[ja]=システムにインストールされたパッケージの更新
+Comment[kn]=ಗಣಕದಲ್ಲಿ ಅನುಸ್ಥಾಪಿತಗೊಂಡಿರುವ ತಂತ್ರಾಂಶವನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡು
+Comment[ko]=시스템에 설치한 소프트웨어를 업데이트합니다
+Comment[lt]=Atnaujinti sistemoje įdiegtą programinę įrangą
+Comment[lv]=Atjaunināt sistēmā instalēto programmatūru
+Comment[mk]=Ажурирај го софтверот инсталирај на системот
+Comment[ml]=സിസ്റ്റമില്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന സോഫ്റ്റ്‌വെയറുകള്‍ പരിഷ്കരിക്കുക
+Comment[mr]=प्रणालीवर प्रतिष्ठापीत सॉफ्टवेअर अद्ययावत करा
+Comment[nb]=Oppdater programvare som er installert på systemet
+Comment[nl]=Werk de op uw systeem geïnstalleerde software bij
+Comment[nn]=Oppdater programvare installert på systemet
+Comment[or]=ତନ୍ତ୍ରରେ ସ୍ଥାପନ କରାଯାଇଥିବା ସଫ୍ଟୱେରକୁ ଅଦ୍ୟତନ କରନ୍ତୁ
+Comment[pa]=ਸਿਸਟਮ ਉੱਤੇ ਇੰਸਟਾਲ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਕਰੋ
+Comment[pl]=Aktualizacja oprogramowania zainstalowanego w systemie
+Comment[pt]=Actualizar software instalado no sistema
+Comment[pt_BR]=Atualize os programas instalados no sistema
+Comment[ro]=Actualizați programele instalate pe sistem
+Comment[ru]=Обновление программ, установленных в системе
+Comment[sk]=Aktualizuje softvér nainštalovaný v tomto počítači
+Comment[sl]=Posodobitev programske opreme nameščene na sistemu
+Comment[sr]=Ажурирајте програме инсталиране на овом систему
+Comment[sr@latin]=Ažurirajte programe instalirane na ovom sistemu
+Comment[sv]=Uppdatera programvara installerade på systemet
+Comment[ta]=கணினியில் நிறுவப்பட்ட மென்பொருளை புதுப்பிக்கவும்
+Comment[te]=వ్యవస్థ నందు స్థాపించిన సాఫ్ట్‍వేర్‌ను నవీకరించు
+Comment[th]=ปรับรุ่นซอฟต์แวร์ที่ติดตั้งอยู่ในระบบ
+Comment[tr]=Sisteminizde yüklü yazılımı güncelleyin
+Comment[ug]=يېڭىلاش يۇمشاق دېتال بۇ سىستېمىغا ئورنىتىلدى
+Comment[uk]=Оновлення програм, встановлених у системі
+Comment[vi]=Cập nhật phần mềm đã cài đặt trên hệ thống
+Comment[zh_CN]=更新本系统中安装的软件
+Comment[zh_HK]=更新系統中已安裝的軟件
+Comment[zh_TW]=更新系統中已安裝的軟體
+Icon=system-software-update
+Exec=pamac-updater
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;System;Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
+StartupNotify=true
--- a/data/pixmaps/CMakeLists.txt
+++ b/data/pixmaps/CMakeLists.txt
@@ -1,4 +1,4 @@
 ### CMakeLists automatically created with AutoVala
 ### Do not edit

-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ )
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac-classic/ )
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -7,13 +7,13 @@ foreach(file_data ${list_data})
 		install(DIRECTORY
 			${file_data}
 		DESTINATION
-			${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+			${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 		)
 	ELSE()
 		install(FILES
 			${file_data}
 		DESTINATION
-			${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+			${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 		)
 	ENDIF()
 endforeach()
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,10 @@
-project('pamac',['c','vala'])
+project('pamac-classic',['c','vala'])

 DISABLE_AUR = (get_option('DISABLE_AUR') != '')
+ENABLE_UPDATE_ICON = (get_option('ENABLE_UPDATE_ICON') != '')
 KDE_TRAY = (get_option('KDE_TRAY') != '')

-add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c')
+add_global_arguments('-DGETTEXT_PACKAGE="pamac-classic"',language: 'c')

 gdk_3_0_dep = dependency('gdk-3.0')
 gtk_3_0_dep = dependency('gtk+-3.0')
@@ -22,12 +23,8 @@ glib_2_0_dep = dependency('glib-2.0')
 gobject_2_0_dep = dependency('gobject-2.0')

 subdir('po')
-meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/etc/dbus-1/system.d',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.system.conf'))
-
-meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/dbus-1/services',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.user.service'))
-
-meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/dbus-1/system-services',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.system.service'))
-
+cfg_dbus_data = configuration_data()
+cfg_dbus_data.set ('DBUS_PREFIX',get_option('prefix'))
 meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/lib/systemd/system',join_paths(meson.current_source_dir(),'data/systemd','pamac-system.service'))

 meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/lib/systemd/system',join_paths(meson.current_source_dir(),'data/systemd','pamac-cleancache.service'))
@@ -61,13 +58,15 @@ pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile

 pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml'])

-if KDE_TRAY
-else
-endif
+meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'),join_paths(meson.current_source_dir(),'data/local','','*'))
+
 meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'doc'),join_paths(meson.current_source_dir(),'doc','','*'))

 install_data('data/pamac-install.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
 install_data('data/pamac-manager.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
+if ENABLE_UPDATE_ICON
+	install_data('data/pamac-updater.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
+endif
 if KDE_TRAY
 	if (get_option('prefix').startswith('/home/'))
 		message('[33mAutostart file data/pamac-tray-appindicator.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart[39m')
@@ -81,13 +80,17 @@ else
 		install_data('data/pamac-tray.desktop',install_dir: '/etc/xdg/autostart')
 	endif
 endif
+dbus_cfg_org_pamac_system_service = configure_file(input: 'data/dbus/org.pamac.system.service',output: 'org.pamac.system.service', configuration: cfg_dbus_data)
+install_data(dbus_cfg_org_pamac_system_service,install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','system-services'))
+dbus_cfg_org_pamac_user_service = configure_file(input: 'data/dbus/org.pamac.user.service',output: 'org.pamac.user.service', configuration: cfg_dbus_data)
+install_data(dbus_cfg_org_pamac_user_service,install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','services'))
+install_data( 'data/dbus/org.pamac.system.conf',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','system.d'))
 install_data('data/icons/16x16/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/16x16/apps'))
 install_data('data/icons/24x24/status/pamac-tray-no-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps'))
 install_data('data/icons/24x24/status/pamac-tray-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps'))
 install_data('data/icons/32x32/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/32x32/apps'))
-install_data('data/pixmaps/package-generic.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-generic.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
 subdir('src')
-subdir('src/aur')
 subdir('src/pamac-user-daemon')
 subdir('src/pamac-tray')
 subdir('src/pamac-clean-cache')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,3 @@
 option('DISABLE_AUR',type : 'string', value: '')
+option('ENABLE_UPDATE_ICON',type : 'string', value: '')
 option('KDE_TRAY',type : 'string', value: '')
--- a/meson_scripts/install_data.sh
+++ b/meson_scripts/install_data.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 mkdir -p $DESTDIR/$1
-if [[ -d $2 ]]; then
+if [ -d "$2" ]; then
 	cp -a $2/* $DESTDIR/$1
 else
 	cp -a $2 $DESTDIR/$1
--- a/pamac.avprj
+++ b/pamac.avprj
@@ -1,11 +1,8 @@
 ### AutoVala Project ###
-autovala_version: 25
-project_name: pamac
+autovala_version: 26
+project_name: pamac-classic
 vala_version: 0.38

-custom: data/dbus/org.pamac.system.conf /etc/dbus-1/system.d
-custom: data/dbus/org.pamac.user.service /usr/share/dbus-1/services
-custom: data/dbus/org.pamac.system.service /usr/share/dbus-1/system-services
 custom: data/systemd/pamac-system.service /usr/lib/systemd/system
 custom: data/systemd/pamac-cleancache.service /usr/lib/systemd/system
 custom: data/systemd/pamac-cleancache.timer /usr/lib/systemd/system
@@ -19,6 +16,7 @@ else
 custom: data/config/pamac.conf /etc
 end

+define: ENABLE_UPDATE_ICON
 define: KDE_TRAY
 *define: DISABLE_AUR

@@ -29,10 +27,11 @@ define: KDE_TRAY
 vapidir: src/vapis

 vala_binary: src/pamac-clean-cache/pamac-clean-cache
-version: 6.3.5
-vala_local_package: Pamac
+version: 6.4.0
+vala_local_package: pamacclassic
 vala_package: posix
 vala_check_package: gtk+-3.0
+vala_check_package: json-glib-1.0
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
@@ -40,10 +39,11 @@ vala_check_package: gtk+-3.0
 *vala_source: pamac_config.vala

 vala_binary: src/pamac-install/pamac-install
-version: 6.3.5
+version: 6.4.0
 use_gresource: pamac_installer_gresource_xml
-vala_local_package: Pamac
+vala_local_package: pamacclassic
 vala_check_package: gtk+-3.0
+vala_check_package: json-glib-1.0
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
@@ -51,11 +51,12 @@ vala_check_package: gtk+-3.0
 *vala_source: progress_dialog.vala

 vala_binary: src/pamac-manager/pamac-manager
-version: 6.3.5
+version: 6.4.0
 alias: pamac-updater
 use_gresource: pamac_manager_gresource_xml
-vala_local_package: Pamac
+vala_local_package: pamacclassic
 vala_check_package: gtk+-3.0
+vala_check_package: json-glib-1.0
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
@@ -64,11 +65,8 @@ vala_check_package: gtk+-3.0
 *vala_source: manager_window.vala

 vala_binary: src/pamac-system-daemon/pamac-system-daemon
-version: 6.3.5
-vala_local_package: Pamac
-if NOT DISABLE_AUR
-vala_local_package: AUR
-end
+version: 6.4.0
+vala_local_package: pamacclassic
 vala_package: posix
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
@@ -85,11 +83,8 @@ vala_check_package: polkit-gobject-1
 *vala_source: system_daemon.vala

 vala_binary: src/pamac-tray/pamac-tray
-version: 6.3.5
-vala_local_package: Pamac
-if NOT DISABLE_AUR
-vala_local_package: AUR
-end
+version: 6.4.0
+vala_local_package: pamacclassic
 vala_package: posix
 vala_check_package: json-glib-1.0
 vala_check_package: libalpm
@@ -112,11 +107,8 @@ end
 *vala_source: tray.vala

 vala_binary: src/pamac-user-daemon/pamac-user-daemon
-version: 6.3.5
-vala_local_package: Pamac
-if NOT DISABLE_AUR
-vala_local_package: AUR
-end
+version: 6.4.0
+vala_local_package: pamacclassic
 vala_package: posix
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
@@ -129,20 +121,25 @@ vala_check_package: libsoup-2.4
 *vala_source: user_daemon.vala


-vala_library: src/pamac
-version: 6.3.5
-*namespace: Pamac
+vala_library: src/pamac-classic
+version: 6.4.0
+namespace: pamacclassic
 use_gresource: pamac_transaction_gresource_xml
 vala_package: posix
 vala_check_package: gdk-3.0
 vala_check_package: gtk+-3.0
+vala_check_package: json-glib-1.0
 vala_check_package: libalpm
 vala_check_package: libnotify
+vala_check_package: libsoup-2.4
 vala_check_package: vte-2.91
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
 *c_library: m
+if NOT DISABLE_AUR
+vala_source: aur.vala
+end
 *vala_source: alpm_config.vala
 *vala_source: choose_ignorepkgs_dialog.vala
 *vala_source: choose_provider_dialog.vala
@@ -155,14 +152,6 @@ vala_check_package: vte-2.91
 *vala_source: transaction.vala
 *vala_source: transaction_sum_dialog.vala

-vala_library: src/aur/aur
-version: 6.3.5
-*namespace: AUR
-vala_check_package: json-glib-1.0
-vala_check_package: libsoup-2.4
-*vala_check_package: glib-2.0
-*vala_source: aur.vala
-

 *po: po

@@ -175,7 +164,7 @@ vala_check_package: libsoup-2.4
 *translate: glade data/interface/progress_dialog.ui
 *translate: glade data/interface/transaction_sum_dialog.ui
 *translate: vala src/alpm_config.vala
-*translate: vala src/aur/aur.vala
+*translate: vala src/aur.vala
 *translate: vala src/choose_ignorepkgs_dialog.vala
 *translate: vala src/choose_provider_dialog.vala
 *translate: vala src/common.vala
@@ -194,6 +183,8 @@ vala_check_package: libsoup-2.4
 *translate: vala src/pamac-system-daemon/system_daemon.vala
 *translate: vala src/pamac-tray/alpm_config.vala
 *translate: vala src/pamac-tray/pamac_config.vala
+*translate: vala src/pamac-tray/tray-appindicator.vala
+*translate: vala src/pamac-tray/tray-gtk.vala
 *translate: vala src/pamac-tray/tray.vala
 *translate: vala src/pamac-user-daemon/alpm_config.vala
 *translate: vala src/pamac-user-daemon/user_daemon.vala
@@ -202,16 +193,16 @@ vala_check_package: libsoup-2.4
 *translate: vala src/progress_box.vala
 *translate: vala src/transaction.vala
 *translate: vala src/transaction_sum_dialog.vala
-if KDE_TRAY
-translate: vala src/pamac-tray/tray-appindicator.vala
-else
-translate: vala src/pamac-tray/tray-gtk.vala
-end
+
+*data: data/local

 *doc: doc

 *desktop: data/pamac-install.desktop
 *desktop: data/pamac-manager.desktop
+if ENABLE_UPDATE_ICON
+desktop: data/pamac-updater.desktop
+end

 if KDE_TRAY
 autostart: data/pamac-tray-appindicator.desktop
@@ -219,6 +210,11 @@ else
 autostart: data/pamac-tray.desktop
 end

+*dbus_system_service: data/dbus/org.pamac.system.service
+*dbus_service: data/dbus/org.pamac.user.service
+
+*dbus_config: data/dbus/org.pamac.system.conf
+
 *full_icon: Hicolor Applications data/icons/16x16/apps/system-software-install.png
 *full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-no-update.png
 *full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-update.png
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -2,5 +2,5 @@
 ### Do not edit

 include (Translations)
-add_translations_directory("pamac")
-add_translations_catalog("pamac" ../src/pamac-clean-cache ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../src/aur ../data/interface )
+add_translations_directory("pamac-classic")
+add_translations_catalog("pamac-classic" ../src/pamac-clean-cache ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../data/interface )
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,6 +16,7 @@ src/pamac-tray/pamac_config.vala
 src/pamac-tray/tray.vala
 src/pamac-user-daemon/alpm_config.vala
 src/pamac-user-daemon/user_daemon.vala
+src/aur.vala
 src/alpm_config.vala
 src/choose_ignorepkgs_dialog.vala
 src/choose_provider_dialog.vala
@@ -27,7 +28,6 @@ src/preferences_dialog.vala
 src/progress_box.vala
 src/transaction.vala
 src/transaction_sum_dialog.vala
-src/aur/aur.vala
 data/interface/choose_ignorepkgs_dialog.ui
 data/interface/choose_provider_dialog.ui
 data/interface/history_dialog.ui
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,2 +1,2 @@
 i18n = import('i18n')
-i18n.gettext('pamac', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'es', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es_419', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ'])
+i18n.gettext('pamac-classic', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'es', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es_419', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ'])
--- a/po/pamac.pot
+++ b/po/pamac.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pamac\n"
 "Report-Msgid-Bugs-To: cromer@cromnix.org\n"
-"POT-Creation-Date: 2017-10-27 20:46-0300\n"
+"POT-Creation-Date: 2017-10-29 17:33-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,20 +2,20 @@
 ### Do not edit

 set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
+set (PKGDATADIR "${DATADIR}/pamac-classic")
+set (GETTEXT_PACKAGE "pamac-classic")
+set (RELEASE_NAME "pamac-classic")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")

 configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.pc ${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc)
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.deps ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps)
-set (VERSION "6.3.5")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps)
+set (VERSION "6.4.0")
 add_definitions (${DEPS_CFLAGS})
 link_libraries ( ${DEPS_LIBRARIES} )
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -27,14 +27,19 @@ include (ValaPrecompile)
 set (VALA_PACKAGES ${VALA_PACKAGES} posix)
 set (VALA_PACKAGES ${VALA_PACKAGES} gdk-3.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
+set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} libalpm)
 set (VALA_PACKAGES ${VALA_PACKAGES} libnotify)
+set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4)
 set (VALA_PACKAGES ${VALA_PACKAGES} vte-2.91)
 set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)

 set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
+if (NOT DISABLE_AUR)
+	set (APP_SOURCES ${APP_SOURCES} aur.vala)
+endif ()
 set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
 set (APP_SOURCES ${APP_SOURCES} choose_ignorepkgs_dialog.vala)
 set (APP_SOURCES ${APP_SOURCES} choose_provider_dialog.vala)
@@ -52,6 +57,11 @@ if (DISABLE_AUR)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
 endif ()
+if (ENABLE_UPDATE_ICON)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
+endif ()
 if (KDE_TRAY)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -63,67 +73,67 @@ if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "Rel
 	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
 endif()

-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=Pamac --gir Pamac-6.0.gir )
+set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-6.0.gir )
 set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml )

-vala_precompile(VALA_C Pamac
+vala_precompile(VALA_C pamacclassic
 	${APP_SOURCES}
 PACKAGES
 	${VALA_PACKAGES}
 OPTIONS
 	${COMPILE_OPTIONS}
 GENERATE_VAPI
-	Pamac
+	pamacclassic
 GENERATE_HEADER
-	Pamac
+	pamacclassic
 )

 SET (VALA_C ${VALA_C} ${pamac_transaction_gresource_xml_C_FILE})
-add_library(Pamac SHARED ${VALA_C})
+add_library(pamacclassic SHARED ${VALA_C})

-set ( Pamac_DEPENDENCIES ${Pamac_DEPENDENCIES} pamac_transaction_gresource_xml )
-add_dependencies( Pamac ${Pamac_DEPENDENCIES} )
-target_link_libraries( Pamac m )
-set_target_properties( Pamac PROPERTIES
+set ( pamacclassic_DEPENDENCIES ${pamacclassic_DEPENDENCIES} pamac_transaction_gresource_xml )
+add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
+target_link_libraries( pamacclassic m )
+set_target_properties( pamacclassic PROPERTIES
 VERSION
-	6.3.5
+	6.4.0
 SOVERSION
 	6 )


 install(TARGETS
-	Pamac
+	pamacclassic
 LIBRARY DESTINATION
 	${CMAKE_INSTALL_LIBDIR}/
 )
 install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/Pamac.h
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.h
 DESTINATION
 	${CMAKE_INSTALL_INCLUDEDIR}/
 )
 install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/Pamac.vapi
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.vapi
 DESTINATION
 	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
 )
 install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps
 DESTINATION
 	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
 )
 install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/Pamac-6.0.gir
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-6.0.gir
 DESTINATION
 	${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/
 )
 install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc
 DESTINATION
 	${CMAKE_INSTALL_LIBDIR}/pkgconfig/
 )
 if(HAVE_VALADOC)
-	valadoc(Pamac
-		${CMAKE_BINARY_DIR}/valadoc/Pamac
+	valadoc(pamacclassic
+		${CMAKE_BINARY_DIR}/valadoc/pamacclassic
 		${APP_SOURCES}
 	PACKAGES
 		${VALA_PACKAGES}
@@ -133,7 +143,7 @@ if(HAVE_VALADOC)
 	install(DIRECTORY
 		${CMAKE_BINARY_DIR}/valadoc
 	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 	)
 endif()

--- a/src/Config.vala.base
+++ b/src/Config.vala.base
@@ -1,4 +1,4 @@
-namespace PamacConstants {
+namespace pamacclassicConstants {
 	public const string DATADIR = "@DATADIR@";
 	public const string PKGDATADIR = "@PKGDATADIR@";
 	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
--- a/src/Pamac.pc
+++ b/src/Pamac.pc
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-real_prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@DOLLAR@{prefix}
-libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR}
-includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
-
-Name: Pamac
-Description: Pamac
-Version: 6.3.5
-Libs: -L@DOLLAR@{libdir} -lPamac
-Cflags: -I@DOLLAR@{includedir}
-Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0
--- a/src/PamacUserDaemon.deps
+++ b/src/PamacUserDaemon.deps
@@ -1,9 +0,0 @@
-posix
-gdk-3.0
-gtk+-3.0
-libalpm
-libnotify
-vte-2.91
-gio-2.0
-glib-2.0
-gobject-2.0
--- a/src/PamacUserDaemon.pc
+++ b/src/PamacUserDaemon.pc
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-real_prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@DOLLAR@{prefix}
-libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR}
-includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
-
-Name: PamacUserDaemon
-Description: PamacUserDaemon
-Version: 5.2.1
-Libs: -L@DOLLAR@{libdir} -lPamacUserDaemon
-Cflags: -I@DOLLAR@{includedir}
-Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0
--- a/src/aur/aur.vala
+++ b/src/aur/aur.vala
--- a/src/aur/AUR.deps
+++ b/src/aur/AUR.deps
@@ -1,3 +0,0 @@
-json-glib-1.0
-libsoup-2.4
-glib-2.0
--- a/src/aur/CMakeLists.txt
+++ b/src/aur/CMakeLists.txt
@@ -1,117 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
-set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
-set (DOLLAR "$")
-
-configure_file (${CMAKE_SOURCE_DIR}/src/aur/Config.vala.base ${CMAKE_BINARY_DIR}/src/aur/Config.vala)
-add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.pc ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc)
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.deps ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps)
-set (VERSION "6.3.5")
-add_definitions (${DEPS_CFLAGS})
-link_libraries ( ${DEPS_LIBRARIES} )
-link_directories ( ${DEPS_LIBRARY_DIRS} )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-set (APP_SOURCES ${APP_SOURCES} aur.vala)
-
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=AUR --gir AUR-6.0.gir )
-
-vala_precompile(VALA_C AUR
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-OPTIONS
-	${COMPILE_OPTIONS}
-GENERATE_VAPI
-	AUR
-GENERATE_HEADER
-	AUR
-)
-
-add_library(AUR SHARED ${VALA_C})
-
-set_target_properties( AUR PROPERTIES
-VERSION
-	6.3.5
-SOVERSION
-	6 )
-
-
-install(TARGETS
-	AUR
-LIBRARY DESTINATION
-	${CMAKE_INSTALL_LIBDIR}/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/AUR.h
-DESTINATION
-	${CMAKE_INSTALL_INCLUDEDIR}/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/AUR.vapi
-DESTINATION
-	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/AUR.deps
-DESTINATION
-	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/AUR-6.0.gir
-DESTINATION
-	${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/AUR.pc
-DESTINATION
-	${CMAKE_INSTALL_LIBDIR}/pkgconfig/
-)
-if(HAVE_VALADOC)
-	valadoc(AUR
-		${CMAKE_BINARY_DIR}/valadoc/AUR
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
--- a/src/aur/Config.vala.base
+++ b/src/aur/Config.vala.base
@@ -1,10 +0,0 @@
-namespace AURConstants {
-	public const string DATADIR = "@DATADIR@";
-	public const string PKGDATADIR = "@PKGDATADIR@";
-	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
-	public const string RELEASE_NAME = "@RELEASE_NAME@";
-	public const string VERSION = "@VERSION@";
-#if UNITEST
-	public const string TESTSRCDIR = "@TESTSRCDIR@";
-#endif
-}
--- a/src/aur/meson.build
+++ b/src/aur/meson.build
@@ -1,46 +0,0 @@
-cfg_aur = configuration_data()
-cfg_aur.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_aur.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_aur.set('GETTEXT_PACKAGE', 'pamac')
-cfg_aur.set('RELEASE_NAME', 'pamac')
-cfg_aur.set('PREFIX', get_option('prefix'))
-cfg_aur.set('VERSION', '6.3.5')
-cfg_aur.set('TESTSRCDIR', meson.source_root())
-
-cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_aur)
-
-aur_deps = [json_glib_1_0_dep]
-aur_deps += [libsoup_2_4_dep]
-aur_deps += [glib_2_0_dep]
-aur_sources = [cfgfile_2]
-aur_sources += ['aur.vala']
-aur_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-aur_c_args = []
-if DISABLE_AUR
-  aur_vala_args += ['-D', 'DISABLE_AUR']
-  aur_c_args += ['-DDISABLE_AUR']
-endif
-if KDE_TRAY
-  aur_vala_args += ['-D', 'KDE_TRAY']
-  aur_c_args += ['-DKDE_TRAY']
-endif
-aur_vala_args += ['--gir=AUR-6.0.gir']
-
-
-AUR_library = shared_library('AUR',aur_sources,dependencies: aur_deps,vala_args: aur_vala_args,c_args: aur_c_args,version: '6.3.5',soversion: '6',install: true)
-
-aur_requires = []
-aur_requires += ['json-glib-1.0']
-aur_requires += ['libsoup-2.4']
-aur_requires += ['glib-2.0']
-pkg_mod = import('pkgconfig')
-pkg_mod.generate(libraries : AUR_library,
-	version : '6.3.5',
-	name : 'AUR',
-	filebase : 'AUR',
-	description : 'AUR',
-	requires : aur_requires)
-
-install_data(join_paths(meson.current_source_dir(),'AUR.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
-meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src/aur','AUR','AUR-6.0.gir')
-
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,70 +1,81 @@
-cfg_pamac = configuration_data()
-cfg_pamac.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_pamac.set('GETTEXT_PACKAGE', 'pamac')
-cfg_pamac.set('RELEASE_NAME', 'pamac')
-cfg_pamac.set('PREFIX', get_option('prefix'))
-cfg_pamac.set('VERSION', '6.3.5')
-cfg_pamac.set('TESTSRCDIR', meson.source_root())
+cfg_pamac_classic = configuration_data()
+cfg_pamac_classic.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
+cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac-classic')
+cfg_pamac_classic.set('RELEASE_NAME', 'pamac-classic')
+cfg_pamac_classic.set('PREFIX', get_option('prefix'))
+cfg_pamac_classic.set('VERSION', '6.4.0')
+cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())

-cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac)
+cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)

-pamac_deps = [gdk_3_0_dep]
-pamac_deps += [gtk_3_0_dep]
-pamac_deps += [libalpm_dep]
-pamac_deps += [libnotify_dep]
-pamac_deps += [vte_2_91_dep]
-pamac_deps += [gio_2_0_dep]
-pamac_deps += [glib_2_0_dep]
-pamac_deps += [gobject_2_0_dep]
-pamac_sources = [cfgfile_1]
-pamac_sources += ['alpm_config.vala']
-pamac_sources += ['choose_ignorepkgs_dialog.vala']
-pamac_sources += ['choose_provider_dialog.vala']
-pamac_sources += ['common.vala']
-pamac_sources += ['mirrors_config.vala']
-pamac_sources += ['package.vala']
-pamac_sources += ['pamac_config.vala']
-pamac_sources += ['preferences_dialog.vala']
-pamac_sources += ['progress_box.vala']
-pamac_sources += ['transaction.vala']
-pamac_sources += ['transaction_sum_dialog.vala']
-pamac_sources += [pamac_transaction_gresource_xml_file_c]
-pamac_vala_args = ['--pkg','posix']
-pamac_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')]
-pamac_c_args = []
+pamac_classic_deps = [gdk_3_0_dep]
+pamac_classic_deps += [gtk_3_0_dep]
+pamac_classic_deps += [json_glib_1_0_dep]
+pamac_classic_deps += [libalpm_dep]
+pamac_classic_deps += [libnotify_dep]
+pamac_classic_deps += [libsoup_2_4_dep]
+pamac_classic_deps += [vte_2_91_dep]
+pamac_classic_deps += [gio_2_0_dep]
+pamac_classic_deps += [glib_2_0_dep]
+pamac_classic_deps += [gobject_2_0_dep]
+pamac_classic_sources = [cfgfile_1]
+if not DISABLE_AUR
+pamac_classic_sources += ['aur.vala']
+endif
+pamac_classic_sources += ['alpm_config.vala']
+pamac_classic_sources += ['choose_ignorepkgs_dialog.vala']
+pamac_classic_sources += ['choose_provider_dialog.vala']
+pamac_classic_sources += ['common.vala']
+pamac_classic_sources += ['mirrors_config.vala']
+pamac_classic_sources += ['package.vala']
+pamac_classic_sources += ['pamac_config.vala']
+pamac_classic_sources += ['preferences_dialog.vala']
+pamac_classic_sources += ['progress_box.vala']
+pamac_classic_sources += ['transaction.vala']
+pamac_classic_sources += ['transaction_sum_dialog.vala']
+pamac_classic_sources += [pamac_transaction_gresource_xml_file_c]
+pamac_classic_vala_args = ['--pkg','posix']
+pamac_classic_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+pamac_classic_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')]
+pamac_classic_c_args = []
 if DISABLE_AUR
-  pamac_vala_args += ['-D', 'DISABLE_AUR']
-  pamac_c_args += ['-DDISABLE_AUR']
+  pamac_classic_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_classic_c_args += ['-DDISABLE_AUR']
+endif
+if ENABLE_UPDATE_ICON
+  pamac_classic_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_classic_c_args += ['-DENABLE_UPDATE_ICON']
 endif
 if KDE_TRAY
-  pamac_vala_args += ['-D', 'KDE_TRAY']
-  pamac_c_args += ['-DKDE_TRAY']
+  pamac_classic_vala_args += ['-D', 'KDE_TRAY']
+  pamac_classic_c_args += ['-DKDE_TRAY']
 endif
-pamac_deps += [meson.get_compiler('c').find_library('m', required : false)]
-pamac_vala_args += ['--gir=Pamac-6.0.gir']
+pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : false)]
+pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir']


-Pamac_library = shared_library('Pamac',pamac_sources,dependencies: pamac_deps,vala_args: pamac_vala_args,c_args: pamac_c_args,version: '6.3.5',soversion: '6',install: true)
+pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.4.0',soversion: '6',install: true)

-pamac_requires = []
-pamac_requires += ['gdk-3.0']
-pamac_requires += ['gtk+-3.0']
-pamac_requires += ['libalpm']
-pamac_requires += ['libnotify']
-pamac_requires += ['vte-2.91']
-pamac_requires += ['gio-2.0']
-pamac_requires += ['glib-2.0']
-pamac_requires += ['gobject-2.0']
+pamac_classic_requires = []
+pamac_classic_requires += ['gdk-3.0']
+pamac_classic_requires += ['gtk+-3.0']
+pamac_classic_requires += ['json-glib-1.0']
+pamac_classic_requires += ['libalpm']
+pamac_classic_requires += ['libnotify']
+pamac_classic_requires += ['libsoup-2.4']
+pamac_classic_requires += ['vte-2.91']
+pamac_classic_requires += ['gio-2.0']
+pamac_classic_requires += ['glib-2.0']
+pamac_classic_requires += ['gobject-2.0']
 pkg_mod = import('pkgconfig')
-pkg_mod.generate(libraries : Pamac_library,
-	version : '6.3.5',
-	name : 'Pamac',
-	filebase : 'Pamac',
-	description : 'Pamac',
-	requires : pamac_requires)
+pkg_mod.generate(libraries : pamacclassic_library,
+	version : '6.4.0',
+	name : 'pamacclassic',
+	filebase : 'pamacclassic',
+	description : 'pamacclassic',
+	requires : pamac_classic_requires)

-install_data(join_paths(meson.current_source_dir(),'Pamac.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
-meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src','Pamac','Pamac-6.0.gir')
+install_data(join_paths(meson.current_source_dir(),'pamacclassic.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
+meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src','pamacclassic','pamacclassic-6.0.gir')

--- a/src/pamac-clean-cache/CMakeLists.txt
+++ b/src/pamac-clean-cache/CMakeLists.txt
@@ -2,21 +2,21 @@
 ### Do not edit

 set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
+set (PKGDATADIR "${DATADIR}/pamac-classic")
+set (GETTEXT_PACKAGE "pamac-classic")
+set (RELEASE_NAME "pamac-classic")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")

 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lPamac )
+link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
 link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
 find_package (Vala REQUIRED)
 include (ValaVersion)
@@ -25,6 +25,7 @@ include (ValaPrecompile)

 set (VALA_PACKAGES ${VALA_PACKAGES} posix)
 set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
+set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
@@ -33,13 +34,18 @@ set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
 set (APP_SOURCES ${APP_SOURCES} clean_cache.vala)
 set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)

-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
+set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)

 if (DISABLE_AUR)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
 endif ()
+if (ENABLE_UPDATE_ICON)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
+endif ()
 if (KDE_TRAY)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -63,7 +69,7 @@ OPTIONS
 )

 add_executable(pamac-clean-cache ${VALA_C})
-set ( pamac-clean-cache_DEPENDENCIES ${pamac-clean-cache_DEPENDENCIES} Pamac )
+set ( pamac-clean-cache_DEPENDENCIES ${pamac-clean-cache_DEPENDENCIES} pamacclassic )
 add_dependencies( pamac-clean-cache ${pamac-clean-cache_DEPENDENCIES} )


@@ -84,6 +90,6 @@ if(HAVE_VALADOC)
 	install(DIRECTORY
 		${CMAKE_BINARY_DIR}/valadoc
 	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 	)
 endif()
--- a/src/pamac-clean-cache/meson.build
+++ b/src/pamac-clean-cache/meson.build
@@ -1,29 +1,34 @@
 cfg_pamac_clean_cache = configuration_data()
 cfg_pamac_clean_cache.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac')
-cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac')
+cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
+cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac-classic')
+cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac-classic')
 cfg_pamac_clean_cache.set('PREFIX', get_option('prefix'))
-cfg_pamac_clean_cache.set('VERSION', '6.3.5')
+cfg_pamac_clean_cache.set('VERSION', '6.4.0')
 cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())

-cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)
+cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)

 pamac_clean_cache_deps = [gtk_3_0_dep]
+pamac_clean_cache_deps += [json_glib_1_0_dep]
 pamac_clean_cache_deps += [gio_2_0_dep]
 pamac_clean_cache_deps += [glib_2_0_dep]
 pamac_clean_cache_deps += [gobject_2_0_dep]
-pamac_clean_cache_sources = [cfgfile_5]
+pamac_clean_cache_sources = [cfgfile_4]
 pamac_clean_cache_sources += ['clean_cache.vala']
 pamac_clean_cache_sources += ['pamac_config.vala']
 pamac_clean_cache_vala_args = ['--pkg','posix']
 pamac_clean_cache_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_clean_cache_dependencies = [Pamac_library]
+pamac_clean_cache_dependencies = [pamacclassic_library]
 pamac_clean_cache_c_args = []
 if DISABLE_AUR
  pamac_clean_cache_vala_args += ['-D', 'DISABLE_AUR']
  pamac_clean_cache_c_args += ['-DDISABLE_AUR']
 endif
+if ENABLE_UPDATE_ICON
+  pamac_clean_cache_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_clean_cache_c_args += ['-DENABLE_UPDATE_ICON']
+endif
 if KDE_TRAY
  pamac_clean_cache_vala_args += ['-D', 'KDE_TRAY']
  pamac_clean_cache_c_args += ['-DKDE_TRAY']
--- a/src/pamac-install/CMakeLists.txt
+++ b/src/pamac-install/CMakeLists.txt
@@ -2,21 +2,21 @@
 ### Do not edit

 set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
+set (PKGDATADIR "${DATADIR}/pamac-classic")
+set (GETTEXT_PACKAGE "pamac-classic")
+set (RELEASE_NAME "pamac-classic")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")

 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lPamac )
+link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
 link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
 find_package (Vala REQUIRED)
 include (ValaVersion)
@@ -24,6 +24,7 @@ ensure_vala_version ("0.38" MINIMUM)
 include (ValaPrecompile)

 set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
+set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
@@ -32,13 +33,18 @@ set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
 set (APP_SOURCES ${APP_SOURCES} installer.vala)
 set (APP_SOURCES ${APP_SOURCES} progress_dialog.vala)

-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
+set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)

 if (DISABLE_AUR)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
 endif ()
+if (ENABLE_UPDATE_ICON)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
+endif ()
 if (KDE_TRAY)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -65,7 +71,7 @@ OPTIONS
 SET (VALA_C ${VALA_C} ${pamac_installer_gresource_xml_C_FILE})
 add_executable(pamac-install ${VALA_C})
 set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} pamac_installer_gresource_xml )
-set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} Pamac )
+set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} pamacclassic )
 add_dependencies( pamac-install ${pamac-install_DEPENDENCIES} )


@@ -86,6 +92,6 @@ if(HAVE_VALADOC)
 	install(DIRECTORY
 		${CMAKE_BINARY_DIR}/valadoc
 	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 	)
 endif()
--- a/src/pamac-install/meson.build
+++ b/src/pamac-install/meson.build
@@ -1,30 +1,35 @@
 cfg_pamac_install = configuration_data()
 cfg_pamac_install.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac')
-cfg_pamac_install.set('RELEASE_NAME', 'pamac')
+cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
+cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac-classic')
+cfg_pamac_install.set('RELEASE_NAME', 'pamac-classic')
 cfg_pamac_install.set('PREFIX', get_option('prefix'))
-cfg_pamac_install.set('VERSION', '6.3.5')
+cfg_pamac_install.set('VERSION', '6.4.0')
 cfg_pamac_install.set('TESTSRCDIR', meson.source_root())

-cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
+cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)

 pamac_install_deps = [gtk_3_0_dep]
+pamac_install_deps += [json_glib_1_0_dep]
 pamac_install_deps += [gio_2_0_dep]
 pamac_install_deps += [glib_2_0_dep]
 pamac_install_deps += [gobject_2_0_dep]
-pamac_install_sources = [cfgfile_6]
+pamac_install_sources = [cfgfile_5]
 pamac_install_sources += ['installer.vala']
 pamac_install_sources += ['progress_dialog.vala']
 pamac_install_sources += [pamac_installer_gresource_xml_file_c]
 pamac_install_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
 pamac_install_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.installer.gresource.xml')]
-pamac_install_dependencies = [Pamac_library]
+pamac_install_dependencies = [pamacclassic_library]
 pamac_install_c_args = []
 if DISABLE_AUR
  pamac_install_vala_args += ['-D', 'DISABLE_AUR']
  pamac_install_c_args += ['-DDISABLE_AUR']
 endif
+if ENABLE_UPDATE_ICON
+  pamac_install_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_install_c_args += ['-DENABLE_UPDATE_ICON']
+endif
 if KDE_TRAY
  pamac_install_vala_args += ['-D', 'KDE_TRAY']
  pamac_install_c_args += ['-DKDE_TRAY']
--- a/src/pamac-manager/CMakeLists.txt
+++ b/src/pamac-manager/CMakeLists.txt
@@ -2,21 +2,21 @@
 ### Do not edit

 set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
+set (PKGDATADIR "${DATADIR}/pamac-classic")
+set (GETTEXT_PACKAGE "pamac-classic")
+set (RELEASE_NAME "pamac-classic")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")

 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lPamac )
+link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
 link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
 find_package (Vala REQUIRED)
 include (ValaVersion)
@@ -24,6 +24,7 @@ ensure_vala_version ("0.38" MINIMUM)
 include (ValaPrecompile)

 set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
+set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
 set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
@@ -33,13 +34,18 @@ set (APP_SOURCES ${APP_SOURCES} history_dialog.vala)
 set (APP_SOURCES ${APP_SOURCES} manager.vala)
 set (APP_SOURCES ${APP_SOURCES} manager_window.vala)

-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
+set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)

 if (DISABLE_AUR)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
 endif ()
+if (ENABLE_UPDATE_ICON)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
+endif ()
 if (KDE_TRAY)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -66,7 +72,7 @@ OPTIONS
 SET (VALA_C ${VALA_C} ${pamac_manager_gresource_xml_C_FILE})
 add_executable(pamac-manager ${VALA_C})
 set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} pamac_manager_gresource_xml )
-set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} Pamac )
+set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} pamacclassic )
 add_dependencies( pamac-manager ${pamac-manager_DEPENDENCIES} )


@@ -93,6 +99,6 @@ if(HAVE_VALADOC)
 	install(DIRECTORY
 		${CMAKE_BINARY_DIR}/valadoc
 	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 	)
 endif()
--- a/src/pamac-manager/meson.build
+++ b/src/pamac-manager/meson.build
@@ -1,31 +1,36 @@
 cfg_pamac_manager = configuration_data()
 cfg_pamac_manager.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac')
-cfg_pamac_manager.set('RELEASE_NAME', 'pamac')
+cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
+cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac-classic')
+cfg_pamac_manager.set('RELEASE_NAME', 'pamac-classic')
 cfg_pamac_manager.set('PREFIX', get_option('prefix'))
-cfg_pamac_manager.set('VERSION', '6.3.5')
+cfg_pamac_manager.set('VERSION', '6.4.0')
 cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())

-cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
+cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)

 pamac_manager_deps = [gtk_3_0_dep]
+pamac_manager_deps += [json_glib_1_0_dep]
 pamac_manager_deps += [gio_2_0_dep]
 pamac_manager_deps += [glib_2_0_dep]
 pamac_manager_deps += [gobject_2_0_dep]
-pamac_manager_sources = [cfgfile_7]
+pamac_manager_sources = [cfgfile_6]
 pamac_manager_sources += ['history_dialog.vala']
 pamac_manager_sources += ['manager.vala']
 pamac_manager_sources += ['manager_window.vala']
 pamac_manager_sources += [pamac_manager_gresource_xml_file_c]
 pamac_manager_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
 pamac_manager_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.manager.gresource.xml')]
-pamac_manager_dependencies = [Pamac_library]
+pamac_manager_dependencies = [pamacclassic_library]
 pamac_manager_c_args = []
 if DISABLE_AUR
  pamac_manager_vala_args += ['-D', 'DISABLE_AUR']
  pamac_manager_c_args += ['-DDISABLE_AUR']
 endif
+if ENABLE_UPDATE_ICON
+  pamac_manager_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_manager_c_args += ['-DENABLE_UPDATE_ICON']
+endif
 if KDE_TRAY
  pamac_manager_vala_args += ['-D', 'KDE_TRAY']
  pamac_manager_c_args += ['-DKDE_TRAY']
@@ -34,4 +39,4 @@ pamac_manager_hfolders = ['../../src']

 executable('pamac-manager',pamac_manager_sources,dependencies: pamac_manager_deps,vala_args: pamac_manager_vala_args,c_args: pamac_manager_c_args,link_with: pamac_manager_dependencies,include_directories: include_directories(pamac_manager_hfolders),install: true)

-meson.add_install_script('sh', '-c', 'ln -sf pamac_manager ${DESTDIR}/${MESON_INSTALL_PREFIX}/bin/pamac-updater')
+meson.add_install_script('sh', '-c', 'ln -sf pamac-manager ${DESTDIR}/${MESON_INSTALL_PREFIX}/bin/pamac-updater')
--- a/src/pamac-system-daemon/CMakeLists.txt
+++ b/src/pamac-system-daemon/CMakeLists.txt
@@ -2,22 +2,22 @@
 ### Do not edit

 set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
+set (PKGDATADIR "${DATADIR}/pamac-classic")
+set (GETTEXT_PACKAGE "pamac-classic")
+set (RELEASE_NAME "pamac-classic")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")

 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
-link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
+include_directories ( ${CMAKE_BINARY_DIR}/src )
+link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
+link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
 find_package (Vala REQUIRED)
 include (ValaVersion)
 ensure_vala_version ("0.38" MINIMUM)
@@ -40,16 +40,18 @@ set (APP_SOURCES ${APP_SOURCES} mirrors_config.vala)
 set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
 set (APP_SOURCES ${APP_SOURCES} system_daemon.vala)

-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
-if (NOT DISABLE_AUR)
-	set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi)
-endif ()
+set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)

 if (DISABLE_AUR)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
 endif ()
+if (ENABLE_UPDATE_ICON)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
+endif ()
 if (KDE_TRAY)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -73,10 +75,7 @@ OPTIONS
 )

 add_executable(pamac-system-daemon ${VALA_C})
-set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} Pamac )
-if (NOT DISABLE_AUR)
-	set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} AUR )
-endif ()
+set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} pamacclassic )
 add_dependencies( pamac-system-daemon ${pamac-system-daemon_DEPENDENCIES} )


@@ -97,6 +96,6 @@ if(HAVE_VALADOC)
 	install(DIRECTORY
 		${CMAKE_BINARY_DIR}/valadoc
 	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 	)
 endif()
--- a/src/pamac-system-daemon/meson.build
+++ b/src/pamac-system-daemon/meson.build
@@ -1,13 +1,13 @@
 cfg_pamac_system_daemon = configuration_data()
 cfg_pamac_system_daemon.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac')
-cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac')
+cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
+cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac-classic')
+cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac-classic')
 cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
-cfg_pamac_system_daemon.set('VERSION', '6.3.5')
+cfg_pamac_system_daemon.set('VERSION', '6.4.0')
 cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())

-cfgfile_8 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)
+cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)

 pamac_system_daemon_deps = [gtk_3_0_dep]
 pamac_system_daemon_deps += [json_glib_1_0_dep]
@@ -18,28 +18,28 @@ pamac_system_daemon_deps += [polkit_gobject_1_dep]
 pamac_system_daemon_deps += [gio_2_0_dep]
 pamac_system_daemon_deps += [glib_2_0_dep]
 pamac_system_daemon_deps += [gobject_2_0_dep]
-pamac_system_daemon_sources = [cfgfile_8]
+pamac_system_daemon_sources = [cfgfile_7]
 pamac_system_daemon_sources += ['alpm_config.vala']
 pamac_system_daemon_sources += ['mirrors_config.vala']
 pamac_system_daemon_sources += ['pamac_config.vala']
 pamac_system_daemon_sources += ['system_daemon.vala']
 pamac_system_daemon_vala_args = ['--pkg','posix']
 pamac_system_daemon_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_system_daemon_dependencies = [Pamac_library]
-if not DISABLE_AUR
-pamac_system_daemon_dependencies += [AUR_library]
-endif
+pamac_system_daemon_dependencies = [pamacclassic_library]
 pamac_system_daemon_c_args = []
 if DISABLE_AUR
  pamac_system_daemon_vala_args += ['-D', 'DISABLE_AUR']
  pamac_system_daemon_c_args += ['-DDISABLE_AUR']
 endif
+if ENABLE_UPDATE_ICON
+  pamac_system_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_system_daemon_c_args += ['-DENABLE_UPDATE_ICON']
+endif
 if KDE_TRAY
  pamac_system_daemon_vala_args += ['-D', 'KDE_TRAY']
  pamac_system_daemon_c_args += ['-DKDE_TRAY']
 endif
 pamac_system_daemon_hfolders = ['../../src']
-pamac_system_daemon_hfolders += ['../../src/aur']

 executable('pamac-system-daemon',pamac_system_daemon_sources,dependencies: pamac_system_daemon_deps,vala_args: pamac_system_daemon_vala_args,c_args: pamac_system_daemon_c_args,link_with: pamac_system_daemon_dependencies,include_directories: include_directories(pamac_system_daemon_hfolders),install: true)

--- a/src/pamac-tray/CMakeLists.txt
+++ b/src/pamac-tray/CMakeLists.txt
@@ -2,22 +2,22 @@
 ### Do not edit

 set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
+set (PKGDATADIR "${DATADIR}/pamac-classic")
+set (GETTEXT_PACKAGE "pamac-classic")
+set (RELEASE_NAME "pamac-classic")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")

 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
-link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
+include_directories ( ${CMAKE_BINARY_DIR}/src )
+link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
+link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
 find_package (Vala REQUIRED)
 include (ValaVersion)
 ensure_vala_version ("0.38" MINIMUM)
@@ -46,16 +46,18 @@ set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
 set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
 set (APP_SOURCES ${APP_SOURCES} tray.vala)

-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
-if (NOT DISABLE_AUR)
-	set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi)
-endif ()
+set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)

 if (DISABLE_AUR)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
 endif ()
+if (ENABLE_UPDATE_ICON)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
+endif ()
 if (KDE_TRAY)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -79,10 +81,7 @@ OPTIONS
 )

 add_executable(pamac-tray ${VALA_C})
-set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} Pamac )
-if (NOT DISABLE_AUR)
-	set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} AUR )
-endif ()
+set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} pamacclassic )
 add_dependencies( pamac-tray ${pamac-tray_DEPENDENCIES} )


@@ -103,9 +102,6 @@ if(HAVE_VALADOC)
 	install(DIRECTORY
 		${CMAKE_BINARY_DIR}/valadoc
 	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 	)
 endif()
-if (KDE_TRAY)
-	else ()
-endif ()
--- a/src/pamac-tray/meson.build
+++ b/src/pamac-tray/meson.build
@@ -1,13 +1,13 @@
 cfg_pamac_tray = configuration_data()
 cfg_pamac_tray.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac')
-cfg_pamac_tray.set('RELEASE_NAME', 'pamac')
+cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
+cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac-classic')
+cfg_pamac_tray.set('RELEASE_NAME', 'pamac-classic')
 cfg_pamac_tray.set('PREFIX', get_option('prefix'))
-cfg_pamac_tray.set('VERSION', '6.3.5')
+cfg_pamac_tray.set('VERSION', '6.4.0')
 cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())

-cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
+cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)

 pamac_tray_deps = [json_glib_1_0_dep]
 pamac_tray_deps += [libalpm_dep]
@@ -20,7 +20,7 @@ endif
 pamac_tray_deps += [gio_2_0_dep]
 pamac_tray_deps += [glib_2_0_dep]
 pamac_tray_deps += [gobject_2_0_dep]
-pamac_tray_sources = [cfgfile_4]
+pamac_tray_sources = [cfgfile_3]
 if KDE_TRAY
 pamac_tray_sources += ['tray-appindicator.vala']
 else
@@ -31,21 +31,21 @@ pamac_tray_sources += ['pamac_config.vala']
 pamac_tray_sources += ['tray.vala']
 pamac_tray_vala_args = ['--pkg','posix']
 pamac_tray_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_tray_dependencies = [Pamac_library]
-if not DISABLE_AUR
-pamac_tray_dependencies += [AUR_library]
-endif
+pamac_tray_dependencies = [pamacclassic_library]
 pamac_tray_c_args = []
 if DISABLE_AUR
  pamac_tray_vala_args += ['-D', 'DISABLE_AUR']
  pamac_tray_c_args += ['-DDISABLE_AUR']
 endif
+if ENABLE_UPDATE_ICON
+  pamac_tray_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_tray_c_args += ['-DENABLE_UPDATE_ICON']
+endif
 if KDE_TRAY
  pamac_tray_vala_args += ['-D', 'KDE_TRAY']
  pamac_tray_c_args += ['-DKDE_TRAY']
 endif
 pamac_tray_hfolders = ['../../src']
-pamac_tray_hfolders += ['../../src/aur']

 executable('pamac-tray',pamac_tray_sources,dependencies: pamac_tray_deps,vala_args: pamac_tray_vala_args,c_args: pamac_tray_c_args,link_with: pamac_tray_dependencies,include_directories: include_directories(pamac_tray_hfolders),install: true)

--- a/src/pamac-user-daemon/CMakeLists.txt
+++ b/src/pamac-user-daemon/CMakeLists.txt
@@ -2,22 +2,22 @@
 ### Do not edit

 set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
+set (PKGDATADIR "${DATADIR}/pamac-classic")
+set (GETTEXT_PACKAGE "pamac-classic")
+set (RELEASE_NAME "pamac-classic")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")

 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.3.5")
+set (VERSION "6.4.0")
 add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
-link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
+include_directories ( ${CMAKE_BINARY_DIR}/src )
+link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
+link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
 find_package (Vala REQUIRED)
 include (ValaVersion)
 ensure_vala_version ("0.38" MINIMUM)
@@ -36,16 +36,18 @@ set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
 set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
 set (APP_SOURCES ${APP_SOURCES} user_daemon.vala)

-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
-if (NOT DISABLE_AUR)
-	set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi)
-endif ()
+set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)

 if (DISABLE_AUR)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
 endif ()
+if (ENABLE_UPDATE_ICON)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
+endif ()
 if (KDE_TRAY)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -69,10 +71,7 @@ OPTIONS
 )

 add_executable(pamac-user-daemon ${VALA_C})
-set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} Pamac )
-if (NOT DISABLE_AUR)
-	set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} AUR )
-endif ()
+set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} pamacclassic )
 add_dependencies( pamac-user-daemon ${pamac-user-daemon_DEPENDENCIES} )


@@ -93,6 +92,6 @@ if(HAVE_VALADOC)
 	install(DIRECTORY
 		${CMAKE_BINARY_DIR}/valadoc
 	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
 	)
 endif()
--- a/src/pamac-user-daemon/meson.build
+++ b/src/pamac-user-daemon/meson.build
@@ -1,13 +1,13 @@
 cfg_pamac_user_daemon = configuration_data()
 cfg_pamac_user_daemon.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac')
-cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac')
+cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
+cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac-classic')
+cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac-classic')
 cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
-cfg_pamac_user_daemon.set('VERSION', '6.3.5')
+cfg_pamac_user_daemon.set('VERSION', '6.4.0')
 cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())

-cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)
+cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)

 pamac_user_daemon_deps = [gtk_3_0_dep]
 pamac_user_daemon_deps += [json_glib_1_0_dep]
@@ -16,26 +16,26 @@ pamac_user_daemon_deps += [libsoup_2_4_dep]
 pamac_user_daemon_deps += [gio_2_0_dep]
 pamac_user_daemon_deps += [glib_2_0_dep]
 pamac_user_daemon_deps += [gobject_2_0_dep]
-pamac_user_daemon_sources = [cfgfile_3]
+pamac_user_daemon_sources = [cfgfile_2]
 pamac_user_daemon_sources += ['alpm_config.vala']
 pamac_user_daemon_sources += ['user_daemon.vala']
 pamac_user_daemon_vala_args = ['--pkg','posix']
 pamac_user_daemon_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_user_daemon_dependencies = [Pamac_library]
-if not DISABLE_AUR
-pamac_user_daemon_dependencies += [AUR_library]
-endif
+pamac_user_daemon_dependencies = [pamacclassic_library]
 pamac_user_daemon_c_args = []
 if DISABLE_AUR
  pamac_user_daemon_vala_args += ['-D', 'DISABLE_AUR']
  pamac_user_daemon_c_args += ['-DDISABLE_AUR']
 endif
+if ENABLE_UPDATE_ICON
+  pamac_user_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_user_daemon_c_args += ['-DENABLE_UPDATE_ICON']
+endif
 if KDE_TRAY
  pamac_user_daemon_vala_args += ['-D', 'KDE_TRAY']
  pamac_user_daemon_c_args += ['-DKDE_TRAY']
 endif
 pamac_user_daemon_hfolders = ['../../src']
-pamac_user_daemon_hfolders += ['../../src/aur']

 executable('pamac-user-daemon',pamac_user_daemon_sources,dependencies: pamac_user_daemon_deps,vala_args: pamac_user_daemon_vala_args,c_args: pamac_user_daemon_c_args,link_with: pamac_user_daemon_dependencies,include_directories: include_directories(pamac_user_daemon_hfolders),install: true)

--- a/src/pamacclassic.deps
+++ b/src/pamacclassic.deps
@@ -1,8 +1,10 @@
 posix
 gdk-3.0
 gtk+-3.0
+json-glib-1.0
 libalpm
 libnotify
+libsoup-2.4
 vte-2.91
 gio-2.0
 glib-2.0
--- a/src/pamacclassic.pc
+++ b/src/pamacclassic.pc
@@ -4,9 +4,9 @@ exec_prefix=@DOLLAR@{prefix}
 libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR}
 includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}

-Name: AUR
-Description: AUR
-Version: 6.3.5
-Libs: -L@DOLLAR@{libdir} -lAUR
+Name: pamacclassic
+Description: pamacclassic
+Version: 6.4.0
+Libs: -L@DOLLAR@{libdir} -lpamacclassic
 Cflags: -I@DOLLAR@{includedir}
-Requires: json-glib-1.0 libsoup-2.4 glib-2.0
+Requires: gdk-3.0 gtk+-3.0 json-glib-1.0 libalpm libnotify libsoup-2.4 vte-2.91 gio-2.0 glib-2.0 gobject-2.0
Author	SHA1	Message	Date
Chris Cromer	9b5ed117bc	prepare new release	2017-10-29 17:33:48 -03:00
Chris Cromer	3394c6d387	update with autovala 1.1.3	2017-10-29 17:32:20 -03:00
Chris Cromer	4f8f6e3637	change project number in pamac.pot	2017-10-29 17:27:45 -03:00
Chris Cromer	9623ed0c3f	change the pamac library to pamacclassic	2017-10-29 17:23:58 -03:00
Chris Cromer	68b6d219bf	update with new autovala fixes	2017-10-29 15:18:24 -03:00
Chris Cromer	282043e753	add build option to enable/install update desktop entry	2017-10-29 14:28:26 -03:00
Chris Cromer	47d7184638	update build with new autovala	2017-10-29 12:14:28 -03:00