Merge lp:~morphis/aethercast/name-conversion into lp:aethercast

Proposed by Simon Fels on 2015-12-10
Status: Merged
Approved by: Simon Fels on 2015-12-10
Approved revision: 113
Merged at revision: 114
Proposed branch: lp:~morphis/aethercast/name-conversion
Merge into: lp:aethercast
Diff against target: 252 lines (+43/-45)
13 files modified
CMakeLists.txt (+1/-1)
README.md (+6/-9)
conf/CMakeLists.txt (+3/-3)
conf/aethercast.conf.in (+2/-2)
debian/changelog (+1/-1)
debian/control (+9/-8)
debian/copyright (+2/-2)
src/CMakeLists.txt (+7/-7)
src/client/CMakeLists.txt (+3/-3)
tests/CMakeLists.txt (+2/-2)
tests/mcs/CMakeLists.txt (+1/-1)
tests/mcs/acceptance_tests/CMakeLists.txt (+3/-3)
tests/wpa/CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp:~morphis/aethercast/name-conversion
Reviewer Review Type Date Requested Status
Thomas Voß 2015-12-10 Pending
Simon Fels Pending
Review via email: mp+280110@code.launchpad.net

Commit Message

Rename to aethercast (not touch the source yet)

To post a comment you must log in.
113. By Simon Fels on 2015-12-10

Also switch configuration files to aethercast

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 2015-12-07 16:02:43 +0000
3+++ CMakeLists.txt 2015-12-10 10:18:13 +0000
4@@ -1,4 +1,4 @@
5-project(miracast-service C CXX)
6+project(aethercast C CXX)
7 cmake_minimum_required(VERSION 2.8.9)
8
9 include(CTest)
10
11=== modified file 'README.md'
12--- README.md 2015-11-19 12:09:28 +0000
13+++ README.md 2015-12-10 10:18:13 +0000
14@@ -1,10 +1,7 @@
15-miracast-service
16-================
17+aethercast
18+==========
19
20-This is a service using the wds project (https://github.com/01org/wds) to
21-implement a service management layer for Miracast / WiFi Display. It is
22-build agnostic to the actual network management layer so it can use
23-whatever the system it runs in provides. This could be wpa-supplicant,
24-NetworkManager or connman. Its purpose is to provide a common DBus API
25-the UI layer can use to provide screen sharing functionality based on
26-the Miracast streaming protocol.
27+This is a remote display management service. Its used to connect remote
28+display over technologies like Miracast or similar. It approaches a
29+generic abstraction layer which takes remote displays independent of
30+their technology and collects them all under a common DBus API.
31
32=== modified file 'conf/CMakeLists.txt'
33--- conf/CMakeLists.txt 2015-12-01 07:23:13 +0000
34+++ conf/CMakeLists.txt 2015-12-10 10:18:13 +0000
35@@ -1,7 +1,7 @@
36-configure_file(miracast-service.conf.in miracast-service.conf @ONLY)
37+configure_file(aethercast.conf.in aethercast.conf @ONLY)
38
39-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miracast-service.conf
40+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/aethercast.conf
41 DESTINATION /etc/init/)
42
43-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/miracast-service-dbus.conf
44+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/aethercast-dbus.conf
45 DESTINATION /etc/dbus-1/system.d/)
46
47=== renamed file 'conf/miracast-service-dbus.conf' => 'conf/aethercast-dbus.conf'
48=== renamed file 'conf/miracast-service.conf.in' => 'conf/aethercast.conf.in'
49--- conf/miracast-service.conf.in 2015-12-01 07:23:13 +0000
50+++ conf/aethercast.conf.in 2015-12-10 10:18:13 +0000
51@@ -1,8 +1,8 @@
52-description "Miracast Management Service"
53+description "Display cast service"
54
55 start on started dbus
56 stop on stopping dbus
57
58 respawn
59
60-exec /usr/sbin/miracast-service
61+exec /usr/sbin/aethercast
62
63=== modified file 'debian/changelog'
64--- debian/changelog 2015-11-27 14:56:20 +0000
65+++ debian/changelog 2015-12-10 10:18:13 +0000
66@@ -1,4 +1,4 @@
67-miracast-service (0.1-0ubuntu1) vivid; urgency=medium
68+aethercast (0.1-0ubuntu1) vivid; urgency=medium
69
70 * Initial release.
71
72
73=== modified file 'debian/control'
74--- debian/control 2015-12-07 16:03:09 +0000
75+++ debian/control 2015-12-10 10:18:13 +0000
76@@ -1,4 +1,4 @@
77-Source: miracast-service
78+Source: aethercast
79 Section: utils
80 Priority: optional
81 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
82@@ -21,17 +21,18 @@
83 libreadline6-dev,
84 libwds-dev
85 Standards-Version: 3.9.4
86-Homepage: http://launchpad.net/miracast-service
87+Homepage: http://launchpad.net/aethercast
88 # If you aren't a member of ~phablet-team but need to upload packaging changes,
89 # just go ahead. ~phablet-team will notice and sync up the code again.
90-Vcs-Bzr: https://code.launchpad.net/miracast-service/trunk
91-Vcs-Browser: http://bazaar.launchpad.net/miracast-service/trunk/files
92+Vcs-Bzr: https://code.launchpad.net/aethercast/trunk
93+Vcs-Browser: http://bazaar.launchpad.net/aethercast/trunk/files
94
95-Package: miracast-service
96+Package: aethercast
97 Architecture: any
98 Depends: ${misc:Depends},
99 ${shlibs:Depends},
100 wpasupplicant
101-Description: Miracast screen sharing service
102- Implements a service which allows screen sharing of one device to
103- another over the Miracast / WiFi Display protocol.
104+Description: Display casting service
105+ A management service for remote displays which it can stream the
106+ current screen content to. It will support multiple approaches
107+ for this like Miracast.
108
109=== modified file 'debian/copyright'
110--- debian/copyright 2015-11-19 12:17:57 +0000
111+++ debian/copyright 2015-12-10 10:18:13 +0000
112@@ -1,6 +1,6 @@
113 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
114-Upstream-Name: miracast-service
115-Source: http://launchpad.net/miracast-service
116+Upstream-Name: aethercast
117+Source: http://launchpad.net/aethercast
118
119 Files: *
120 Copyright: 2015 Canonical Ltd.
121
122=== modified file 'src/CMakeLists.txt'
123--- src/CMakeLists.txt 2015-12-09 16:07:13 +0000
124+++ src/CMakeLists.txt 2015-12-10 10:18:13 +0000
125@@ -73,11 +73,11 @@
126 ${CMAKE_CURRENT_BINARY_DIR}/src
127 )
128
129-add_library(miracast ${SOURCES} ${HEADERS})
130-
131-add_executable(miracast-service mcs/main.cpp)
132-
133-target_link_libraries(miracast
134+add_library(aethercast-core ${SOURCES} ${HEADERS})
135+
136+add_executable(aethercast mcs/main.cpp)
137+
138+target_link_libraries(aethercast-core
139 ${Boost_LIBRARIES}
140 ${GLIB_LIBRARIES}
141 ${GIO_LIBRARIES}
142@@ -88,10 +88,10 @@
143 -ldl
144 )
145
146-target_link_libraries(miracast-service miracast)
147+target_link_libraries(aethercast aethercast-core)
148
149 install(
150- TARGETS miracast-service
151+ TARGETS aethercast
152 RUNTIME DESTINATION sbin
153 LIBRARY DESTINATION lib
154 ARCHIVE DESTINATION lib/static
155
156=== modified file 'src/client/CMakeLists.txt'
157--- src/client/CMakeLists.txt 2015-12-08 10:16:17 +0000
158+++ src/client/CMakeLists.txt 2015-12-10 10:18:13 +0000
159@@ -19,8 +19,8 @@
160 ${CMAKE_CURRENT_BINARY_DIR}/src
161 )
162
163-add_executable(miracastctl ${SOURCES})
164-target_link_libraries(miracastctl
165+add_executable(aethercastctl ${SOURCES})
166+target_link_libraries(aethercastctl
167 ${Boost_LIBRARIES}
168 ${GLIB_LIBRARIES}
169 ${GIO_LIBRARIES}
170@@ -30,6 +30,6 @@
171 )
172
173 install(
174- TARGETS miracastctl
175+ TARGETS aethercastctl
176 RUNTIME DESTINATION bin
177 )
178
179=== modified file 'tests/CMakeLists.txt'
180--- tests/CMakeLists.txt 2015-12-03 16:10:40 +0000
181+++ tests/CMakeLists.txt 2015-12-10 10:18:13 +0000
182@@ -13,11 +13,11 @@
183 add_subdirectory(3rd_party/process-cpp-minimal)
184
185 add_executable(utilities_tests utilities_tests.cpp)
186-target_link_libraries(utilities_tests miracast gtest gtest_main)
187+target_link_libraries(utilities_tests aethercast-core gtest gtest_main)
188 add_test(utilities_tests utilities_tests)
189
190 add_executable(scoped_gobject_tests scoped_gobject_tests.cpp)
191-target_link_libraries(scoped_gobject_tests miracast gtest gtest_main)
192+target_link_libraries(scoped_gobject_tests aethercast-core gtest gtest_main)
193 add_test(scoped_gobject_tests scoped_gobject_tests)
194
195 add_subdirectory(wpa)
196
197=== modified file 'tests/mcs/CMakeLists.txt'
198--- tests/mcs/CMakeLists.txt 2015-12-02 09:11:40 +0000
199+++ tests/mcs/CMakeLists.txt 2015-12-10 10:18:13 +0000
200@@ -11,7 +11,7 @@
201 )
202
203 add_executable(mediamanagerfactory_tests mediamanagerfactory_tests.cpp)
204-target_link_libraries(mediamanagerfactory_tests miracast gtest gtest_main)
205+target_link_libraries(mediamanagerfactory_tests aethercast-core gtest gtest_main)
206 add_test(mediamanagerfactory_tests mediamanagerfactory_tests)
207
208 add_subdirectory(acceptance_tests)
209
210=== modified file 'tests/mcs/acceptance_tests/CMakeLists.txt'
211--- tests/mcs/acceptance_tests/CMakeLists.txt 2015-12-03 20:47:44 +0000
212+++ tests/mcs/acceptance_tests/CMakeLists.txt 2015-12-10 10:18:13 +0000
213@@ -1,5 +1,5 @@
214 include_directories(${CMAKE_SOURCE_DIR}/tests/3rd_party/process-cpp-minimal/include)
215
216-add_executable(miracast_service_tests miracast_service_tests.cpp did_exit_cleanly.cpp)
217-target_link_libraries(miracast_service_tests miracast gtest gtest_main process-cpp)
218-add_test(miracast_service_tests miracast_service_tests)
219+add_executable(aethercast_tests miracast_service_tests.cpp did_exit_cleanly.cpp)
220+target_link_libraries(aethercast_tests aethercast-core gtest gtest_main process-cpp)
221+add_test(aethercast_tests aethercast_tests)
222
223=== modified file 'tests/wpa/CMakeLists.txt'
224--- tests/wpa/CMakeLists.txt 2015-12-07 15:40:38 +0000
225+++ tests/wpa/CMakeLists.txt 2015-12-10 10:18:13 +0000
226@@ -5,7 +5,7 @@
227 add_executable(wpasupplicantmessage_tests
228 wpasupplicantmessage_test.cpp)
229 target_link_libraries(wpasupplicantmessage_tests
230- miracast
231+ aethercast-core
232 gtest
233 gtest_main)
234 add_test(wpasupplicantmessage_tests wpasupplicantmessage_tests)
235@@ -13,7 +13,7 @@
236 add_executable(wpasupplicantcommandqueue_tests
237 wpasupplicantcommandqueue_test.cpp)
238 target_link_libraries(wpasupplicantcommandqueue_tests
239- miracast
240+ aethercast-core
241 gtest
242 gtest_main
243 gmock)
244@@ -22,7 +22,7 @@
245 add_executable(wfddeviceinfo_tests
246 wfddeviceinfo_test.cpp)
247 target_link_libraries(wfddeviceinfo_tests
248- miracast
249+ aethercast-core
250 gtest
251 gtest_main
252 gmock)

Subscribers

People subscribed via source and target branches

to all changes: