Merge lp:~ilidrissi.amine/update-notifier/renaming into lp:update-notifier/ubuntu
- renaming
- Merge into ubuntu
Proposed by
Mohamed Amine Ilidrissi
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Brian Murray | ||||
Proposed branch: | lp:~ilidrissi.amine/update-notifier/renaming | ||||
Merge into: | lp:update-notifier/ubuntu | ||||
Diff against target: |
652 lines (+89/-83) 33 files modified
HOOKS (+4/-4) README (+2/-2) README.testing (+3/-3) autogen.sh (+1/-1) configure.in (+3/-3) data/Makefile.am (+4/-4) data/apt_check.py (+4/-4) data/notify-reboot-required (+1/-1) data/update-manager-daemon.desktop.in (+4/-4) data/update-motd-updates-available (+1/-1) debian/20-cpu-checker (+1/-1) debian/90-updates-available (+1/-1) debian/98-reboot-required (+1/-1) debian/changelog (+5/-2) debian/control (+10/-7) debian/update-manager-daemon-common.dirs (+1/-1) debian/update-manager-daemon-common.install (+2/-2) debian/update-manager-daemon-common.links (+2/-2) debian/update-manager-daemon.install (+5/-5) po/POTFILES.in (+3/-3) src/Makefile.am (+9/-9) src/avahi.c (+1/-1) src/clipboard.c (+1/-1) src/crash.c (+1/-1) src/gdu.c (+4/-4) src/hook-remove.c (+1/-1) src/hooks.c (+1/-1) src/reboot.c (+1/-1) src/release.c (+1/-1) src/update-manager-daemon.c (+6/-6) src/update-manager-daemon.h (+2/-2) src/update.c (+2/-2) ui/Makefile.am (+1/-1) |
||||
To merge this branch: | bzr merge lp:~ilidrissi.amine/update-notifier/renaming | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Murray | Disapprove | ||
Review via email: mp+32661@code.launchpad.net |
Commit message
Description of the change
This branch renames update-notifier to update-
To post a comment you must log in.
Unmerged revisions
- 591. By Mohamed Amine Ilidrissi
-
Renamed update-notifier to update-
manager- daemon (LP: #399591)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'HOOKS' |
2 | --- HOOKS 2008-10-17 09:20:12 +0000 |
3 | +++ HOOKS 2010-08-14 11:17:41 +0000 |
4 | @@ -13,9 +13,9 @@ |
5 | |
6 | Another example is the reboot notification. Packages like the kernel, |
7 | glibc, dbus and hal require a reboot. To simplify things |
8 | -update-notifier installs a helper script in |
9 | +update-manager-daemon installs a helper script in |
10 | |
11 | -/usr/share/update-notifier/notify-reboot-required |
12 | +/usr/share/update-manager-daemon/notify-reboot-required |
13 | |
14 | that can be called in the packages postinst script (make sure to check |
15 | for it first). It is i18n-able via langpacks and it will only be shown |
16 | @@ -24,7 +24,7 @@ |
17 | Design: |
18 | * Maintainer scripts create/copy a notification to |
19 | /var/lib/update-notifier/user.d |
20 | - * update-notifier checks for those after each apt invocation (when |
21 | + * update-manager-daemon checks for those after each apt invocation (when |
22 | /var/lib/update-notifier/dpkg-was-run changed) and notifies the user |
23 | that they are pending |
24 | * When the user selects to process pending actions, they are executed |
25 | @@ -44,7 +44,7 @@ |
26 | that the user can run (e.g. a script like /usr/share/package/do-something) |
27 | - a optional "Terminal: True" field if the command should be |
28 | execute in a terminal |
29 | - - update-notifier uses inotify to monitor |
30 | + - update-manager-daemon uses inotify to monitor |
31 | /var/lib/update-notifier/dpkg-was-run and |
32 | /var/lib/update-notifier/user.d/ and show a small information icon for |
33 | hooks it has not seen yet |
34 | |
35 | === modified file 'README' |
36 | --- README 2010-06-16 08:16:41 +0000 |
37 | +++ README 2010-08-14 11:17:41 +0000 |
38 | @@ -1,4 +1,4 @@ |
39 | -Upgrade notifier tray icon |
40 | +Update Manager Daemon tray icon |
41 | -------------------------- |
42 | |
43 | This is a small tray icon that backgrounds itself and checks for |
44 | @@ -10,7 +10,7 @@ |
45 | of the package information: |
46 | /etc/cron.daily/apt |
47 | |
48 | -The following files are installed as part of the update-notifier-comomn |
49 | +The following files are installed as part of the update-manager-daemon-comomn |
50 | package and trigger regular the /etc/cron.daily/apt job: |
51 | /etc/apt/apt.conf.d/10periodic |
52 | /etc/apt/apt.conf.d/20archive |
53 | |
54 | === modified file 'README.testing' |
55 | --- README.testing 2009-06-26 16:07:39 +0000 |
56 | +++ README.testing 2010-08-14 11:17:41 +0000 |
57 | @@ -12,14 +12,14 @@ |
58 | it detects that a package manager is running. |
59 | |
60 | Test hooks: |
61 | -Copy a example hook file into /usr/lib/update-notifier/user.d/ (or |
62 | +Copy a example hook file into /usr/lib/update-manager-daemon/user.d/ (or |
63 | touch it) and touch /var/lib/update-notifier/dpkg-run-stamp to trigger |
64 | it reading the hooks. Modify ~/.update-notifier/hooks_seen to |
65 | simulate certain conditions. Add identical files to "user.d" to test |
66 | the duplicates detection. |
67 | |
68 | Test reboot notification: |
69 | -Run /usr/share/update-notifier/notify-reboot-required and then do |
70 | +Run /usr/share/update-manager-daemon/notify-reboot-required and then do |
71 | touch /var/lib/update-notifier/dpkg-run-stamp. |
72 | |
73 | Test cdrom detection: |
74 | @@ -28,6 +28,6 @@ |
75 | Test auto-launch: |
76 | The "faketime" package is useful for testing the auto-launch |
77 | funtionatliy |
78 | -$ NO_FAKE_STAT=1 faketime '10 days' update-notifier --debug-updates |
79 | +$ NO_FAKE_STAT=1 faketime '10 days' update-manager-daemon --debug-updates |
80 | # aftwards the launch time in u-m needs to be reset |
81 | $ gconftool --unset /apps/update-manager/launch_time |
82 | |
83 | === modified file 'autogen.sh' |
84 | --- autogen.sh 2010-06-01 13:28:36 +0000 |
85 | +++ autogen.sh 2010-08-14 11:17:41 +0000 |
86 | @@ -4,7 +4,7 @@ |
87 | srcdir=`dirname $0` |
88 | test -z "$srcdir" && srcdir=. |
89 | |
90 | -PKG_NAME="Upgrade Notifier" |
91 | +PKG_NAME="Update Manager Daemon" |
92 | |
93 | (test -f $srcdir/configure.in \ |
94 | && test -f $srcdir/README) || { |
95 | |
96 | === modified file 'configure.in' |
97 | --- configure.in 2010-06-25 10:04:05 +0000 |
98 | +++ configure.in 2010-08-14 11:17:41 +0000 |
99 | @@ -1,7 +1,7 @@ |
100 | dnl Process this file with autoconf to produce a configure script. |
101 | |
102 | -AC_INIT(src/update-notifier.c) |
103 | -AM_INIT_AUTOMAKE(update-notifier, 0.41.5) |
104 | +AC_INIT(src/update-manager-daemon.c) |
105 | +AM_INIT_AUTOMAKE(update-manager-daemon, 0.41.5) |
106 | AM_CONFIG_HEADER(config.h) |
107 | AM_MAINTAINER_MODE |
108 | |
109 | @@ -32,7 +32,7 @@ |
110 | |
111 | PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) |
112 | |
113 | -GETTEXT_PACKAGE=update-notifier |
114 | +GETTEXT_PACKAGE=update-manager-daemon |
115 | AC_SUBST(GETTEXT_PACKAGE) |
116 | AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) |
117 | AC_PROG_INTLTOOL([0.23]) |
118 | |
119 | === modified file 'data/Makefile.am' |
120 | --- data/Makefile.am 2010-06-01 13:28:36 +0000 |
121 | +++ data/Makefile.am 2010-08-14 11:17:41 +0000 |
122 | @@ -1,18 +1,18 @@ |
123 | @INTLTOOL_DESKTOP_RULE@ |
124 | |
125 | desktopdir = $(sysconfdir)/xdg/autostart |
126 | -desktop_in_files = update-notifier.desktop.in |
127 | +desktop_in_files = update-manager-daemon.desktop.in |
128 | desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |
129 | |
130 | schemadir = $(datadir)/gconf/schemas |
131 | -schema_in_files = update-notifier.schemas.in |
132 | +schema_in_files = update-manager-daemon.schemas.in |
133 | schema_DATA = $(schema_in_files:.schemas.in=.schemas) |
134 | @INTLTOOL_SCHEMAS_RULE@ |
135 | |
136 | -helperdir = $(libdir)/update-notifier |
137 | +helperdir = $(libdir)/update-manager-daemon |
138 | helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-cpu-checker |
139 | |
140 | -notifydir = $(datadir)/update-notifier |
141 | +notifydir = $(datadir)/update-manager-daemon |
142 | notify_SCRIPTS = notify-reboot-required |
143 | |
144 | EXTRA_DIST= $(helper_SCRIPTS) \ |
145 | |
146 | === modified file 'data/apt_check.py' |
147 | --- data/apt_check.py 2010-06-01 13:28:36 +0000 |
148 | +++ data/apt_check.py 2010-08-14 11:17:41 +0000 |
149 | @@ -21,7 +21,7 @@ |
150 | pass |
151 | |
152 | def _(msg): |
153 | - return gettext.dgettext("update-notifier", msg) |
154 | + return gettext.dgettext("update-manager-daemon", msg) |
155 | |
156 | def _handleException(type, value, tb): |
157 | sys.stderr.write("E: "+ _("Unknown Error: '%s' (%s)") % (type,value)) |
158 | @@ -62,12 +62,12 @@ |
159 | |
160 | def write_human_readable_summary(outstream, upgrades, security_updates): |
161 | " write out human summary summary to outstream " |
162 | - outstream.write(gettext.dngettext("update-notifier", |
163 | + outstream.write(gettext.dngettext("update-manager-daemon", |
164 | "%i package can be updated.", |
165 | "%i packages can be updated.", |
166 | upgrades) % upgrades) |
167 | outstream.write("\n") |
168 | - outstream.write(gettext.dngettext("update-notifier", |
169 | + outstream.write(gettext.dngettext("update-manager-daemon", |
170 | "%i update is a security update.", |
171 | "%i updates are security updates.", |
172 | security_updates) % security_updates) |
173 | @@ -168,7 +168,7 @@ |
174 | sys.excepthook = _handleException |
175 | |
176 | # gettext |
177 | - APP="update-notifier" |
178 | + APP="update-manager-daemon" |
179 | DIR="/usr/share/locale" |
180 | gettext.bindtextdomain(APP, DIR) |
181 | gettext.textdomain(APP) |
182 | |
183 | === modified file 'data/notify-reboot-required' |
184 | --- data/notify-reboot-required 2010-06-01 13:28:36 +0000 |
185 | +++ data/notify-reboot-required 2010-08-14 11:17:41 +0000 |
186 | @@ -6,7 +6,7 @@ |
187 | eval_gettext() { |
188 | echo $(gettext "$1") |
189 | } |
190 | -export TEXTDOMAIN=update-notifier |
191 | +export TEXTDOMAIN=update-manager-daemon |
192 | export TEXTDOMAINDIR=/usr/share/locale |
193 | |
194 | if [ "$0" = "/etc/kernel/postinst.d/update-notifier" ]; then |
195 | |
196 | === renamed file 'data/update-notifier.desktop.in' => 'data/update-manager-daemon.desktop.in' |
197 | --- data/update-notifier.desktop.in 2010-02-01 23:39:17 +0000 |
198 | +++ data/update-manager-daemon.desktop.in 2010-08-14 11:17:41 +0000 |
199 | @@ -1,12 +1,12 @@ |
200 | [Desktop Entry] |
201 | Encoding=UTF-8 |
202 | -_Name=Update Notifier |
203 | +_Name=Update Manager Daemon |
204 | _Comment=Check for available updates automatically |
205 | -Icon=update-notifier |
206 | -Exec=update-notifier |
207 | +Icon=update-manager-daemon |
208 | +Exec=update-manager-daemon |
209 | Terminal=false |
210 | Type=Application |
211 | Categories= |
212 | NotShowIn=KDE; |
213 | X-GNOME-Autostart-Delay=60 |
214 | -X-Ubuntu-Gettext-Domain=update-notifier |
215 | +X-Ubuntu-Gettext-Domain=update-manager-daemon |
216 | |
217 | === renamed file 'data/update-notifier.schemas.in' => 'data/update-manager-daemon.schemas.in' |
218 | === modified file 'data/update-motd-updates-available' |
219 | --- data/update-motd-updates-available 2009-07-13 16:14:27 +0000 |
220 | +++ data/update-motd-updates-available 2010-08-14 11:17:41 +0000 |
221 | @@ -47,7 +47,7 @@ |
222 | # output something for update-motd |
223 | if [ -n "$NEED_UPDATE_CHECK" ]; then |
224 | echo "" > $stamp |
225 | - /usr/lib/update-notifier/apt-check --human-readable >> $stamp |
226 | + /usr/lib/update-manager-daemon/apt-check --human-readable >> $stamp |
227 | echo "" >> $stamp |
228 | fi |
229 | |
230 | |
231 | === modified file 'debian/20-cpu-checker' |
232 | --- debian/20-cpu-checker 2010-04-09 17:48:33 +0000 |
233 | +++ debian/20-cpu-checker 2010-08-14 11:17:41 +0000 |
234 | @@ -1,3 +1,3 @@ |
235 | #!/bin/sh |
236 | |
237 | -exec /usr/lib/update-notifier/update-motd-cpu-checker |
238 | +exec /usr/lib/update-manager-daemon/update-motd-cpu-checker |
239 | |
240 | === modified file 'debian/90-updates-available' |
241 | --- debian/90-updates-available 2010-04-09 17:48:33 +0000 |
242 | +++ debian/90-updates-available 2010-08-14 11:17:41 +0000 |
243 | @@ -1,3 +1,3 @@ |
244 | #!/bin/sh |
245 | |
246 | -exec /usr/lib/update-notifier/update-motd-updates-available |
247 | +exec /usr/lib/update-manager-daemon/update-motd-updates-available |
248 | |
249 | === modified file 'debian/98-reboot-required' |
250 | --- debian/98-reboot-required 2010-04-09 17:48:33 +0000 |
251 | +++ debian/98-reboot-required 2010-08-14 11:17:41 +0000 |
252 | @@ -1,3 +1,3 @@ |
253 | #!/bin/sh |
254 | |
255 | -exec /usr/lib/update-notifier/update-motd-reboot-required |
256 | +exec /usr/lib/update-manager-daemon/update-motd-reboot-required |
257 | |
258 | === modified file 'debian/changelog' |
259 | --- debian/changelog 2010-08-13 16:34:26 +0000 |
260 | +++ debian/changelog 2010-08-14 11:17:41 +0000 |
261 | @@ -1,4 +1,4 @@ |
262 | -update-notifier (0.104ubuntu1) UNRELEASED; urgency=low |
263 | +update-manager-daemon (0.104ubuntu1) UNRELEASED; urgency=low |
264 | |
265 | [ Sebastian Geiger ] |
266 | * src/update.c: |
267 | @@ -9,7 +9,10 @@ |
268 | * move hooks file over to the new location if |
269 | it exists |
270 | |
271 | - -- Michael Vogt <egon@pop> Fri, 13 Aug 2010 18:23:59 +0200 |
272 | + [ Mohamed Amine IL Idrissi ] |
273 | + * Renamed update-notifier to update-manager-daemon (LP: #399591) |
274 | + |
275 | + -- Mohamed Amine IL Idrissi <ilidrissiamine@gmail.com> Fri, 13 Aug 2010 23:25:15 +0000 |
276 | |
277 | update-notifier (0.103ubuntu1) maverick; urgency=low |
278 | |
279 | |
280 | === modified file 'debian/control' |
281 | --- debian/control 2010-06-25 10:15:31 +0000 |
282 | +++ debian/control 2010-08-14 11:17:41 +0000 |
283 | @@ -1,4 +1,4 @@ |
284 | -Source: update-notifier |
285 | +Source: update-manager-daemon |
286 | Section: gnome |
287 | Priority: optional |
288 | Maintainer: Michael Vogt <michael.vogt@ubuntu.com> |
289 | @@ -15,11 +15,13 @@ |
290 | Standards-Version: 3.8.4 |
291 | Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/update-notifier/ubuntu |
292 | |
293 | -Package: update-notifier |
294 | +Package: update-manager-daemon |
295 | +Replaces: update-notifier |
296 | +Provides: update-notifier |
297 | Architecture: any |
298 | Depends: ${shlibs:Depends}, |
299 | ${misc:Depends}, |
300 | - update-notifier-common (= ${source:Version}), |
301 | + update-manager-daemon-common (= ${source:Version}), |
302 | python, |
303 | update-manager-gnome | update-manager, |
304 | notification-daemon, |
305 | @@ -30,14 +32,15 @@ |
306 | Puts an icon in the user's notification area when package updates are |
307 | available. |
308 | |
309 | -Package: update-notifier-common |
310 | -Replaces: update-notifier (<< 0.75.1) |
311 | +Package: update-manager-daemon-common |
312 | +Replaces: update-notifier (<< 0.75.1), update-notifier-common |
313 | +Provides: update-notifier-common |
314 | Architecture: all |
315 | Depends: ${shlibs:Depends}, |
316 | ${misc:Depends}, |
317 | python, |
318 | python-apt (>= 0.6.12) |
319 | Recommends: libpam-modules (>= 1.0.1-9ubuntu3), cpu-checker |
320 | -Description: Files shared between update-notifier and adept |
321 | +Description: Files shared between update-manager-daemon and adept |
322 | Apt setup files and reboot notification scripts shared between |
323 | - update-notifier and adept-notifier. |
324 | + update-manager-daemon and adept-notifier. |
325 | |
326 | === renamed file 'debian/update-notifier-common.dirs' => 'debian/update-manager-daemon-common.dirs' |
327 | --- debian/update-notifier-common.dirs 2010-06-29 19:31:20 +0000 |
328 | +++ debian/update-manager-daemon-common.dirs 2010-08-14 11:17:41 +0000 |
329 | @@ -3,4 +3,4 @@ |
330 | var/lib/update-notifier |
331 | var/lib/update-notifier/user.d |
332 | etc/update-motd.d |
333 | -usr/share/update-notifier/plugins/cache-changed |
334 | \ No newline at end of file |
335 | +usr/share/update-manager-daemon/plugins/cache-changed |
336 | |
337 | === renamed file 'debian/update-notifier-common.install' => 'debian/update-manager-daemon-common.install' |
338 | --- debian/update-notifier-common.install 2010-06-01 13:28:36 +0000 |
339 | +++ debian/update-manager-daemon-common.install 2010-08-14 11:17:41 +0000 |
340 | @@ -5,6 +5,6 @@ |
341 | debian/20-cpu-checker etc/update-motd.d |
342 | debian/90-updates-available etc/update-motd.d |
343 | debian/98-reboot-required etc/update-motd.d |
344 | -usr/share/update-notifier/notify-reboot-required |
345 | -usr/lib/update-notifier/ |
346 | +usr/share/update-manager-daemon/notify-reboot-required |
347 | +usr/lib/update-manager-daemon/ |
348 | usr/share/locale |
349 | |
350 | === renamed file 'debian/update-notifier-common.links' => 'debian/update-manager-daemon-common.links' |
351 | --- debian/update-notifier-common.links 2010-06-01 13:28:36 +0000 |
352 | +++ debian/update-manager-daemon-common.links 2010-08-14 11:17:41 +0000 |
353 | @@ -1,2 +1,2 @@ |
354 | -usr/lib/update-notifier/apt_check.py usr/lib/update-notifier/apt-check |
355 | -/usr/share/update-notifier/notify-reboot-required etc/kernel/postinst.d/update-notifier |
356 | +usr/lib/update-manager-daemon/apt_check.py usr/lib/update-manager-daemon/apt-check |
357 | +/usr/share/update-manager-daemon/notify-reboot-required etc/kernel/postinst.d/update-notifier |
358 | |
359 | === renamed file 'debian/update-notifier-common.postinst' => 'debian/update-manager-daemon-common.postinst' |
360 | === renamed file 'debian/update-notifier.docs' => 'debian/update-manager-daemon.docs' |
361 | === renamed file 'debian/update-notifier.install' => 'debian/update-manager-daemon.install' |
362 | --- debian/update-notifier.install 2009-06-26 16:00:13 +0000 |
363 | +++ debian/update-manager-daemon.install 2010-08-14 11:17:41 +0000 |
364 | @@ -1,9 +1,9 @@ |
365 | -etc/xdg/autostart/update-notifier.desktop |
366 | -usr/share/update-notifier/ui/hooks-dialog.ui |
367 | -usr/share/update-notifier/ui/reboot-dialog.ui |
368 | +etc/xdg/autostart/update-manager-daemon.desktop |
369 | +usr/share/update-manager-daemon/ui/hooks-dialog.ui |
370 | +usr/share/update-manager-daemon/ui/reboot-dialog.ui |
371 | usr/share/icons/hicolor/16x16/ |
372 | usr/share/icons/hicolor/22x22/ |
373 | usr/share/icons/hicolor/24x24/ |
374 | usr/share/icons/hicolor/48x48/ |
375 | -usr/share/gconf/schemas/update-notifier.schemas |
376 | -usr/bin/update-notifier |
377 | +usr/share/gconf/schemas/update-manager-daemon.schemas |
378 | +usr/bin/update-manager-daemon |
379 | |
380 | === renamed file 'pixmaps/48x48/update-notifier.png' => 'pixmaps/48x48/update-manager-daemon.png' |
381 | === added symlink 'pixmaps/48x48/update-notifier.png' |
382 | === target is u'update-manager-daemon.png' |
383 | === modified file 'po/POTFILES.in' |
384 | --- po/POTFILES.in 2009-07-08 15:22:36 +0000 |
385 | +++ po/POTFILES.in 2010-08-14 11:17:41 +0000 |
386 | @@ -12,8 +12,8 @@ |
387 | src/hooks.c |
388 | src/reboot.c |
389 | src/update.c |
390 | -src/update-notifier.c |
391 | +src/update-manager-daemon.c |
392 | [type: gettext/glade]ui/hooks-dialog.ui |
393 | [type: gettext/glade]ui/reboot-dialog.ui |
394 | -data/update-notifier.schemas.in |
395 | -data/update-notifier.desktop.in |
396 | +data/update-manager-daemon.schemas.in |
397 | +data/update-manager-daemon.desktop.in |
398 | |
399 | === modified file 'src/Makefile.am' |
400 | --- src/Makefile.am 2010-06-24 10:52:04 +0000 |
401 | +++ src/Makefile.am 2010-08-14 11:17:41 +0000 |
402 | @@ -4,15 +4,15 @@ |
403 | -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ |
404 | -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ |
405 | -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ |
406 | - -DUIDIR=\""$(datadir)/update-notifier/ui/"\" \ |
407 | + -DUIDIR=\""$(datadir)/update-manager-daemon/ui/"\" \ |
408 | $(PACKAGE_CFLAGS) |
409 | |
410 | -bin_PROGRAMS = update-notifier |
411 | - |
412 | - |
413 | - |
414 | -update_notifier_SOURCES = update-notifier.c \ |
415 | - update-notifier.h \ |
416 | +bin_PROGRAMS = update-manager-daemon |
417 | + |
418 | + |
419 | + |
420 | +update_manager_daemon_SOURCES = update-manager-daemon.c \ |
421 | + update-manager-daemon.h \ |
422 | clipboard.c \ |
423 | rfc822.h\ |
424 | rfc822.c\ |
425 | @@ -33,5 +33,5 @@ |
426 | gdu.c\ |
427 | gdu.h |
428 | |
429 | -update_notifier_LDADD = $(PACKAGE_LIBS) $(INTLLIBS) |
430 | -update_notifier_LDFLAGS = -export-dynamic |
431 | +update_manager_daemon_LDADD = $(PACKAGE_LIBS) $(INTLLIBS) |
432 | +update_manager_daemon_LDFLAGS = -export-dynamic |
433 | |
434 | === modified file 'src/avahi.c' |
435 | --- src/avahi.c 2006-12-12 15:52:03 +0000 |
436 | +++ src/avahi.c 2010-08-14 11:17:41 +0000 |
437 | @@ -4,7 +4,7 @@ |
438 | |
439 | #include <libnotify/notify.h> |
440 | |
441 | -#include "update-notifier.h" |
442 | +#include "update-manager-daemon.h" |
443 | |
444 | static gint |
445 | show_notification (void* data) |
446 | |
447 | === modified file 'src/clipboard.c' |
448 | --- src/clipboard.c 2008-10-28 13:36:50 +0000 |
449 | +++ src/clipboard.c 2010-08-14 11:17:41 +0000 |
450 | @@ -13,7 +13,7 @@ |
451 | #include <gconf/gconf-client.h> |
452 | #include <gdk/gdkx.h> |
453 | |
454 | -#include "update-notifier.h" |
455 | +#include "update-manager-daemon.h" |
456 | |
457 | /* |
458 | * clipboard_get_func - dummy get_func for gtk_clipboard_set_with_data () |
459 | |
460 | === modified file 'src/crash.c' |
461 | --- src/crash.c 2009-06-26 10:56:01 +0000 |
462 | +++ src/crash.c 2010-08-14 11:17:41 +0000 |
463 | @@ -8,7 +8,7 @@ |
464 | |
465 | #include <libnotify/notify.h> |
466 | |
467 | -#include "update-notifier.h" |
468 | +#include "update-manager-daemon.h" |
469 | #include "update.h" |
470 | |
471 | |
472 | |
473 | === modified file 'src/gdu.c' |
474 | --- src/gdu.c 2010-06-01 13:28:36 +0000 |
475 | +++ src/gdu.c 2010-08-14 11:17:41 +0000 |
476 | @@ -9,12 +9,12 @@ |
477 | #include <sys/types.h> |
478 | #include <sys/wait.h> |
479 | |
480 | -#include "update-notifier.h" |
481 | +#include "update-manager-daemon.h" |
482 | #define GDU_API_IS_SUBJECT_TO_CHANGE |
483 | #include <gdu/gdu.h> |
484 | #include "gdu.h" |
485 | |
486 | -#define CDROM_CHECKER PACKAGE_LIB_DIR"/update-notifier/apt-cdrom-check" |
487 | +#define CDROM_CHECKER PACKAGE_LIB_DIR"/update-manager-daemon/apt-cdrom-check" |
488 | |
489 | /* reposonses for the dialog */ |
490 | enum { |
491 | @@ -129,7 +129,7 @@ |
492 | invoke_with_gksu(cmd, "/usr/share/applications/synaptic.desktop", FALSE); |
493 | break; |
494 | case RES_DIST_UPGRADER: |
495 | - argv[0] = "/usr/lib/update-notifier/cddistupgrader"; |
496 | + argv[0] = "/usr/lib/update-manager-daemon/cddistupgrader"; |
497 | argv[1] = (gchar *)mount_point; |
498 | argv[2] = NULL; |
499 | g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL); |
500 | @@ -232,7 +232,7 @@ |
501 | #else |
502 | #include <glib.h> |
503 | |
504 | -#include "update-notifier.h" |
505 | +#include "update-manager-daemon.h" |
506 | |
507 | gboolean |
508 | up_do_hal_init (UpgradeNotifier *un) |
509 | |
510 | === modified file 'src/hook-remove.c' |
511 | --- src/hook-remove.c 2009-11-16 20:52:04 +0000 |
512 | +++ src/hook-remove.c 2010-08-14 11:17:41 +0000 |
513 | @@ -22,7 +22,7 @@ |
514 | #include <stdio.h> |
515 | #include <unistd.h> |
516 | |
517 | -#define HOOK_PATH "/var/lib/update-notifier/user.d" |
518 | +#define HOOK_PATH "/var/lib/update-manager-daemon/user.d" |
519 | |
520 | int main(int argc, char *argv[]) |
521 | { |
522 | |
523 | === modified file 'src/hooks.c' |
524 | --- src/hooks.c 2010-08-13 16:34:26 +0000 |
525 | +++ src/hooks.c 2010-08-14 11:17:41 +0000 |
526 | @@ -14,7 +14,7 @@ |
527 | #include <locale.h> |
528 | #include <langinfo.h> |
529 | |
530 | -#include "update-notifier.h" |
531 | +#include "update-manager-daemon.h" |
532 | #include "hooks.h" |
533 | #include "rfc822.h" |
534 | #include "assert.h" |
535 | |
536 | === modified file 'src/reboot.c' |
537 | --- src/reboot.c 2010-06-01 13:28:36 +0000 |
538 | +++ src/reboot.c 2010-08-14 11:17:41 +0000 |
539 | @@ -9,7 +9,7 @@ |
540 | #include <libnotify/notify.h> |
541 | #include <dbus/dbus-glib.h> |
542 | |
543 | -#include "update-notifier.h" |
544 | +#include "update-manager-daemon.h" |
545 | #include "update.h" |
546 | |
547 | static GtkBuilder *builder; |
548 | |
549 | === modified file 'src/release.c' |
550 | --- src/release.c 2010-03-31 18:56:10 +0000 |
551 | +++ src/release.c 2010-08-14 11:17:41 +0000 |
552 | @@ -9,7 +9,7 @@ |
553 | #include <sys/wait.h> |
554 | #include <time.h> |
555 | |
556 | -#include "update-notifier.h" |
557 | +#include "update-manager-daemon.h" |
558 | |
559 | extern gboolean DEVEL_RELEASE; |
560 | |
561 | |
562 | === renamed file 'src/update-notifier.c' => 'src/update-manager-daemon.c' |
563 | --- src/update-notifier.c 2010-08-13 16:34:26 +0000 |
564 | +++ src/update-manager-daemon.c 2010-08-14 11:17:41 +0000 |
565 | @@ -1,4 +1,4 @@ |
566 | -/* update-notifier.c |
567 | +/* update-manager-daemon.c |
568 | * Copyright (C) 2004 Lukas Lipka <lukas@pmad.net> |
569 | * (C) 2004 Michael Vogt <mvo@debian.org> |
570 | * (C) 2004 Michiel Sikkes <michiel@eyesopened.nl> |
571 | @@ -37,7 +37,7 @@ |
572 | #include <gdk/gdkx.h> |
573 | #include <gio/gio.h> |
574 | |
575 | -#include "update-notifier.h" |
576 | +#include "update-manager-daemon.h" |
577 | #include "update.h" |
578 | #include "hooks.h" |
579 | #include "gdu.h" |
580 | @@ -548,13 +548,13 @@ |
581 | // init |
582 | if(!gtk_init_with_args (&argc, &argv, |
583 | _("- inform about updates"), entries, |
584 | - "update-notifier", &error) ) { |
585 | + "update-manager-daemon", &error) ) { |
586 | fprintf(stderr, _("Failed to init the UI: %s\n"), |
587 | error ? error->message : _("unknown error")); |
588 | exit(1); |
589 | } |
590 | |
591 | - notify_init("update-notifier"); |
592 | + notify_init("update-manager-daemon"); |
593 | bindtextdomain(PACKAGE, PACKAGE_LOCALE_DIR); |
594 | bind_textdomain_codeset(PACKAGE, "UTF-8"); |
595 | textdomain(PACKAGE); |
596 | @@ -571,8 +571,8 @@ |
597 | g_log_set_handler ("release", G_LOG_LEVEL_DEBUG, |
598 | debug_log_handler, NULL); |
599 | |
600 | - g_set_application_name (_("update-notifier")); |
601 | - gtk_window_set_default_icon_name ("update-notifier"); |
602 | + g_set_application_name (_("update-manager-daemon")); |
603 | + gtk_window_set_default_icon_name ("update-manager-daemon"); |
604 | |
605 | //g_print("starting update-notifier\n"); |
606 | |
607 | |
608 | === renamed file 'src/update-notifier.h' => 'src/update-manager-daemon.h' |
609 | --- src/update-notifier.h 2010-06-29 19:31:20 +0000 |
610 | +++ src/update-manager-daemon.h 2010-08-14 11:17:41 +0000 |
611 | @@ -1,4 +1,4 @@ |
612 | -/* update-notifier.h |
613 | +/* update-manager-daemon.h |
614 | * Copyright (C) 2004 Michiel Sikkes <michiel@eyesopened.nl> |
615 | * |
616 | * This library is free software; you can redistribute it and/or |
617 | @@ -58,7 +58,7 @@ |
618 | #define RELEASE_UPGRADE_CHECK_WAIT 60*60*24*2 |
619 | |
620 | // cache-changed plugin dir |
621 | -#define CACHE_CHANGED_PLUGIN_DIR "/usr/share/update-notifier/plugins/cache-changed" |
622 | +#define CACHE_CHANGED_PLUGIN_DIR "/usr/share/update-manager-daemon/plugins/cache-changed" |
623 | |
624 | #if 0 |
625 | // testing |
626 | |
627 | === modified file 'src/update.c' |
628 | --- src/update.c 2010-08-13 16:24:53 +0000 |
629 | +++ src/update.c 2010-08-14 11:17:41 +0000 |
630 | @@ -15,10 +15,10 @@ |
631 | #include <stdlib.h> |
632 | #include <dbus/dbus-glib.h> |
633 | |
634 | -#include "update-notifier.h" |
635 | +#include "update-manager-daemon.h" |
636 | #include "update.h" |
637 | |
638 | -#define UPGRADE_CHECKER PACKAGE_LIB_DIR"/update-notifier/apt-check" |
639 | +#define UPGRADE_CHECKER PACKAGE_LIB_DIR"/update-manager-daemon/apt-check" |
640 | |
641 | // command, description, desktopfile, needs_gksu |
642 | const char* actions[][4] = { |
643 | |
644 | === modified file 'ui/Makefile.am' |
645 | --- ui/Makefile.am 2009-06-26 16:30:18 +0000 |
646 | +++ ui/Makefile.am 2010-08-14 11:17:41 +0000 |
647 | @@ -1,4 +1,4 @@ |
648 | -uidir = $(datadir)/update-notifier/ui/ |
649 | +uidir = $(datadir)/update-manager-daemon/ui/ |
650 | ui_DATA = reboot-dialog.ui hooks-dialog.ui |
651 | |
652 | EXTRA_DIST= $(ui_DATA) |
update-notifier does more (now) than just call update-manager, subsequently I think renaming it wholesale is inappropriate.