~ubuntu-branches/ubuntu/intrepid/pidgin/intrepid-security

« back to all changes in this revision

Viewing changes to pidgin/pixmaps/emotes/default/24/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-04-04 02:18:00 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20080404021800-qaa00wom38gd7xus
Tags: 1:2.4.1-1ubuntu1
* Sync with Debian, remaining Ubuntu changes; (LP: #211769)
  - debian/control:
    + Set Maintainer to Ubuntu Core Developers.
    + Add build-deps on liblaunchpad-integration-dev, intltool,
      libnm-glib-dev (for --enable-nm)
    + Drop build-deps on libsilc-1.1-2-dev | libsilc-dev (>= 1.1.1) as
      this library is in universe.
    + Drop the libpurple0 recommends on libpurple-bin.
    + Add a gaim transitionnal package for upgrades.
    + Moved finch's libx11-6 dependency to Suggests
  - Ship compatibility symlinks via debian/gaim.links
  - debian/rules:
    + Pass --enable-nm to configure to enable NetworkManager support
    + Pass --disable-silc to configure to disable silc support even if
      it's installed in the build environment.
    + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
      translation templates in common-install-impl::.
    + Added necessary arguments to dh_shlibdeps for finch
  - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/* and set /pidgin/plugins/loaded to load
    the notify plugin
  - debian/patches:
    + 02_lpi for LP integration
    + 04_let_crasher_for_apport to stop catching the SIGSEGV signal
      and let apport handle it
    + 05_default_to_irc_ubuntu_com to set the default IRC
      server to irc.ubuntu.com.
    + 70_autoconf patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
190
190
    yin-yang.png
191
191
 
192
192
 
 
193
pidginsmileypix_in_files = default.theme.in
 
194
 
 
195
if INSTALL_PIXMAPS
193
196
pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/default
194
 
pidginsmileypix_in_files = default.theme.in
195
197
pidginsmileypix_DATA = \
196
198
        $(SMILEYS) \
197
199
        theme
201
203
            -e 's/^_Description=/Description=/' \
202
204
            -e 's/^_Author=/Author=/' \
203
205
        $< > $@
 
206
endif
204
207
 
205
 
EXTRA_DIST = $(pidginsmileypix_DATA) $(pidginsmileypix_in_files)
 
208
EXTRA_DIST = $(SMILEYS) $(pidginsmileypix_in_files) theme