← Back to branch summary

~cairo-dock-team/ubuntu/precise/cairo-dock/3.0.0.1

« back to all changes in this revision

Viewing changes to debian/patches/01-default_theme_with_default_apps

  • Committer: matttbe
  • Date: 2011-06-20 14:57:12 UTC
  • mfrom: (1.1.16 upstream)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: matttbe@gmail.com-20110620145712-j0lqdm0wxt0scqf1
https://launchpad.net/bugs/797273
https://launchpad.net/bugs/799773
* New upstream release. (LP: #799773)
* Upstream ChangeLog:
 - Fixed a crash that occurs when the MP applet is in desklet
    mode and applets separated from launchers
    and the music-player is launched. (LP: #797273)
* debian/patches:
 - Removed 02-mouse-leaves-on-the-edge_upstream-version-2.3.0~2.1.patch
  (now in the upstream release)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-default_theme_with_default_apps
1
1
Index: cairo-dock/data/default-theme/launchers/01eog.desktop
2
2
===================================================================
3
3
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4
 
+++ cairo-dock/data/default-theme/launchers/01eog.desktop       2011-04-19 22:59:04.000000000 +0200
 
4
+++ cairo-dock/data/default-theme/launchers/01eog.desktop       2011-06-19 18:02:00.744393000 +0200
5
5
@@ -0,0 +1,54 @@
6
6
+#!en
7
7
+
60
60
Index: cairo-dock/data/default-theme/launchers/01evolution.desktop
61
61
===================================================================
62
62
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
63
 
+++ cairo-dock/data/default-theme/launchers/01evolution.desktop 2011-04-19 22:59:04.000000000 +0200
 
63
+++ cairo-dock/data/default-theme/launchers/01evolution.desktop 2011-06-19 18:02:00.744393000 +0200
64
64
@@ -0,0 +1,47 @@
65
65
+#!en
66
66
+
111
111
+X-Ubuntu-Gettext-Domain=evolution-2.32
112
112
Index: cairo-dock/data/default-theme/launchers/01f-spot.desktop
113
113
===================================================================
114
 
--- cairo-dock.orig/data/default-theme/launchers/01f-spot.desktop       2011-04-19 22:58:37.817058474 +0200
 
114
--- cairo-dock.orig/data/default-theme/launchers/01f-spot.desktop       2011-06-19 18:02:00.744393000 +0200
115
115
+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
116
116
@@ -1,53 +0,0 @@
117
117
-#!en
169
169
-X-GNOME-DocPath=f-spot/f-spot.xml
170
170
Index: cairo-dock/data/default-theme/launchers/01inkscape.desktop
171
171
===================================================================
172
 
--- cairo-dock.orig/data/default-theme/launchers/01inkscape.desktop     2011-04-19 22:58:37.787058430 +0200
 
172
--- cairo-dock.orig/data/default-theme/launchers/01inkscape.desktop     2011-06-19 18:02:00.744393000 +0200
173
173
+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
174
174
@@ -1,92 +0,0 @@
175
175
-#!en
264
264
-MimeType=image/svg+xml;image/svg+xml-compressed;
265
265
-TryExec=inkscape
266
266
-StartupNotify=true
267
 
Index: cairo-dock/data/default-theme/launchers/CMakeLists.txt
268
 
===================================================================
269
 
--- cairo-dock.orig/data/default-theme/launchers/CMakeLists.txt 2011-04-19 22:58:37.707058307 +0200
270
 
+++ cairo-dock/data/default-theme/launchers/CMakeLists.txt      2011-04-19 22:59:04.000000000 +0200
271
 
@@ -8,10 +8,10 @@
272
 
        01gimp.desktop
273
 
        01firefox.desktop
274
 
        01gnome-terminal.desktop
275
 
-       01f-spot.desktop
276
 
-       01inkscape.desktop
277
 
+       01shotwell.desktop
278
 
+       01eog.desktop
279
 
        01separator.desktop
280
 
-       01thunderbird.desktop
281
 
+       01evolution.desktop
282
 
        02separator.desktop
283
 
        03separator.desktop
284
 
        DESTINATION ${pkgdatadir}/themes/_default_/launchers)
285
 
Index: cairo-dock/data/default-theme/plug-ins/GMenu/GMenu.conf
286
 
===================================================================
287
 
--- cairo-dock.orig/data/default-theme/plug-ins/GMenu/GMenu.conf        2011-04-19 22:58:37.907058606 +0200
288
 
+++ cairo-dock/data/default-theme/plug-ins/GMenu/GMenu.conf     2011-04-19 22:59:04.000000000 +0200
289
 
@@ -17,7 +17,7 @@
290
 
 
291
 
 #S+ Image filename:
292
 
 #{Leave empty to use the default one.}
293
 
-icon=alacarte
294
 
+icon=distributor-logo
295
 
 
296
 
 #j+[0;128] Desired icon size for this applet
297
 
 #{Set to 0 to use the default applet size}
298
 
Index: cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf
299
 
===================================================================
300
 
--- cairo-dock.orig/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf    2011-04-19 22:58:37.867058541 +0200
301
 
+++ cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf 2011-04-19 22:59:04.000000000 +0200
302
 
@@ -107,7 +107,7 @@
303
 
 #F[Audio Player;gtk-cdrom]
304
 
 frame_player=
305
 
 #L[Amarok 2;Audacious;Banshee;Clementine;Exaile;Exaile 0.3;GMusicBrowser;Guayadeque;Listen;Qmmp;QuodLibet;Rhythmbox;Songbird;XMMS 2;XMMS] Player to control:
306
 
-current-player=Rhythmbox
307
 
+current-player=Banshee
308
 
 
309
 
 #b Steal the player's icon from the taskbar?
310
 
 #{This will prevent the player icon appearing in the taskbar. The applet's icon will then behave as a launcher, an application and an applet.}
311
267
Index: cairo-dock/data/default-theme/launchers/01shotwell.desktop
312
268
===================================================================
313
269
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
314
 
+++ cairo-dock/data/default-theme/launchers/01shotwell.desktop  2011-04-19 22:59:04.000000000 +0200
 
270
+++ cairo-dock/data/default-theme/launchers/01shotwell.desktop  2011-06-19 18:02:00.744393000 +0200
315
271
@@ -0,0 +1,52 @@
316
272
+#!en
317
273
+
367
323
+X-Ayatana-Appmenu-Show-Stubs=false
368
324
Index: cairo-dock/data/default-theme/launchers/01thunderbird.desktop
369
325
===================================================================
370
 
--- cairo-dock.orig/data/default-theme/launchers/01thunderbird.desktop  2011-04-19 22:58:37.757058386 +0200
 
326
--- cairo-dock.orig/data/default-theme/launchers/01thunderbird.desktop  2011-06-19 18:02:00.744393000 +0200
371
327
+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
372
328
@@ -1,58 +0,0 @@
373
329
-#!en
428
384
-Comment[pl]=Czytanie i wysyłanie e-maili
429
385
-Comment[pt_BR]=Ler e escrever suas mensagens
430
386
-Comment[sv]=Läs och skriv e-post
 
387
Index: cairo-dock/data/default-theme/launchers/CMakeLists.txt
 
388
===================================================================
 
389
--- cairo-dock.orig/data/default-theme/launchers/CMakeLists.txt 2011-06-19 18:02:00.744393000 +0200
 
390
+++ cairo-dock/data/default-theme/launchers/CMakeLists.txt      2011-06-19 18:02:00.744393000 +0200
 
391
@@ -8,10 +8,10 @@
 
392
        01gimp.desktop
 
393
        01firefox.desktop
 
394
        01gnome-terminal.desktop
 
395
-       01f-spot.desktop
 
396
-       01inkscape.desktop
 
397
+       01shotwell.desktop
 
398
+       01eog.desktop
 
399
        01separator.desktop
 
400
-       01thunderbird.desktop
 
401
+       01evolution.desktop
 
402
        02separator.desktop
 
403
        03separator.desktop
 
404
        DESTINATION ${pkgdatadir}/themes/_default_/launchers)
 
405
Index: cairo-dock/data/default-theme/plug-ins/GMenu/GMenu.conf
 
406
===================================================================
 
407
--- cairo-dock.orig/data/default-theme/plug-ins/GMenu/GMenu.conf        2011-06-19 18:02:00.744393000 +0200
 
408
+++ cairo-dock/data/default-theme/plug-ins/GMenu/GMenu.conf     2011-06-19 18:02:00.744393000 +0200
 
409
@@ -17,7 +17,7 @@
 
410
 
 
411
 #S+ Image filename:
 
412
 #{Leave empty to use the default one.}
 
413
-icon=alacarte
 
414
+icon=distributor-logo
 
415
 
 
416
 #j+[0;128] Desired icon size for this applet
 
417
 #{Set to 0 to use the default applet size}
 
418
Index: cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf
 
419
===================================================================
 
420
--- cairo-dock.orig/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf    2011-06-19 18:02:00.744393000 +0200
 
421
+++ cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf 2011-06-19 18:02:00.744393000 +0200
 
422
@@ -107,7 +107,7 @@
 
423
 #F[Audio Player;gtk-cdrom]
 
424
 frame_player=
 
425
 #L[Amarok 2;Audacious;Banshee;Clementine;Exaile;Exaile 0.3;GMusicBrowser;Guayadeque;Listen;Qmmp;QuodLibet;Rhythmbox;Songbird;XMMS 2;XMMS] Player to control:
 
426
-current-player=Rhythmbox
 
427
+current-player=Banshee
 
428
 
 
429
 #b Steal the player's icon from the taskbar?
 
430
 #{This will prevent the player icon appearing in the taskbar. The applet's icon will then behave as a launcher, an application and an applet.}