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

Proposed by Jeremy Bicha
Status: Needs review
Proposed branch: lp:~jbicha/ubuntu-terminal-app/fix-binary-name-conflict
Merge into: lp:ubuntu-terminal-app
Diff against target: 105 lines (+14/-14)
4 files modified
CMakeLists.txt (+2/-2)
manifest.json.in (+1/-1)
src/app/CMakeLists.txt (+5/-5)
ubuntu-terminal-app.1 (+6/-6)
To merge this branch: bzr merge lp:~jbicha/ubuntu-terminal-app/fix-binary-name-conflict
Reviewer Review Type Date Requested Status
Ubuntu Terminal Developers Pending
Review via email: mp+321786@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Unmerged revisions

359. By Jeremy Bicha

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-01-25 15:20:00 +0000
3+++ CMakeLists.txt 2017-04-03 20:56:36 +0000
4@@ -15,7 +15,7 @@
5 option(INSTALL_TESTS "Install the tests on make install" on)
6 option(CLICK_MODE "Installs to a contained location" on)
7
8-set(APP_NAME terminal)
9+set(APP_NAME ubuntu-terminal-app)
10 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
11 set(APP_HARDCODE ubuntu-terminal-app)
12 set(MAIN_QML ubuntu-terminal-app.qml)
13@@ -71,7 +71,7 @@
14 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
15 set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
16 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
17- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/terminal.1 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
18+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-terminal-app.1 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
19 endif(CLICK_MODE)
20
21 file(GLOB_RECURSE I18N_SRC_FILES
22
23=== modified file 'manifest.json.in'
24--- manifest.json.in 2017-01-25 15:20:00 +0000
25+++ manifest.json.in 2017-04-03 20:56:36 +0000
26@@ -5,7 +5,7 @@
27 "hooks": {
28 "terminal": {
29 "apparmor": "terminal.apparmor",
30- "desktop": "ubuntu-terminal-app.desktop"
31+ "desktop": "com.ubuntu.terminal.desktop"
32 }
33 },
34 "icon": "terminal64.png",
35
36=== modified file 'src/app/CMakeLists.txt'
37--- src/app/CMakeLists.txt 2016-12-09 13:21:01 +0000
38+++ src/app/CMakeLists.txt 2017-04-03 20:56:36 +0000
39@@ -9,10 +9,10 @@
40 ${QML_SRCS}
41 )
42
43-add_executable(terminal ${terminal_SRCS})
44+add_executable(ubuntu-terminal-app ${terminal_SRCS})
45
46-qt5_use_modules(terminal Gui Qml Quick Widgets)
47-target_link_libraries(terminal stdc++)
48+qt5_use_modules(ubuntu-terminal-app Gui Qml Quick Widgets)
49+target_link_libraries(ubuntu-terminal-app stdc++)
50
51 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
52 add_custom_target(terminal-qmlfiles ALL
53@@ -23,7 +23,7 @@
54
55 install(DIRECTORY qml DESTINATION ${DATA_DIR})
56 if(CLICK_MODE)
57- install(TARGETS terminal DESTINATION ${BIN_DIR})
58+ install(TARGETS ubuntu-terminal-app DESTINATION ${BIN_DIR})
59 else()
60- install(TARGETS terminal RUNTIME DESTINATION bin)
61+ install(TARGETS ubuntu-terminal-app RUNTIME DESTINATION bin)
62 endif()
63
64=== renamed file 'terminal.1' => 'ubuntu-terminal-app.1'
65--- terminal.1 2016-09-16 03:01:32 +0000
66+++ ubuntu-terminal-app.1 2017-04-03 20:56:36 +0000
67@@ -2,7 +2,7 @@
68 .\" First parameter, NAME, should be all caps
69 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
70 .\" other parameters are allowed: see man(7), man(1)
71-.TH TERMINAL 1 "September 16, 2016"
72+.TH UBUNTU-TERMINAL-APP 1 "September 16, 2016"
73 .\" Please adjust this date whenever revising the manpage.
74 .\"
75 .\" Some roff macros, for reference:
76@@ -16,16 +16,16 @@
77 .\" .sp <n> insert n+1 empty lines
78 .\" for manpage-specific macros, see man(7)
79 .SH NAME
80-terminal \- is a terminal emulation application.
81+ubuntu-terminal-app \- is a terminal emulation application.
82 .SH SYNOPSIS
83 .sp
84 .nf
85-\fIterminal\fR [\-p|\-\-phone] [\-\-workdir <dir>]
86+\fIubuntu-terminal-app\fR [\-p|\-\-phone] [\-\-workdir <dir>]
87 [\-\-forceAuth <true/false>] [\-t|\-\-tablet] [\-h|\-\-help] [\-I <path>]
88 .nf
89 .sp
90 .SH DESCRIPTION
91-.B terminal
92+.B ubuntu-terminal-app
93 is a terminal emulation application that you can use to access a unix shell.
94 .SH OPTIONS
95 .TP
96@@ -50,7 +50,7 @@
97 .B \-\-workdir <dir>
98 Change working directory to 'dir'
99 .SH AUTHOR
100-Terminal was written by Filippo Scognamiglio <flscogna@gmail.com>. The webpage for this package can be found at
101-http://launchpad.net/ubuntu-terminal-app
102+ubuntu-terminal-app was written by Filippo Scognamiglio <flscogna@gmail.com>. The webpage for this package can be found at
103+https://launchpad.net/ubuntu-terminal-app
104 .PP
105 This manual page was written by Luke Yelavich <themuso@ubuntu.com>, for the Ubuntu project (but may be used by others).

Subscribers

People subscribed via source and target branches