Show
Ignore:
Timestamp:
01/06/07 12:00:50 (2 years ago)
Author:
asterix
Message:

merge changeset from trunk except pyopenssl stuff

Location:
branches/gajim_0.11/debian
Files:
1 removed
4 modified
1 copied

Legend:

Unmodified
Added
Removed

  • branches/gajim_0.11/debian/changelog

    r7204 r7787  
     1gajim (0.11-1) unstable; urgency=low 
     2 
     3  * New upstream release. Closes: #403806 
     4  * Enable IPv6 support. Closes: #386062 
     5  * Fix popup-menu binding. Closes: #388564 
     6  * Fix quick access letter with spanish translation. Closes: #385410 
     7  * Fix typo in german translation. Closes: #398195 
     8  * Fix a bug with Gaim avatars. Closes: #398911 
     9 
     10 -- Yann Le Boulanger <asterix@lagaule.org>  Tue, 19 Dec 2006 14:25:32 +0100 
     11 
    112gajim (0.10.1-6) unstable; urgency=low 
    213 

  • branches/gajim_0.11/debian/control

    r7204 r7787  
    33Priority: optional 
    44Maintainer: Yann Le Boulanger <asterix@lagaule.org> 
    5 Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.3), python2.4-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev, intltool 
     5Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.3), python2.4-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev, intltool, imagemagick, python-central (>= 0.5) 
     6Build-Conflicts: python2.3 
    67XS-Python-Version: 2.4 
    78Standards-Version: 3.7.2 
    … …  
    1213Depends: ${python:Depends}, python2.4, python-glade2 (>= 2.6.0), python-gtk2 (>= 2.6.0), python2.4-pysqlite2 
    1314Recommends: dnsutils, dbus, python2.4-dbus, notification-daemon 
    14 Suggests: python-gnome2, python-gnupginterface, nautilus-sendto, avahi-daemon, python-avahi 
     15Suggests: python-gnome2, python-gnupginterface, nautilus-sendto, avahi-daemon, python-avahi, network-manager 
    1516Description: Jabber client written in PyGTK 
    1617 Gajim is a Jabber client. It has a tabbed user interface with normal chats, 

  • branches/gajim_0.11/debian/dirs

    r2111 r7787  
    55usr/share/applications 
    66usr/share/menu 
     7usr/share/lintian/overrides 
    78usr/lib/gajim 

  • branches/gajim_0.11/debian/rules

    r7204 r7787  
    1616        rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py 
    1717        dh_pycentral -pgajim 
    18         dh_python -pgajim /usr/share/gajim/src 
     18        convert $(DEB_DESTDIR)/usr/share/pixmaps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm 
     19        install -m 0644 debian/gajim.lintian $(DEB_DESTDIR)/usr/share/lintian/overrides/gajim