~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to libpurple/protocols/msn/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-03-09 23:25:48 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20090309232548-f40pm5ooqwd64t0e
Tags: 1:2.5.5-1ubuntu1
* Merge from debian, remaining changes: (LP: #316636, #336647)
  - debian/control:
    + Add Build-Deps on liblaunchpad-integration-dev, intltool,
    network-manager-dev
    + Add epoch in dependencies
    + Drop the libpurple0 dependency on libpurple-bin
  - debian/libpurple0.symbols: add epoch to symbol
  - debian/pidgin-dbg.preinst, debian/pidgin-dev.preinst,
    debian/pidgin.preinst: add epoch
  - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/*, set /pidgin/plugins/loaded to load
    the notify plugin and enable the standard logging options by default
  - debian/rules:
    + remove --disable-nm as nm has been fixed in Ubuntu
    + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
      translation templates in common-install-impl::
  - debian/patches:
    + 02_lpi.patch for LP integration
    + 04_let_crasher_for_apport.patch to stop catching the SIGSEGV signal
      and let apport handle it
    + 05_default_to_irc_ubuntu_com.patch to set the default IRC
      server to irc.ubuntu.com
    + 70_autoconf.patch
    + 60_1024x600_gtk*.c.patch: Add scrolled bars into account dialog,
      pounce windows and preference window when screen height is less than 600.
* Adapt debian/patches/02_lpi.patch
* Re-generate debian/patches/70_autoconf.patch
* Remove debian/patches/fix-icons-backport-from-2.5.5mtn.diff as taken
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
124
124
CHECK_LIBS = @CHECK_LIBS@
125
125
CPP = @CPP@
126
126
CPPFLAGS = @CPPFLAGS@
 
127
CXX = @CXX@
 
128
CXXCPP = @CXXCPP@
 
129
CXXDEPMODE = @CXXDEPMODE@
 
130
CXXFLAGS = @CXXFLAGS@
127
131
CYGPATH_W = @CYGPATH_W@
128
132
DATADIRNAME = @DATADIRNAME@
129
133
DBUS_CFLAGS = @DBUS_CFLAGS@
137
141
DOT = @DOT@
138
142
DOXYGEN = @DOXYGEN@
139
143
DSYMUTIL = @DSYMUTIL@
140
 
DUMPBIN = @DUMPBIN@
141
144
DYNALOADER_A = @DYNALOADER_A@
142
145
DYNAMIC_BONJOUR_FALSE = @DYNAMIC_BONJOUR_FALSE@
143
146
DYNAMIC_BONJOUR_TRUE = @DYNAMIC_BONJOUR_TRUE@
170
173
DYNAMIC_YAHOO_TRUE = @DYNAMIC_YAHOO_TRUE@
171
174
DYNAMIC_ZEPHYR_FALSE = @DYNAMIC_ZEPHYR_FALSE@
172
175
DYNAMIC_ZEPHYR_TRUE = @DYNAMIC_ZEPHYR_TRUE@
 
176
ECHO = @ECHO@
173
177
ECHO_C = @ECHO_C@
174
178
ECHO_N = @ECHO_N@
175
179
ECHO_T = @ECHO_T@
189
193
EXEEXT = @EXEEXT@
190
194
EXTERNAL_LIBZEPHYR_FALSE = @EXTERNAL_LIBZEPHYR_FALSE@
191
195
EXTERNAL_LIBZEPHYR_TRUE = @EXTERNAL_LIBZEPHYR_TRUE@
192
 
FGREP = @FGREP@
 
196
F77 = @F77@
 
197
FFLAGS = @FFLAGS@
193
198
GADU_CFLAGS = @GADU_CFLAGS@
194
199
GADU_LIBS = @GADU_LIBS@
195
200
GCONFTOOL = @GCONFTOOL@
262
267
KRB4_CFLAGS = @KRB4_CFLAGS@
263
268
KRB4_LDFLAGS = @KRB4_LDFLAGS@
264
269
KRB4_LIBS = @KRB4_LIBS@
265
 
LD = @LD@
266
270
LDADD = @LDADD@
267
271
LDFLAGS = @LDFLAGS@
268
272
LIBOBJS = @LIBOBJS@
271
275
LIBTOOL = @LIBTOOL@
272
276
LIBXML_CFLAGS = @LIBXML_CFLAGS@
273
277
LIBXML_LIBS = @LIBXML_LIBS@
274
 
LIPO = @LIPO@
275
278
LN_S = @LN_S@
276
279
LTLIBOBJS = @LTLIBOBJS@
277
280
MAKEINFO = @MAKEINFO@
285
288
MSGMERGE = @MSGMERGE@
286
289
NETWORKMANAGER_CFLAGS = @NETWORKMANAGER_CFLAGS@
287
290
NETWORKMANAGER_LIBS = @NETWORKMANAGER_LIBS@
288
 
NM = @NM@
289
291
NMEDIT = @NMEDIT@
290
292
NSS_CFLAGS = @NSS_CFLAGS@
291
293
NSS_LIBS = @NSS_LIBS@
292
294
OBJEXT = @OBJEXT@
293
 
OTOOL = @OTOOL@
294
 
OTOOL64 = @OTOOL64@
295
295
PACKAGE = @PACKAGE@
296
296
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
297
297
PACKAGE_NAME = @PACKAGE_NAME@
404
404
ZEPHYR_LDFLAGS = @ZEPHYR_LDFLAGS@
405
405
ZEPHYR_LIBS = @ZEPHYR_LIBS@
406
406
ac_ct_CC = @ac_ct_CC@
407
 
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 
407
ac_ct_CXX = @ac_ct_CXX@
 
408
ac_ct_F77 = @ac_ct_F77@
408
409
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
409
410
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 
411
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 
412
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
410
413
am__include = @am__include@
411
414
am__leading_dot = @am__leading_dot@
412
415
am__quote = @am__quote@
440
443
libexecdir = @libexecdir@
441
444
localedir = @localedir@
442
445
localstatedir = @localstatedir@
443
 
lt_ECHO = @lt_ECHO@
444
446
mandir = @mandir@
445
447
mkdir_p = @mkdir_p@
446
448
oldincludedir = @oldincludedir@