← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to m4macros/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:
m4macros/Makefile.in
83
83
CHECK_LIBS = @CHECK_LIBS@
84
84
CPP = @CPP@
85
85
CPPFLAGS = @CPPFLAGS@
 
86
CXX = @CXX@
 
87
CXXCPP = @CXXCPP@
 
88
CXXDEPMODE = @CXXDEPMODE@
 
89
CXXFLAGS = @CXXFLAGS@
86
90
CYGPATH_W = @CYGPATH_W@
87
91
DATADIRNAME = @DATADIRNAME@
88
92
DBUS_CFLAGS = @DBUS_CFLAGS@
96
100
DOT = @DOT@
97
101
DOXYGEN = @DOXYGEN@
98
102
DSYMUTIL = @DSYMUTIL@
99
 
DUMPBIN = @DUMPBIN@
100
103
DYNALOADER_A = @DYNALOADER_A@
101
104
DYNAMIC_BONJOUR_FALSE = @DYNAMIC_BONJOUR_FALSE@
102
105
DYNAMIC_BONJOUR_TRUE = @DYNAMIC_BONJOUR_TRUE@
129
132
DYNAMIC_YAHOO_TRUE = @DYNAMIC_YAHOO_TRUE@
130
133
DYNAMIC_ZEPHYR_FALSE = @DYNAMIC_ZEPHYR_FALSE@
131
134
DYNAMIC_ZEPHYR_TRUE = @DYNAMIC_ZEPHYR_TRUE@
 
135
ECHO = @ECHO@
132
136
ECHO_C = @ECHO_C@
133
137
ECHO_N = @ECHO_N@
134
138
ECHO_T = @ECHO_T@
148
152
EXEEXT = @EXEEXT@
149
153
EXTERNAL_LIBZEPHYR_FALSE = @EXTERNAL_LIBZEPHYR_FALSE@
150
154
EXTERNAL_LIBZEPHYR_TRUE = @EXTERNAL_LIBZEPHYR_TRUE@
151
 
FGREP = @FGREP@
 
155
F77 = @F77@
 
156
FFLAGS = @FFLAGS@
152
157
GADU_CFLAGS = @GADU_CFLAGS@
153
158
GADU_LIBS = @GADU_LIBS@
154
159
GCONFTOOL = @GCONFTOOL@
221
226
KRB4_CFLAGS = @KRB4_CFLAGS@
222
227
KRB4_LDFLAGS = @KRB4_LDFLAGS@
223
228
KRB4_LIBS = @KRB4_LIBS@
224
 
LD = @LD@
225
229
LDADD = @LDADD@
226
230
LDFLAGS = @LDFLAGS@
227
231
LIBOBJS = @LIBOBJS@
230
234
LIBTOOL = @LIBTOOL@
231
235
LIBXML_CFLAGS = @LIBXML_CFLAGS@
232
236
LIBXML_LIBS = @LIBXML_LIBS@
233
 
LIPO = @LIPO@
234
237
LN_S = @LN_S@
235
238
LTLIBOBJS = @LTLIBOBJS@
236
239
MAKEINFO = @MAKEINFO@
244
247
MSGMERGE = @MSGMERGE@
245
248
NETWORKMANAGER_CFLAGS = @NETWORKMANAGER_CFLAGS@
246
249
NETWORKMANAGER_LIBS = @NETWORKMANAGER_LIBS@
247
 
NM = @NM@
248
250
NMEDIT = @NMEDIT@
249
251
NSS_CFLAGS = @NSS_CFLAGS@
250
252
NSS_LIBS = @NSS_LIBS@
251
253
OBJEXT = @OBJEXT@
252
 
OTOOL = @OTOOL@
253
 
OTOOL64 = @OTOOL64@
254
254
PACKAGE = @PACKAGE@
255
255
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
256
256
PACKAGE_NAME = @PACKAGE_NAME@
363
363
ZEPHYR_LDFLAGS = @ZEPHYR_LDFLAGS@
364
364
ZEPHYR_LIBS = @ZEPHYR_LIBS@
365
365
ac_ct_CC = @ac_ct_CC@
366
 
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 
366
ac_ct_CXX = @ac_ct_CXX@
 
367
ac_ct_F77 = @ac_ct_F77@
367
368
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
368
369
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 
370
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 
371
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
369
372
am__include = @am__include@
370
373
am__leading_dot = @am__leading_dot@
371
374
am__quote = @am__quote@
399
402
libexecdir = @libexecdir@
400
403
localedir = @localedir@
401
404
localstatedir = @localstatedir@
402
 
lt_ECHO = @lt_ECHO@
403
405
mandir = @mandir@
404
406
mkdir_p = @mkdir_p@
405
407
oldincludedir = @oldincludedir@