← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to libpurple/protocols/silc/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:
libpurple/protocols/silc/Makefile.in
112
112
CHECK_LIBS = @CHECK_LIBS@
113
113
CPP = @CPP@
114
114
CPPFLAGS = @CPPFLAGS@
 
115
CXX = @CXX@
 
116
CXXCPP = @CXXCPP@
 
117
CXXDEPMODE = @CXXDEPMODE@
 
118
CXXFLAGS = @CXXFLAGS@
115
119
CYGPATH_W = @CYGPATH_W@
116
120
DATADIRNAME = @DATADIRNAME@
117
121
DBUS_CFLAGS = @DBUS_CFLAGS@
125
129
DOT = @DOT@
126
130
DOXYGEN = @DOXYGEN@
127
131
DSYMUTIL = @DSYMUTIL@
128
 
DUMPBIN = @DUMPBIN@
129
132
DYNALOADER_A = @DYNALOADER_A@
130
133
DYNAMIC_BONJOUR_FALSE = @DYNAMIC_BONJOUR_FALSE@
131
134
DYNAMIC_BONJOUR_TRUE = @DYNAMIC_BONJOUR_TRUE@
158
161
DYNAMIC_YAHOO_TRUE = @DYNAMIC_YAHOO_TRUE@
159
162
DYNAMIC_ZEPHYR_FALSE = @DYNAMIC_ZEPHYR_FALSE@
160
163
DYNAMIC_ZEPHYR_TRUE = @DYNAMIC_ZEPHYR_TRUE@
 
164
ECHO = @ECHO@
161
165
ECHO_C = @ECHO_C@
162
166
ECHO_N = @ECHO_N@
163
167
ECHO_T = @ECHO_T@
177
181
EXEEXT = @EXEEXT@
178
182
EXTERNAL_LIBZEPHYR_FALSE = @EXTERNAL_LIBZEPHYR_FALSE@
179
183
EXTERNAL_LIBZEPHYR_TRUE = @EXTERNAL_LIBZEPHYR_TRUE@
180
 
FGREP = @FGREP@
 
184
F77 = @F77@
 
185
FFLAGS = @FFLAGS@
181
186
GADU_CFLAGS = @GADU_CFLAGS@
182
187
GADU_LIBS = @GADU_LIBS@
183
188
GCONFTOOL = @GCONFTOOL@
250
255
KRB4_CFLAGS = @KRB4_CFLAGS@
251
256
KRB4_LDFLAGS = @KRB4_LDFLAGS@
252
257
KRB4_LIBS = @KRB4_LIBS@
253
 
LD = @LD@
254
258
LDADD = @LDADD@
255
259
LDFLAGS = @LDFLAGS@
256
260
LIBOBJS = @LIBOBJS@
259
263
LIBTOOL = @LIBTOOL@
260
264
LIBXML_CFLAGS = @LIBXML_CFLAGS@
261
265
LIBXML_LIBS = @LIBXML_LIBS@
262
 
LIPO = @LIPO@
263
266
LN_S = @LN_S@
264
267
LTLIBOBJS = @LTLIBOBJS@
265
268
MAKEINFO = @MAKEINFO@
273
276
MSGMERGE = @MSGMERGE@
274
277
NETWORKMANAGER_CFLAGS = @NETWORKMANAGER_CFLAGS@
275
278
NETWORKMANAGER_LIBS = @NETWORKMANAGER_LIBS@
276
 
NM = @NM@
277
279
NMEDIT = @NMEDIT@
278
280
NSS_CFLAGS = @NSS_CFLAGS@
279
281
NSS_LIBS = @NSS_LIBS@
280
282
OBJEXT = @OBJEXT@
281
 
OTOOL = @OTOOL@
282
 
OTOOL64 = @OTOOL64@
283
283
PACKAGE = @PACKAGE@
284
284
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
285
285
PACKAGE_NAME = @PACKAGE_NAME@
392
392
ZEPHYR_LDFLAGS = @ZEPHYR_LDFLAGS@
393
393
ZEPHYR_LIBS = @ZEPHYR_LIBS@
394
394
ac_ct_CC = @ac_ct_CC@
395
 
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 
395
ac_ct_CXX = @ac_ct_CXX@
 
396
ac_ct_F77 = @ac_ct_F77@
396
397
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
397
398
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 
399
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 
400
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
398
401
am__include = @am__include@
399
402
am__leading_dot = @am__leading_dot@
400
403
am__quote = @am__quote@
428
431
libexecdir = @libexecdir@
429
432
localedir = @localedir@
430
433
localstatedir = @localstatedir@
431
 
lt_ECHO = @lt_ECHO@
432
434
mandir = @mandir@
433
435
mkdir_p = @mkdir_p@
434
436
oldincludedir = @oldincludedir@