← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/ekiga/jaunty

« back to all changes in this revision

Viewing changes to pixmaps/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-12-07 10:30:45 UTC
  • mfrom: (1.2.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20081207103045-iaurrjo4p7d1nngo
Tags: 3.0.1-1ubuntu1
https://launchpad.net/bugs/274085
* Merge to Debian experimental, to get Ekiga 3. (LP: #274085) Remaining
  Ubuntu changes:
  - Launchpad Integration: (Ubuntu specific)
    + debian/control.in: Add liblaunchpad-integration-dev build dependency.
    + Add ubuntu_lpi.patch: Call launchpad_integration_add_items() in main() and
      check for the launchpad-integration pkg-config module.
    + Add autoconf.patch: autoconf changes from above patch.
  - Add ubuntu_desktop-file-onlyshowin.patch: Show ekiga in Mobile, too.
    (Ubuntu specific).
  - debian/control.in: Add missing fdupes build dependency for identical
    GNOME help file symlinking. (Debian #505536)
* Drop 42_change_pixmaps.dpatch: Many of the old icons do not exist any
  more, some have been replaced, and keeping the remaining three would make
  them look very inconsistent.
* Convert our dpatches to quilt patches and rewrite them for new upstream
  version.
* Add migrate_2.0_settings.patch: Properly migrate settings from
  2.0. Taken from upstream SVN, thanks to Damien Sandras!

Show diffs side-by-side

added added

removed removed

Lines of Context:
pixmaps/Makefile.am
 
1
icondir = $(datadir)/icons/hicolor
1
2
pixmapdir = $(datadir)/pixmaps/@PACKAGE_NAME@
2
3
 
3
 
pixmap_DATA = @PACKAGE_NAME@-logo.png @PACKAGE_NAME@.png
4
 
 
5
 
 
6
 
EMOTICONS_FILES = \
7
 
        emoticon-face1.png \
8
 
        emoticon-face2.png \
9
 
        emoticon-face3.png \
10
 
        emoticon-face4.png \
11
 
        emoticon-face5.png \
12
 
        emoticon-face6.png \
13
 
        emoticon-face7.png \
14
 
        emoticon-face8.png \
15
 
        emoticon-face9.png \
16
 
        emoticon-face10.png \
17
 
        emoticon-face11.png \
18
 
        emoticon-face12.png \
19
 
        emoticon-face13.png \
20
 
        emoticon-face14.png \
21
 
        emoticon-face15.png \
22
 
        emoticon-face16.png \
23
 
        emoticon-face17.png \
24
 
        emoticon-face18.png \
25
 
        emoticon-face19.png \
26
 
        emoticon-dead-happy.png \
27
 
        emoticon-dead.png \
28
 
        emoticon-dead-sad.png \
29
 
        emoticon-happy-devil.png \
30
 
        emoticon-happy-nose-glasses.png \
31
 
        emoticon-sad-devil.png \
32
 
        emoticon-sad-glasses.png \
33
 
        emoticon-sad-nose-glasses.png 
 
4
pixmap_DATA = @PACKAGE_NAME@-logo.png
 
5
 
 
6
nobase_dist_icon_DATA = \
 
7
        16x16/apps/@PACKAGE_NAME@.png \
 
8
        22x22/apps/@PACKAGE_NAME@.png \
 
9
        32x32/apps/@PACKAGE_NAME@.png \
 
10
        48x48/apps/@PACKAGE_NAME@.png \
 
11
        64x64/apps/@PACKAGE_NAME@.png \
 
12
        72x72/apps/@PACKAGE_NAME@.png \
 
13
        128x128/apps/@PACKAGE_NAME@.png
 
14
 
34
15
 
35
16
IMAGES_FILES= \
36
 
        ekiga-16.png \
37
 
        addressbook-24.png \
38
 
        addressbook-16.png \
39
 
        text-chat.png \
40
 
        control-panel.png \
41
 
        connect.png \
42
 
        disconnect.png \
43
 
        gm-edit.png \
44
 
        volume.png \
45
 
        microphone.png \
46
 
        video-preview.png \
47
 
        audio-mute.png \
48
 
        speaker-phone.png \
49
 
        video-mute.png \
50
 
        status-available-16.png \
51
 
        status-in-a-call-16.png \
52
 
        status-auto-answer-16.png \
 
17
        48x48/multimedia-headset.png \
 
18
        22x22/multimedia-headset.png \
 
19
        22x22/multimedia-headset.svg \
 
20
        128x128/multimedia-headset.png \
 
21
        128x128/multimedia-headset.svg \
 
22
        16x16/multimedia-headset.png \
 
23
        16x16/multimedia-headset.svg \
 
24
        scalable/multimedia-headset.svg \
 
25
        32x32/multimedia-headset.png \
 
26
        32x32/multimedia-headset.svg \
 
27
        256x256/multimedia-headset.png \
 
28
        16x16/audio-volume-high.png \
 
29
        16x16/camera-video.png \
 
30
        16x16/media-playback-pause.png \
 
31
        16x16/stock_brightness.png \
 
32
        16x16/stock_channel-blue.png \
 
33
        16x16/stock_color.png \
 
34
        16x16/stock_contrast.png \
 
35
        16x16/system-search.png \
 
36
        24x24/audio-input-microphone.png \
 
37
        24x24/contact-new.png \
 
38
        24x24/internet-group-chat.png \
 
39
        color-brightness-contrast.png \
53
40
        status-ringing-16.png \
54
 
        status-do-not-disturb-16.png \
55
 
        status-forward-16.png \
56
 
        status-offline-16.png \
57
41
        local_contact.png \
58
42
        remote_contact.png \
59
 
        whiteness.png \
60
 
        brightness.png \
61
 
        colourness.png \
62
 
        contrast.png \
63
 
        connect-16.png \
64
 
        disconnect-16.png \
65
43
        message.png \
66
 
        calls-history.png
 
44
        call-placed.png \
 
45
        call-missed.png \
 
46
        call-received.png \
 
47
        call-transfer.png \
 
48
        status-online.png \
 
49
        status-offline.png \
 
50
        status-unknown.png \
 
51
        status-away.png \
 
52
        status-freeforchat.png \
 
53
        status-dnd.png \
 
54
        status-inacall.png \
 
55
        ekiga-logo.png \
 
56
        24x24/phone-hang-up.png \
 
57
        24x24/phone-pick-up.png \
 
58
        16x16/phone-hang-up.png \
 
59
        16x16/phone-pick-up.png \
 
60
        gm_powermeter_default_00.xpm \
 
61
        gm_powermeter_default_01.xpm \
 
62
        gm_powermeter_default_02.xpm \
 
63
        gm_powermeter_default_03.xpm \
 
64
        gm_powermeter_default_04.xpm \
 
65
        icon.h
67
66
 
68
67
 
69
68
IMAGES= \
70
 
        gm_16_stock_data $(srcdir)/ekiga-16.png \
71
 
        gm_addressbook_24_stock_data $(srcdir)/addressbook-24.png \
72
 
        gm_addressbook_16_stock_data $(srcdir)/addressbook-16.png \
73
 
        gm_text_chat_stock_data $(srcdir)/text-chat.png \
74
 
        gm_control_panel_stock_data $(srcdir)/control-panel.png \
75
 
        gm_connect_stock_data $(srcdir)/connect.png \
76
 
        gm_disconnect_stock_data $(srcdir)/disconnect.png \
77
 
        gm_edit_stock_data $(srcdir)/gm-edit.png \
78
 
        gm_volume_stock_data $(srcdir)/volume.png \
79
 
        gm_microphone_stock_data $(srcdir)/microphone.png \
80
 
        gm_video_preview_stock_data $(srcdir)/video-preview.png \
81
 
        gm_audio_mute_stock_data $(srcdir)/audio-mute.png \
82
 
        gm_speaker_phone_stock_data $(srcdir)/speaker-phone.png \
83
 
        gm_video_mute_stock_data $(srcdir)/video-mute.png \
84
 
        gm_status_available_stock_data $(srcdir)/status-available-16.png \
 
69
        gm_add_contact_24_stock_data $(srcdir)/24x24/contact-new.png \
 
70
        gm_audio_volume_high_16_stock_data $(srcdir)/16x16/audio-volume-high.png \
 
71
        gm_brightness_16_stock_data $(srcdir)/16x16/stock_brightness.png \
 
72
        gm_camera_video_16_stock_data $(srcdir)/16x16/camera-video.png \
 
73
        gm_colourness_16_stock_data $(srcdir)/16x16/stock_color.png \
 
74
        gm_contrast_16_stock_data $(srcdir)/16x16/stock_contrast.png \
 
75
        gm_internet_group_chat_24_stock_data $(srcdir)/24x24/internet-group-chat.png \
 
76
        gm_logo_16_stock_data $(srcdir)/16x16/apps/@PACKAGE_NAME@.png \
 
77
        gm_logo_22_stock_data $(srcdir)/22x22/apps/@PACKAGE_NAME@.png \
 
78
        gm_logo_32_stock_data $(srcdir)/32x32/apps/@PACKAGE_NAME@.png \
 
79
        gm_logo_48_stock_data $(srcdir)/48x48/apps/@PACKAGE_NAME@.png \
 
80
        gm_logo_72_stock_data $(srcdir)/72x72/apps/@PACKAGE_NAME@.png \
 
81
        gm_media_playback_pause_16_stock_data $(srcdir)/16x16/media-playback-pause.png \
 
82
        gm_microphone_24_stock_data $(srcdir)/24x24/audio-input-microphone.png \
 
83
        gm_system_search_16_stock_data $(srcdir)/16x16/system-search.png \
 
84
        gm_whiteness_16_stock_data $(srcdir)/16x16/stock_channel-blue.png \
 
85
        gm_color_brightness_contrast_stock_data $(srcdir)/color-brightness-contrast.png \
 
86
        gm_status_freeforchat_stock_data $(srcdir)/status-freeforchat.png \
85
87
        gm_status_ringing_stock_data $(srcdir)/status-ringing-16.png \
86
 
        gm_status_in_a_call_stock_data $(srcdir)/status-in-a-call-16.png \
87
 
        gm_status_forward_stock_data $(srcdir)/status-forward-16.png \
88
 
        gm_status_offline_stock_data $(srcdir)/status-offline-16.png \
89
 
        gm_status_do_not_disturb_stock_data $(srcdir)/status-do-not-disturb-16.png \
90
 
        gm_status_auto_answer_stock_data $(srcdir)/status-auto-answer-16.png \
91
88
        gm_remote_contact_stock_data $(srcdir)/remote_contact.png \
92
89
        gm_local_contact_stock_data $(srcdir)/local_contact.png \
93
 
        gm_whiteness_stock_data $(srcdir)/whiteness.png \
94
 
        gm_brightness_stock_data $(srcdir)/brightness.png \
95
 
        gm_colourness_stock_data $(srcdir)/colourness.png \
96
 
        gm_contrast_stock_data $(srcdir)/contrast.png \
97
 
        gm_connect_16_stock_data $(srcdir)/connect-16.png \
98
 
        gm_disconnect_16_stock_data $(srcdir)/disconnect-16.png \
99
 
        gm_calls_history_stock_data $(srcdir)/calls-history.png \
100
 
        gm_message_stock_data $(srcdir)/message.png
101
 
 
102
 
 
103
 
EMOTICONS= \
104
 
        gm_emoticon_face1 $(srcdir)/emoticon-face1.png \
105
 
        gm_emoticon_face2 $(srcdir)/emoticon-face2.png \
106
 
        gm_emoticon_face3 $(srcdir)/emoticon-face3.png \
107
 
        gm_emoticon_face4 $(srcdir)/emoticon-face4.png \
108
 
        gm_emoticon_face5 $(srcdir)/emoticon-face5.png \
109
 
        gm_emoticon_face6 $(srcdir)/emoticon-face6.png \
110
 
        gm_emoticon_face7 $(srcdir)/emoticon-face7.png \
111
 
        gm_emoticon_face8 $(srcdir)/emoticon-face8.png \
112
 
        gm_emoticon_face9 $(srcdir)/emoticon-face9.png \
113
 
        gm_emoticon_face10 $(srcdir)/emoticon-face10.png \
114
 
        gm_emoticon_face11 $(srcdir)/emoticon-face11.png \
115
 
        gm_emoticon_face12 $(srcdir)/emoticon-face12.png \
116
 
        gm_emoticon_face13 $(srcdir)/emoticon-face13.png \
117
 
        gm_emoticon_face14 $(srcdir)/emoticon-face14.png \
118
 
        gm_emoticon_face15 $(srcdir)/emoticon-face15.png \
119
 
        gm_emoticon_face16 $(srcdir)/emoticon-face16.png \
120
 
        gm_emoticon_face17 $(srcdir)/emoticon-face17.png \
121
 
        gm_emoticon_face18 $(srcdir)/emoticon-face18.png \
122
 
        gm_emoticon_face19 $(srcdir)/emoticon-face19.png \
123
 
        gm_emoticon_dead_happy $(srcdir)/emoticon-dead-happy.png \
124
 
        gm_emoticon_dead $(srcdir)/emoticon-dead.png \
125
 
        gm_emoticon_dead_sad $(srcdir)/emoticon-dead-sad.png \
126
 
        gm_emoticon_happy_devil $(srcdir)/emoticon-happy-devil.png \
127
 
        gm_emoticon_nose_glasses $(srcdir)/emoticon-happy-nose-glasses.png \
128
 
        gm_emoticon_sad_devil $(srcdir)/emoticon-sad-devil.png \
129
 
        gm_emoticon_sad_glasses $(srcdir)/emoticon-sad-glasses.png \
130
 
        gm_emoticon_sad_nose_glasses $(srcdir)/emoticon-sad-nose-glasses.png \
131
 
        gm_emoticon_happy_nose_glasses $(srcdir)/emoticon-happy-nose-glasses.png 
132
 
 
133
 
 
134
 
noinst_DATA = inlines.h inline_emoticons.h
135
 
 
136
 
EXTRA_DIST= $(pixmap_DATA) $(EMOTICONS_FILES) $(IMAGES_FILES) gm_both_incrusted_frame.xpm text_logo.xpm 
137
 
 
138
 
inlines.h: $(IMAGE_FILES) Makefile.am
 
90
        gm_message_stock_data $(srcdir)/message.png \
 
91
        gm_call_placed_stock_data $(srcdir)/call-placed.png \
 
92
        gm_call_received_stock_data $(srcdir)/call-received.png \
 
93
        gm_call_missed_stock_data $(srcdir)/call-missed.png \
 
94
        gm_call_transfer_stock_data $(srcdir)/call-transfer.png \
 
95
        gm_status_online_stock_data $(srcdir)/status-online.png \
 
96
        gm_status_offline_stock_data $(srcdir)/status-offline.png \
 
97
        gm_status_unknown_stock_data $(srcdir)/status-unknown.png \
 
98
        gm_status_dnd_stock_data $(srcdir)/status-dnd.png \
 
99
        gm_status_inacall_stock_data_16 $(srcdir)/16x16/multimedia-headset.png \
 
100
        gm_status_away_stock_data $(srcdir)/status-away.png \
 
101
        gm_phone_hang_up_stock_data_24 $(srcdir)/24x24/phone-hang-up.png \
 
102
        gm_phone_pick_up_stock_data_24 $(srcdir)/24x24/phone-pick-up.png \
 
103
        gm_phone_hang_up_stock_data_16 $(srcdir)/16x16/phone-hang-up.png \
 
104
        gm_phone_pick_up_stock_data_16 $(srcdir)/16x16/phone-pick-up.png 
 
105
 
 
106
 
 
107
noinst_DATA = inlines.h
 
108
 
 
109
BUILD_SOURCES = inlines.h
 
110
 
 
111
CLEANFILES = inlines.h
 
112
 
 
113
EXTRA_DIST= $(IMAGES_FILES)
 
114
 
 
115
inlines.h: $(IMAGE_FILES) $(nobase_dist_icon_DATA) Makefile.am
139
116
        gdk-pixbuf-csource --raw --build-list $(IMAGES) > inlines.h
140
117
 
141
 
inline_emoticons.h: $(EMOTICONS_FILES) Makefile.am
142
 
        gdk-pixbuf-csource --raw --build-list $(EMOTICONS) > inline_emoticons.h
 
118
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
119
 
 
120
install-data-hook: update-icon-cache
 
121
 
 
122
uninstall-hook: update-icon-cache
 
123
 
 
124
update-icon-cache:
 
125
        @-if test -z "$(DESTDIR)"; then \
 
126
                echo "Updating Gtk icon cache."; \
 
127
                $(gtk_update_icon_cache); \
 
128
        else \
 
129
                echo "*** Icon cache not updated.  After (un)install, run this:"; \
 
130
                echo "***   $(gtk_update_icon_cache)"; \
 
131
        fi
 
132