← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to pidgin/plugins/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
https://launchpad.net/bugs/316636
https://launchpad.net/bugs/336647
* 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:
pidgin/plugins/Makefile.in
206
206
CHECK_LIBS = @CHECK_LIBS@
207
207
CPP = @CPP@
208
208
CPPFLAGS = @CPPFLAGS@
 
209
CXX = @CXX@
 
210
CXXCPP = @CXXCPP@
 
211
CXXDEPMODE = @CXXDEPMODE@
 
212
CXXFLAGS = @CXXFLAGS@
209
213
CYGPATH_W = @CYGPATH_W@
210
214
DATADIRNAME = @DATADIRNAME@
211
215
DBUS_CFLAGS = @DBUS_CFLAGS@
219
223
DOT = @DOT@
220
224
DOXYGEN = @DOXYGEN@
221
225
DSYMUTIL = @DSYMUTIL@
222
 
DUMPBIN = @DUMPBIN@
223
226
DYNALOADER_A = @DYNALOADER_A@
224
227
DYNAMIC_BONJOUR_FALSE = @DYNAMIC_BONJOUR_FALSE@
225
228
DYNAMIC_BONJOUR_TRUE = @DYNAMIC_BONJOUR_TRUE@
252
255
DYNAMIC_YAHOO_TRUE = @DYNAMIC_YAHOO_TRUE@
253
256
DYNAMIC_ZEPHYR_FALSE = @DYNAMIC_ZEPHYR_FALSE@
254
257
DYNAMIC_ZEPHYR_TRUE = @DYNAMIC_ZEPHYR_TRUE@
 
258
ECHO = @ECHO@
255
259
ECHO_C = @ECHO_C@
256
260
ECHO_N = @ECHO_N@
257
261
ECHO_T = @ECHO_T@
271
275
EXEEXT = @EXEEXT@
272
276
EXTERNAL_LIBZEPHYR_FALSE = @EXTERNAL_LIBZEPHYR_FALSE@
273
277
EXTERNAL_LIBZEPHYR_TRUE = @EXTERNAL_LIBZEPHYR_TRUE@
274
 
FGREP = @FGREP@
 
278
F77 = @F77@
 
279
FFLAGS = @FFLAGS@
275
280
GADU_CFLAGS = @GADU_CFLAGS@
276
281
GADU_LIBS = @GADU_LIBS@
277
282
GCONFTOOL = @GCONFTOOL@
344
349
KRB4_CFLAGS = @KRB4_CFLAGS@
345
350
KRB4_LDFLAGS = @KRB4_LDFLAGS@
346
351
KRB4_LIBS = @KRB4_LIBS@
347
 
LD = @LD@
348
352
LDADD = @LDADD@
349
353
LDFLAGS = @LDFLAGS@
350
354
LIBOBJS = @LIBOBJS@
353
357
LIBTOOL = @LIBTOOL@
354
358
LIBXML_CFLAGS = @LIBXML_CFLAGS@
355
359
LIBXML_LIBS = @LIBXML_LIBS@
356
 
LIPO = @LIPO@
357
360
LN_S = @LN_S@
358
361
LTLIBOBJS = @LTLIBOBJS@
359
362
MAKEINFO = @MAKEINFO@
367
370
MSGMERGE = @MSGMERGE@
368
371
NETWORKMANAGER_CFLAGS = @NETWORKMANAGER_CFLAGS@
369
372
NETWORKMANAGER_LIBS = @NETWORKMANAGER_LIBS@
370
 
NM = @NM@
371
373
NMEDIT = @NMEDIT@
372
374
NSS_CFLAGS = @NSS_CFLAGS@
373
375
NSS_LIBS = @NSS_LIBS@
374
376
OBJEXT = @OBJEXT@
375
 
OTOOL = @OTOOL@
376
 
OTOOL64 = @OTOOL64@
377
377
PACKAGE = @PACKAGE@
378
378
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
379
379
PACKAGE_NAME = @PACKAGE_NAME@
486
486
ZEPHYR_LDFLAGS = @ZEPHYR_LDFLAGS@
487
487
ZEPHYR_LIBS = @ZEPHYR_LIBS@
488
488
ac_ct_CC = @ac_ct_CC@
489
 
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 
489
ac_ct_CXX = @ac_ct_CXX@
 
490
ac_ct_F77 = @ac_ct_F77@
490
491
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
491
492
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 
493
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 
494
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
492
495
am__include = @am__include@
493
496
am__leading_dot = @am__leading_dot@
494
497
am__quote = @am__quote@
522
525
libexecdir = @libexecdir@
523
526
localedir = @localedir@
524
527
localstatedir = @localstatedir@
525
 
lt_ECHO = @lt_ECHO@
526
528
mandir = @mandir@
527
529
mkdir_p = @mkdir_p@
528
530
oldincludedir = @oldincludedir@