← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to pidgin/plugins/gestures/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/gestures/Makefile.in
104
104
CHECK_LIBS = @CHECK_LIBS@
105
105
CPP = @CPP@
106
106
CPPFLAGS = @CPPFLAGS@
 
107
CXX = @CXX@
 
108
CXXCPP = @CXXCPP@
 
109
CXXDEPMODE = @CXXDEPMODE@
 
110
CXXFLAGS = @CXXFLAGS@
107
111
CYGPATH_W = @CYGPATH_W@
108
112
DATADIRNAME = @DATADIRNAME@
109
113
DBUS_CFLAGS = @DBUS_CFLAGS@
117
121
DOT = @DOT@
118
122
DOXYGEN = @DOXYGEN@
119
123
DSYMUTIL = @DSYMUTIL@
120
 
DUMPBIN = @DUMPBIN@
121
124
DYNALOADER_A = @DYNALOADER_A@
122
125
DYNAMIC_BONJOUR_FALSE = @DYNAMIC_BONJOUR_FALSE@
123
126
DYNAMIC_BONJOUR_TRUE = @DYNAMIC_BONJOUR_TRUE@
150
153
DYNAMIC_YAHOO_TRUE = @DYNAMIC_YAHOO_TRUE@
151
154
DYNAMIC_ZEPHYR_FALSE = @DYNAMIC_ZEPHYR_FALSE@
152
155
DYNAMIC_ZEPHYR_TRUE = @DYNAMIC_ZEPHYR_TRUE@
 
156
ECHO = @ECHO@
153
157
ECHO_C = @ECHO_C@
154
158
ECHO_N = @ECHO_N@
155
159
ECHO_T = @ECHO_T@
169
173
EXEEXT = @EXEEXT@
170
174
EXTERNAL_LIBZEPHYR_FALSE = @EXTERNAL_LIBZEPHYR_FALSE@
171
175
EXTERNAL_LIBZEPHYR_TRUE = @EXTERNAL_LIBZEPHYR_TRUE@
172
 
FGREP = @FGREP@
 
176
F77 = @F77@
 
177
FFLAGS = @FFLAGS@
173
178
GADU_CFLAGS = @GADU_CFLAGS@
174
179
GADU_LIBS = @GADU_LIBS@
175
180
GCONFTOOL = @GCONFTOOL@
242
247
KRB4_CFLAGS = @KRB4_CFLAGS@
243
248
KRB4_LDFLAGS = @KRB4_LDFLAGS@
244
249
KRB4_LIBS = @KRB4_LIBS@
245
 
LD = @LD@
246
250
LDADD = @LDADD@
247
251
LDFLAGS = @LDFLAGS@
248
252
LIBOBJS = @LIBOBJS@
251
255
LIBTOOL = @LIBTOOL@
252
256
LIBXML_CFLAGS = @LIBXML_CFLAGS@
253
257
LIBXML_LIBS = @LIBXML_LIBS@
254
 
LIPO = @LIPO@
255
258
LN_S = @LN_S@
256
259
LTLIBOBJS = @LTLIBOBJS@
257
260
MAKEINFO = @MAKEINFO@
265
268
MSGMERGE = @MSGMERGE@
266
269
NETWORKMANAGER_CFLAGS = @NETWORKMANAGER_CFLAGS@
267
270
NETWORKMANAGER_LIBS = @NETWORKMANAGER_LIBS@
268
 
NM = @NM@
269
271
NMEDIT = @NMEDIT@
270
272
NSS_CFLAGS = @NSS_CFLAGS@
271
273
NSS_LIBS = @NSS_LIBS@
272
274
OBJEXT = @OBJEXT@
273
 
OTOOL = @OTOOL@
274
 
OTOOL64 = @OTOOL64@
275
275
PACKAGE = @PACKAGE@
276
276
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
277
277
PACKAGE_NAME = @PACKAGE_NAME@
384
384
ZEPHYR_LDFLAGS = @ZEPHYR_LDFLAGS@
385
385
ZEPHYR_LIBS = @ZEPHYR_LIBS@
386
386
ac_ct_CC = @ac_ct_CC@
387
 
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 
387
ac_ct_CXX = @ac_ct_CXX@
 
388
ac_ct_F77 = @ac_ct_F77@
388
389
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
389
390
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 
391
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 
392
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
390
393
am__include = @am__include@
391
394
am__leading_dot = @am__leading_dot@
392
395
am__quote = @am__quote@
420
423
libexecdir = @libexecdir@
421
424
localedir = @localedir@
422
425
localstatedir = @localstatedir@
423
 
lt_ECHO = @lt_ECHO@
424
426
mandir = @mandir@
425
427
mkdir_p = @mkdir_p@
426
428
oldincludedir = @oldincludedir@