← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to libempathy-gtk/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/Makefile.am
8
8
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
9
9
        -DGCR_API_SUBJECT_TO_CHANGE                     \
10
10
        $(EMPATHY_CFLAGS)                               \
11
 
        $(GTK_CFLAGS)                           \
12
 
        $(LIBNOTIFY_CFLAGS)                             \
13
 
        $(CANBERRA_CFLAGS) \
14
 
        $(YELL_CFLAGS)                                  \
15
11
        $(ENCHANT_CFLAGS)                               \
16
12
        $(LIBCHAMPLAIN_CFLAGS)                          \
17
13
        $(GEOCLUE_CFLAGS)                               \
18
 
        $(GCR_CFLAGS)                                   \
19
 
        $(MEEGO_CFLAGS)                         \
 
14
        $(MEEGO_CFLAGS)                                 \
20
15
        $(WEBKIT_CFLAGS)                                \
21
16
        $(WARN_CFLAGS)                                  \
22
17
        $(DISABLE_DEPRECATED)
38
33
        empathy-account-widget.c                \
39
34
        empathy-avatar-chooser.c                \
40
35
        empathy-avatar-image.c                  \
41
 
        empathy-call-utils.c                    \
42
36
        empathy-cell-renderer-activatable.c     \
43
37
        empathy-cell-renderer-expander.c        \
44
38
        empathy-cell-renderer-text.c            \
66
60
        empathy-individual-store.c              \
67
61
        empathy-individual-view.c               \
68
62
        empathy-individual-widget.c             \
 
63
        empathy-input-text-view.c               \
69
64
        empathy-irc-network-chooser.c \
70
65
        empathy-irc-network-chooser-dialog.c \
71
66
        empathy-irc-network-dialog.c            \
72
 
        empathy-kludge-label.c                  \
73
67
        empathy-log-window.c                    \
74
68
        empathy-new-message-dialog.c            \
75
69
        empathy-new-call-dialog.c               \
82
76
        empathy-search-bar.c                    \
83
77
        empathy-share-my-desktop.c              \
84
78
        empathy-smiley-manager.c                \
85
 
        empathy-sound.c                         \
 
79
        empathy-sound-manager.c                 \
86
80
        empathy-spell.c                         \
87
81
        empathy-status-preset-dialog.c          \
88
82
        empathy-string-parser.c                 \
90
84
        empathy-theme-irc.c                     \
91
85
        empathy-theme-manager.c                 \
92
86
        empathy-tls-dialog.c                    \
93
 
        empathy-ui-utils.c                      \
94
 
        $(NULL)
 
87
        empathy-ui-utils.c
95
88
 
96
89
libempathy_gtk_headers =                        \
97
90
        empathy-account-chooser.h               \
100
93
        empathy-account-widget.h                \
101
94
        empathy-avatar-chooser.h                \
102
95
        empathy-avatar-image.h                  \
103
 
        empathy-call-utils.h                    \
104
96
        empathy-cell-renderer-activatable.h     \
105
97
        empathy-cell-renderer-expander.h        \
106
98
        empathy-cell-renderer-text.h            \
129
121
        empathy-individual-store.h              \
130
122
        empathy-individual-view.h               \
131
123
        empathy-individual-widget.h             \
 
124
        empathy-input-text-view.h               \
132
125
        empathy-irc-network-chooser.h \
133
126
        empathy-irc-network-chooser-dialog.h \
134
127
        empathy-irc-network-dialog.h            \
135
 
        empathy-kludge-label.h                  \
136
128
        empathy-log-window.h                    \
137
129
        empathy-new-message-dialog.h            \
138
130
        empathy-new-call-dialog.h               \
145
137
        empathy-search-bar.h                    \
146
138
        empathy-share-my-desktop.h              \
147
139
        empathy-smiley-manager.h                \
148
 
        empathy-sound.h                         \
 
140
        empathy-sound-manager.h                 \
149
141
        empathy-spell.h                         \
150
142
        empathy-status-preset-dialog.h          \
151
143
        empathy-string-parser.h                 \
153
145
        empathy-theme-irc.h                     \
154
146
        empathy-theme-manager.h                 \
155
147
        empathy-tls-dialog.h                    \
156
 
        empathy-ui-utils.h                      \
157
 
        $(NULL)
 
148
        empathy-ui-utils.h
158
149
 
159
150
libempathy_gtk_la_SOURCES =                     \
160
151
        $(libempathy_gtk_handwritten_source)    \
161
152
        $(libempathy_gtk_headers)               \
162
 
        gcr-simple-certificate.c gcr-simple-certificate.h \
163
 
        mx-gtk-light-switch.c mx-gtk-light-switch.h \
164
153
        totem-subtitle-encoding.c totem-subtitle-encoding.h
165
154
 
166
155
# do not distribute generated files
169
158
 
170
159
libempathy_gtk_la_LIBADD =                      \
171
160
        $(EMPATHY_LIBS)                 \
172
 
        $(EMPATHY_LIBS)                 \
173
161
        $(GTK_LIBS)                     \
174
162
        $(LIBNOTIFY_LIBS)                       \
175
163
        $(CANBERRA_LIBS) \