~bryce/xchat-gnome/cherrypicks

« back to all changes in this revision

Viewing changes to debian/patches/01_link_libice.patch

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2011-07-05 16:27:43 UTC
  • Revision ID: mathieu-tl@ubuntu.com-20110705162743-24567uyy50uf36yr
* Merge with Debian unstable, remaining changes: (LP: #773847)
  - debian/control:
    - add Build-Depends on liblaunchpad-integration-dev.
    - xchat-gnome Suggests: xchat-gnome-indicator.
  - debian/patches/02_lpi.patch: add Launchpad integration items to the help
    menu
  - debian/patches/10_xchat-gnome-close-event.patch: add events for window
    close.
  - debian/patches/04_autojoin_ubuntu_chan.patch: add the Ubuntu network
    as default selection and default to autojoining #ubuntu.
  - debian/patches/20_add_gui_focus.patch: implement GUI focus from XChat.
  - debian/patches/51_freenode_default_port_8001.patch: Drop ports 666x
    for FreeNode to workaround a possible DCC exploit.
  - debian/patches/95_apturl-support.patch: support apt://-urls.
  - debian/watch: also look for unstable versions
  - debian/xchat-gnome.gconf-defaults: Set the default enabled plugins,
    indicator, netmonitor, and notifyosd.
* debian/patches/52_no_zero_width_pixmaps.patch: dropped, applied upstream.
* debian/patches/98_ice_depends_for_eggsmclient.patch: replaced by
  01_link_libice.patch.
* debian/control: remove duplicate entry in Build-Depends for intltool.
* debian/xchat-gnome.install: also install the xchat-gnome.desktop file from
  /usr/share/applications in xchat-gnome rather than xchat-gnome-common.
  (LP: #374686)
* debian/rules: update the xchat-gnome-common binary-install target to not
  keep a duplicate copy of the xchat-gnome.desktop file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Index: xchat-gnome-0.26.2~git20100421.29cc76/configure.ac
 
2
===================================================================
 
3
--- xchat-gnome-0.26.2~git20100421.29cc76.orig/configure.ac     2011-04-21 23:50:16.761167639 +0200
 
4
+++ xchat-gnome-0.26.2~git20100421.29cc76/configure.ac  2011-04-21 23:50:26.957217481 +0200
 
5
@@ -72,6 +72,7 @@ PKG_CHECK_MODULES([DEPENDENCIES], [\
 
6
 PKG_CHECK_MODULES([EGG_SMCLIENT], [\
 
7
                   gtk+-2.0 >= $GTK_REQUIRED \
 
8
                   sm >= $SM_REQUIRED \
 
9
+                  ice \
 
10
                   ])
 
11
 
 
12
 #D-Bus