diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2018-11-15 22:39:45 -0600 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2018-11-15 22:39:45 -0600 |
| commit | 9e7afb6baec4254cc53cd6dd107b71d848e829d9 (patch) | |
| tree | 2b4543a2838d363c4a63512748da2c99aa1bac89 | |
| parent | 68496cf1537f60cb665c5659b17166596cf604a8 (diff) | |
| download | pidgin-9e7afb6baec4254cc53cd6dd107b71d848e829d9.tar.gz | |
First pass at making pidgin3 not clobber pidgin2
| -rw-r--r-- | doc/finch3.1.in (renamed from doc/finch.1.in) | 0 | ||||
| -rw-r--r-- | doc/meson.build | 8 | ||||
| -rw-r--r-- | doc/pidgin3.1.in (renamed from doc/pidgin.1.in) | 0 | ||||
| -rw-r--r-- | finch/meson.build | 6 | ||||
| -rw-r--r-- | pidgin/data/im.pidgin.Pidgin.desktop.in.in | 4 | ||||
| -rw-r--r-- | pidgin/meson.build | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/doc/finch.1.in b/doc/finch3.1.in index 6f6def0fa1..6f6def0fa1 100644 --- a/doc/finch.1.in +++ b/doc/finch3.1.in diff --git a/doc/meson.build b/doc/meson.build index d44dbec9f6..592fe8e924 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -4,8 +4,8 @@ endif if ENABLE_GTK pidgin_man = configure_file( - input : 'pidgin.1.in', - output : 'pidgin.1', + input : 'pidgin3.1.in', + output : 'pidgin3.1', configuration : man_conf, install : true, install_dir : get_option('mandir') + '/man1') @@ -13,8 +13,8 @@ endif if enable_consoleui finch_man = configure_file( - input : 'finch.1.in', - output : 'finch.1', + input : 'finch3.1.in', + output : 'finch3.1', configuration : man_conf, install : true, install_dir : get_option('mandir') + '/man1') diff --git a/doc/pidgin.1.in b/doc/pidgin3.1.in index 64b5d852ed..64b5d852ed 100644 --- a/doc/pidgin.1.in +++ b/doc/pidgin3.1.in diff --git a/finch/meson.build b/finch/meson.build index 0ac2f6e5da..1d3eb921e4 100644 --- a/finch/meson.build +++ b/finch/meson.build @@ -160,7 +160,7 @@ if IS_WIN32 endif if enable_consoleui - install_headers(libfinch_headers, subdir : 'finch') + install_headers(libfinch_headers, subdir : 'finch-3') libfinch_inc = include_directories('.') libfinch = shared_library('finch', @@ -185,8 +185,8 @@ if enable_consoleui name : 'Finch', description : 'Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI.', version : meson.project_version(), - filebase : 'finch', - subdirs : 'finch', + filebase : 'finch-3', + subdirs : 'finch-3', libraries : [libfinch], requires : ['gnt', 'purple-3']) diff --git a/pidgin/data/im.pidgin.Pidgin.desktop.in.in b/pidgin/data/im.pidgin.Pidgin.desktop.in.in index 450fbe0512..7bc5ef7f00 100644 --- a/pidgin/data/im.pidgin.Pidgin.desktop.in.in +++ b/pidgin/data/im.pidgin.Pidgin.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Pidgin +Name=Pidgin 3 GenericName=Internet Messenger Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, and more -Exec=pidgin %U +Exec=pidgin3 %U Icon=pidgin StartupNotify=true Terminal=false diff --git a/pidgin/meson.build b/pidgin/meson.build index a40e28cb87..cd98eee6d9 100644 --- a/pidgin/meson.build +++ b/pidgin/meson.build @@ -149,7 +149,7 @@ if ENABLE_GTK ) endif - install_headers(libpidgin_headers, subdir : 'pidgin') + install_headers(libpidgin_headers, subdir : 'pidgin-3') libpidgin_inc = include_directories('.') libpidgin = shared_library('pidgin', @@ -176,7 +176,7 @@ if ENABLE_GTK link_with : libpidgin, dependencies : [webkit, gtk, glib, math]) - pidgin = executable('pidgin', + pidgin = executable('pidgin3', pidgin_SOURCES, include_directories : toplevel_inc, dependencies : IS_WIN32 ? [] : [libpurple_dep, libpidgin_dep], @@ -193,7 +193,7 @@ if ENABLE_GTK description : 'Pidgin is a GTK3-based instant messenger application.', version : meson.project_version(), filebase : 'pidgin-3', - subdirs : 'pidgin', + subdirs : 'pidgin-3', libraries : [libpidgin], requires : ['gtk+-3.0', 'webkitgtk-3.0', 'purple-3'], variables : ['plugindir=${libdir}/pidgin']) |