Merge lp:~jbicha/ubuntu-terminal-app/fix-binary-name-conflict into lp:ubuntu-terminal-app

[Jeremy Bícha]

/usr/bin/terminal is too generic of a name and it turns out something else in Ubuntu already ships that file.

Unmerged revisions

359. By Jeremy Bícha on 2017-04-03

rename binary from too-generic 'terminal' (LP: #1651161)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-25 15:20:00 +0000
+++ CMakeLists.txt	2017-04-03 20:56:36 +0000
@@ -15,7 +15,7 @@
 option(INSTALL_TESTS "Install the tests on make install" on)
 option(CLICK_MODE "Installs to a contained location" on)
 
-set(APP_NAME terminal)
+set(APP_NAME ubuntu-terminal-app)
 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
 set(APP_HARDCODE ubuntu-terminal-app)
 set(MAIN_QML ubuntu-terminal-app.qml)
@@ -71,7 +71,7 @@
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
     set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/terminal.1 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-terminal-app.1 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
 
=== modified file 'manifest.json.in'
--- manifest.json.in	2017-01-25 15:20:00 +0000
+++ manifest.json.in	2017-04-03 20:56:36 +0000
@@ -5,7 +5,7 @@
     "hooks": {
         "terminal": {
             "apparmor": "terminal.apparmor",
-            "desktop": "ubuntu-terminal-app.desktop"
+            "desktop": "com.ubuntu.terminal.desktop"
         }
     },
     "icon": "terminal64.png",
 
=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2016-12-09 13:21:01 +0000
+++ src/app/CMakeLists.txt	2017-04-03 20:56:36 +0000
@@ -9,10 +9,10 @@
     ${QML_SRCS}
 )
 
-add_executable(terminal ${terminal_SRCS})
+add_executable(ubuntu-terminal-app ${terminal_SRCS})
 
-qt5_use_modules(terminal Gui Qml Quick Widgets)
-target_link_libraries(terminal stdc++)
+qt5_use_modules(ubuntu-terminal-app Gui Qml Quick Widgets)
+target_link_libraries(ubuntu-terminal-app stdc++)
 
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 add_custom_target(terminal-qmlfiles ALL
@@ -23,7 +23,7 @@
 
 install(DIRECTORY qml DESTINATION ${DATA_DIR})
 if(CLICK_MODE)
-  install(TARGETS terminal DESTINATION ${BIN_DIR})
+  install(TARGETS ubuntu-terminal-app DESTINATION ${BIN_DIR})
 else()
-  install(TARGETS terminal RUNTIME DESTINATION bin)
+  install(TARGETS ubuntu-terminal-app RUNTIME DESTINATION bin)
 endif()
 
=== renamed file 'terminal.1' => 'ubuntu-terminal-app.1'
--- terminal.1	2016-09-16 03:01:32 +0000
+++ ubuntu-terminal-app.1	2017-04-03 20:56:36 +0000
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH TERMINAL 1 "September 16, 2016"
+.TH UBUNTU-TERMINAL-APP 1 "September 16, 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,16 +16,16 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-terminal \- is a terminal emulation application.
+ubuntu-terminal-app \- is a terminal emulation application.
 .SH SYNOPSIS
 .sp
 .nf
-\fIterminal\fR [\-p|\-\-phone] [\-\-workdir <dir>]
+\fIubuntu-terminal-app\fR [\-p|\-\-phone] [\-\-workdir <dir>]
     [\-\-forceAuth <true/false>] [\-t|\-\-tablet] [\-h|\-\-help] [\-I <path>]
 .nf
 .sp
 .SH DESCRIPTION
-.B terminal
+.B ubuntu-terminal-app
 is a terminal emulation application that you can use to access a unix shell.
 .SH OPTIONS
 .TP
@@ -50,7 +50,7 @@
 .B \-\-workdir <dir>
 Change working directory to 'dir'
 .SH AUTHOR
-Terminal was written by Filippo Scognamiglio <[e-mail]>. The webpage for this package can be found at
-http://launchpad.net/ubuntu-terminal-app
+ubuntu-terminal-app was written by Filippo Scognamiglio <[e-mail]>. The webpage for this package can be found at
+https://launchpad.net/ubuntu-terminal-app
 .PP
 This manual page was written by Luke Yelavich <[e-mail]>, for the Ubuntu project (but may be used by others).