← Back to branch summary

~ubuntu-branches/ubuntu/utopic/awn-extras-applets/utopic

« back to all changes in this revision

Viewing changes to applets/maintained/mail/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2010-08-29 14:29:52 UTC
  • mfrom: (1.1.7 upstream) (2.2.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100829142952-9hbpo70i6zgxfw2o
Tags: 0.4.0+bzr1372-0ubuntu1
https://launchpad.net/bugs/626265
https://launchpad.net/bugs/497787
https://launchpad.net/bugs/461123
https://launchpad.net/bugs/581414
https://launchpad.net/bugs/532848
https://launchpad.net/bugs/561611
https://launchpad.net/bugs/562548
* Sync with Debian
* New upstream snapshot (LP: #626265)
 - YAMA: use lda instead of xdg for managing desktop files (LP: #497787)
 - Volume: fix crash on high volume value. (LP: #461123)
 - Weather: fix crash on activate_map_cb (LP: #581414)
 - File-browser-launcher: fix crash on mounting LUKS partition (LP: #532848)
 - Feeds: fix crash when getting favicon (LP: #561611)
 - Slickswitcher: Fix division by 0 (LP: #562548)
* debian/control:
 - Build-depends on libindicator-dev (>= 0.3).
 - Build-depends on libzeitgeist-dev (>= 0.2.2).
 - Recommends python-gtop | python-gnome2-desktop for bandwidth-monitor.
 - Update description for new applets.
* debian/rules:
 - Pass --with-indicator to enable indicator applet.
 - Remove schemas for desactivated applets.
 - Disable mount applet.
* debian/awn-applets-c-core.install:
 - Install indicator applet.
 - Install related applet.
* debian/awn-applets-python-core:
 - Disable mount applet. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/maintained/mail/Makefile.am
15
15
dist_icons_DATA =               \
16
16
        icons/error.svg \
17
17
        icons/login.svg \
18
 
        icons/read.svg          \
19
 
        icons/unread.svg        \
 
18
        icons/mail-read.svg             \
 
19
        icons/mail-unread.svg   \
20
20
        $(NULL)
21
21
 
22
22
theme_gmail_scalabledir = $(applet_datadir)/themes/GMail/scalable
23
23
dist_theme_gmail_scalable_DATA =                \
24
24
        themes/GMail/scalable/error.svg         \
25
25
        themes/GMail/scalable/login.svg         \
26
 
        themes/GMail/scalable/read.svg          \
27
 
        themes/GMail/scalable/unread.svg        \
 
26
        themes/GMail/scalable/mail-read.svg             \
 
27
        themes/GMail/scalable/mail-unread.svg   \
28
28
        $(NULL)
29
29
 
30
30
theme_reserveddir = $(applet_datadir)/themes/Reserved
36
36
dist_theme_reserved_scalable_DATA =             \
37
37
        themes/Reserved/scalable/error.svg      \
38
38
        themes/Reserved/scalable/login.svg      \
39
 
        themes/Reserved/scalable/read.svg       \
40
 
        themes/Reserved/scalable/unread.svg     \
 
39
        themes/Reserved/scalable/mail-read.svg  \
 
40
        themes/Reserved/scalable/mail-unread.svg        \
41
41
        $(NULL)