From bfcd2a9471f5cb5e8d87d3be2acac150ef25fc02 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 16 Nov 2017 21:43:51 -0300 Subject: [PATCH] update for languages --- CMakeLists.txt | 2 +- data/pixmaps/CMakeLists.txt | 2 +- meson.build | 6 +++--- pamac.avprj | 18 +++++++++--------- po/CMakeLists.txt | 4 ++-- po/meson.build | 2 +- po/pamac.pot | 2 +- src/CMakeLists.txt | 14 +++++++------- src/meson.build | 12 ++++++------ src/pamac-clean-cache/CMakeLists.txt | 12 ++++++------ src/pamac-clean-cache/meson.build | 8 ++++---- src/pamac-install/CMakeLists.txt | 12 ++++++------ src/pamac-install/meson.build | 8 ++++---- src/pamac-manager/CMakeLists.txt | 12 ++++++------ src/pamac-manager/meson.build | 8 ++++---- src/pamac-system-daemon/CMakeLists.txt | 12 ++++++------ src/pamac-system-daemon/meson.build | 8 ++++---- src/pamac-tray/CMakeLists.txt | 12 ++++++------ src/pamac-tray/meson.build | 8 ++++---- src/pamac-user-daemon/CMakeLists.txt | 12 ++++++------ src/pamac-user-daemon/meson.build | 8 ++++---- src/pamacclassic.pc | 2 +- 22 files changed, 92 insertions(+), 92 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23fa7e0..0067b45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ### CMakeLists automatically created with AutoVala ### Do not edit -project (pamac-classic) +project (pamac) cmake_minimum_required (VERSION 2.6) cmake_policy (VERSION 2.8) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt index 4a47739..1abdbcb 100644 --- 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-classic/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) diff --git a/meson.build b/meson.build index b7125af..9a30b5b 100644 --- a/meson.build +++ b/meson.build @@ -1,11 +1,11 @@ -project('pamac-classic',['c','vala']) +project('pamac',['c','vala']) ENABLE_UPDATE_ICON = (get_option('ENABLE_UPDATE_ICON') != '') ENABLE_HAMBURGER = (get_option('ENABLE_HAMBURGER') != '') KDE_TRAY = (get_option('KDE_TRAY') != '') DISABLE_AUR = (get_option('DISABLE_AUR') != '') -add_global_arguments('-DGETTEXT_PACKAGE="pamac-classic"',language: 'c') +add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c') gdk_3_0_dep = dependency('gdk-3.0') gtk_3_0_dep = dependency('gtk+-3.0') @@ -81,7 +81,7 @@ install_data('data/icons/16x16/apps/system-software-install.png',install_dir: jo 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-classic')) +install_data('data/pixmaps/package-generic.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) install_data( 'data/polkit/org.pamac.policy',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'polkit-1','actions')) install_data( 'data/mime/x-alpm-package.xml',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'mime','packages')) subdir('src') diff --git a/pamac.avprj b/pamac.avprj index 691971f..0be50a4 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -1,7 +1,7 @@ ### AutoVala Project ### autovala_version: 27 -project_name: pamac-classic -project_version: 6.6.2 +project_name: pamac +project_version: 6.6.3 vala_version: 0.38 custom: data/systemd/pamac-system.service /usr/lib/systemd/system @@ -22,7 +22,7 @@ define: KDE_TRAY vapidir: src/vapis vala_binary: src/pamac-clean-cache/pamac-clean-cache -*version: 6.6.2 +*version: 6.6.3 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -33,7 +33,7 @@ vala_check_package: json-glib-1.0 *vala_source: pamac_config.vala vala_binary: src/pamac-install/pamac-install -*version: 6.6.2 +*version: 6.6.3 use_gresource: pamac_installer_gresource_xml vala_local_package: pamacclassic vala_check_package: gtk+-3.0 @@ -45,7 +45,7 @@ vala_check_package: json-glib-1.0 *vala_source: progress_dialog.vala vala_binary: src/pamac-manager/pamac-manager -*version: 6.6.2 +*version: 6.6.3 alias: pamac-updater use_gresource: pamac_manager_gresource_xml vala_local_package: pamacclassic @@ -59,7 +59,7 @@ vala_check_package: json-glib-1.0 *vala_source: manager_window.vala vala_binary: src/pamac-system-daemon/pamac-system-daemon -*version: 6.6.2 +*version: 6.6.3 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -77,7 +77,7 @@ vala_check_package: polkit-gobject-1 *vala_source: system_daemon.vala vala_binary: src/pamac-tray/pamac-tray -*version: 6.6.2 +*version: 6.6.3 vala_local_package: pamacclassic vala_package: posix vala_check_package: json-glib-1.0 @@ -101,7 +101,7 @@ end *vala_source: tray.vala vala_binary: src/pamac-user-daemon/pamac-user-daemon -*version: 6.6.2 +*version: 6.6.3 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -117,7 +117,7 @@ vala_check_package: libsoup-2.4 vala_library: src/pamac-classic -*version: 6.6.2 +*version: 6.6.3 namespace: pamacclassic use_gresource: pamac_transaction_gresource_xml vala_package: posix diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index f4b8d38..2774aca 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -2,5 +2,5 @@ ### Do not edit include (Translations) -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 ) +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 ../data/interface ) diff --git a/po/meson.build b/po/meson.build index 2a80044..3fe769a 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,2 +1,2 @@ i18n = import('i18n') -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']) +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']) diff --git a/po/pamac.pot b/po/pamac.pot index 8500f1b..1e5b2e7 100644 --- 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-11-11 23:04-0300\n" +"POT-Creation-Date: 2017-11-16 21:42-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bbafaa..a3408bd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,12 +2,12 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac-classic") -set (GETTEXT_PACKAGE "pamac-classic") -set (RELEASE_NAME "pamac-classic") +set (PKGDATADIR "${DATADIR}/pamac") +set (GETTEXT_PACKAGE "pamac") +set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.2") +set (VERSION "6.6.3") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") @@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") 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.6.2") +set (VERSION "6.6.3") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) link_directories ( ${DEPS_LIBRARY_DIRS} ) @@ -101,7 +101,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} ) target_link_libraries( pamacclassic m ) set_target_properties( pamacclassic PROPERTIES VERSION - 6.6.2 + 6.6.3 SOVERSION 6 ) @@ -148,7 +148,7 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() diff --git a/src/meson.build b/src/meson.build index d8c9807..09dbdb4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,10 +1,10 @@ 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('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac')) +cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac') +cfg_pamac_classic.set('RELEASE_NAME', 'pamac') cfg_pamac_classic.set('PREFIX', get_option('prefix')) -cfg_pamac_classic.set('VERSION', '6.6.2') +cfg_pamac_classic.set('VERSION', '6.6.3') cfg_pamac_classic.set('TESTSRCDIR', meson.source_root()) cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic) @@ -59,7 +59,7 @@ pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : fals pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir'] -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.6.2',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.6.3',soversion: '6',install: true) pamac_classic_requires = [] pamac_classic_requires += ['gdk-3.0'] @@ -74,7 +74,7 @@ pamac_classic_requires += ['glib-2.0'] pamac_classic_requires += ['gobject-2.0'] pkg_mod = import('pkgconfig') pkg_mod.generate(libraries : pamacclassic_library, - version : '6.6.2', + version : '6.6.3', name : 'pamacclassic', filebase : 'pamacclassic', description : 'pamacclassic', diff --git a/src/pamac-clean-cache/CMakeLists.txt b/src/pamac-clean-cache/CMakeLists.txt index 10e223d..8a2a347 100644 --- a/src/pamac-clean-cache/CMakeLists.txt +++ b/src/pamac-clean-cache/CMakeLists.txt @@ -2,18 +2,18 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac-classic") -set (GETTEXT_PACKAGE "pamac-classic") -set (RELEASE_NAME "pamac-classic") +set (PKGDATADIR "${DATADIR}/pamac") +set (GETTEXT_PACKAGE "pamac") +set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.2") +set (VERSION "6.6.3") 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.6.2") +set (VERSION "6.6.3") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) @@ -94,6 +94,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() diff --git a/src/pamac-clean-cache/meson.build b/src/pamac-clean-cache/meson.build index 3d463bb..5aa1061 100644 --- a/src/pamac-clean-cache/meson.build +++ b/src/pamac-clean-cache/meson.build @@ -1,10 +1,10 @@ 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-classic')) -cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac-classic') -cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac-classic') +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('PREFIX', get_option('prefix')) -cfg_pamac_clean_cache.set('VERSION', '6.6.2') +cfg_pamac_clean_cache.set('VERSION', '6.6.3') cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root()) cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache) diff --git a/src/pamac-install/CMakeLists.txt b/src/pamac-install/CMakeLists.txt index 9d3a53f..4bf3181 100644 --- a/src/pamac-install/CMakeLists.txt +++ b/src/pamac-install/CMakeLists.txt @@ -2,18 +2,18 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac-classic") -set (GETTEXT_PACKAGE "pamac-classic") -set (RELEASE_NAME "pamac-classic") +set (PKGDATADIR "${DATADIR}/pamac") +set (GETTEXT_PACKAGE "pamac") +set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.2") +set (VERSION "6.6.3") 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.6.2") +set (VERSION "6.6.3") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) @@ -97,6 +97,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() diff --git a/src/pamac-install/meson.build b/src/pamac-install/meson.build index c5dcf1b..505c1da 100644 --- a/src/pamac-install/meson.build +++ b/src/pamac-install/meson.build @@ -1,10 +1,10 @@ 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-classic')) -cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac-classic') -cfg_pamac_install.set('RELEASE_NAME', 'pamac-classic') +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('PREFIX', get_option('prefix')) -cfg_pamac_install.set('VERSION', '6.6.2') +cfg_pamac_install.set('VERSION', '6.6.3') cfg_pamac_install.set('TESTSRCDIR', meson.source_root()) cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install) diff --git a/src/pamac-manager/CMakeLists.txt b/src/pamac-manager/CMakeLists.txt index 4f2afd5..dc146e0 100644 --- a/src/pamac-manager/CMakeLists.txt +++ b/src/pamac-manager/CMakeLists.txt @@ -2,18 +2,18 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac-classic") -set (GETTEXT_PACKAGE "pamac-classic") -set (RELEASE_NAME "pamac-classic") +set (PKGDATADIR "${DATADIR}/pamac") +set (GETTEXT_PACKAGE "pamac") +set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.2") +set (VERSION "6.6.3") 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.6.2") +set (VERSION "6.6.3") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) @@ -104,6 +104,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() diff --git a/src/pamac-manager/meson.build b/src/pamac-manager/meson.build index 5bc48ff..e5293a9 100644 --- a/src/pamac-manager/meson.build +++ b/src/pamac-manager/meson.build @@ -1,10 +1,10 @@ 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-classic')) -cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac-classic') -cfg_pamac_manager.set('RELEASE_NAME', 'pamac-classic') +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('PREFIX', get_option('prefix')) -cfg_pamac_manager.set('VERSION', '6.6.2') +cfg_pamac_manager.set('VERSION', '6.6.3') cfg_pamac_manager.set('TESTSRCDIR', meson.source_root()) cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager) diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt index 95ec5cf..9eee140 100644 --- a/src/pamac-system-daemon/CMakeLists.txt +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -2,18 +2,18 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac-classic") -set (GETTEXT_PACKAGE "pamac-classic") -set (RELEASE_NAME "pamac-classic") +set (PKGDATADIR "${DATADIR}/pamac") +set (GETTEXT_PACKAGE "pamac") +set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.2") +set (VERSION "6.6.3") 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.6.2") +set (VERSION "6.6.3") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) @@ -101,6 +101,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() diff --git a/src/pamac-system-daemon/meson.build b/src/pamac-system-daemon/meson.build index 1ca796e..27545e3 100644 --- a/src/pamac-system-daemon/meson.build +++ b/src/pamac-system-daemon/meson.build @@ -1,10 +1,10 @@ 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-classic')) -cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac-classic') -cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac-classic') +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('PREFIX', get_option('prefix')) -cfg_pamac_system_daemon.set('VERSION', '6.6.2') +cfg_pamac_system_daemon.set('VERSION', '6.6.3') cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon) diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt index caf20f9..ac566bf 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -2,18 +2,18 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac-classic") -set (GETTEXT_PACKAGE "pamac-classic") -set (RELEASE_NAME "pamac-classic") +set (PKGDATADIR "${DATADIR}/pamac") +set (GETTEXT_PACKAGE "pamac") +set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.2") +set (VERSION "6.6.3") 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.6.2") +set (VERSION "6.6.3") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) @@ -107,6 +107,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() diff --git a/src/pamac-tray/meson.build b/src/pamac-tray/meson.build index c022040..1c220aa 100644 --- a/src/pamac-tray/meson.build +++ b/src/pamac-tray/meson.build @@ -1,10 +1,10 @@ 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-classic')) -cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac-classic') -cfg_pamac_tray.set('RELEASE_NAME', 'pamac-classic') +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('PREFIX', get_option('prefix')) -cfg_pamac_tray.set('VERSION', '6.6.2') +cfg_pamac_tray.set('VERSION', '6.6.3') cfg_pamac_tray.set('TESTSRCDIR', meson.source_root()) cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray) diff --git a/src/pamac-user-daemon/CMakeLists.txt b/src/pamac-user-daemon/CMakeLists.txt index d332ae5..d2d256c 100644 --- a/src/pamac-user-daemon/CMakeLists.txt +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -2,18 +2,18 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac-classic") -set (GETTEXT_PACKAGE "pamac-classic") -set (RELEASE_NAME "pamac-classic") +set (PKGDATADIR "${DATADIR}/pamac") +set (GETTEXT_PACKAGE "pamac") +set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.2") +set (VERSION "6.6.3") 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.6.2") +set (VERSION "6.6.3") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) @@ -98,6 +98,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac ) endif() diff --git a/src/pamac-user-daemon/meson.build b/src/pamac-user-daemon/meson.build index 9e6d024..4aa73e1 100644 --- a/src/pamac-user-daemon/meson.build +++ b/src/pamac-user-daemon/meson.build @@ -1,10 +1,10 @@ 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-classic')) -cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac-classic') -cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac-classic') +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('PREFIX', get_option('prefix')) -cfg_pamac_user_daemon.set('VERSION', '6.6.2') +cfg_pamac_user_daemon.set('VERSION', '6.6.3') cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon) diff --git a/src/pamacclassic.pc b/src/pamacclassic.pc index 34f0660..5765410 100644 --- a/src/pamacclassic.pc +++ b/src/pamacclassic.pc @@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR} Name: pamacclassic Description: pamacclassic -Version: 6.6.2 +Version: 6.6.3 Libs: -L@DOLLAR@{libdir} -lpamacclassic Cflags: -I@DOLLAR@{includedir} 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