--- gajim-0.12.1.orig/debian/changelog +++ gajim-0.12.1/debian/changelog @@ -0,0 +1,545 @@ +gajim (0.12.1-0ubuntu2~hardy1) hardy-backports; urgency=low + + * Automated backport upload; no source changes. + + -- Jonathan Davies Mon, 02 Mar 2009 12:34:24 +0000 + +gajim (0.12.1-0ubuntu2) jaunty; urgency=low + + * Don't use actions in notifications if the server doesn't support them. + (LP: #328615) + + -- James Westby Wed, 25 Feb 2009 13:31:57 +0000 + +gajim (0.12.1-0ubuntu1) jaunty; urgency=low + + * New upstream bugfix release: + + Fix filetransfer + + Updated german translation + + Fix click on notifications when text string is empty + + Improve systray popup menu + + -- Nafallo Bjälevik Wed, 24 Dec 2008 17:00:00 +0000 + +gajim (0.12-0ubuntu1) jaunty; urgency=low + + * New upstream release: + + Fix text rendering in notifications + + Better sessions support + + Better auto-away support + + Fix banshee support + + Quodlibet support + + Fix GSSAPI authentification + + Those translations have been temporarily removed because they are outdated: + Breton (br), Greek (el), Dutch (nl), Portugese (pt). + * debian/control: + - Added python-kerberos (>= 1.1) to Recommends for the GSSAPI auth. + + -- Nafallo Bjälevik Wed, 17 Dec 2008 12:08:19 +0000 + +gajim (0.12~beta1-0ubuntu1) jaunty; urgency=low + + * New upstream beta release: + + Security improvements: End-to-End encryption, SSL certificat verification + + Ability to minimize groupchats in roster + + Chat to groupchat transformation + + Block/Unblock contacts directly from roster + + Single window mode + + PEP support (User activity, mood and tune) + + Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism + + Improve GUI of some windows + + Fix handling of invalid XML + + Fix freeze on connection + * Dropped all changes, patches and backports. + * src/common/passwords.py: + - Change keyring to 'login', which is what gets unlocked at login. + * debian/copyright: + - Updated for the GPL-3 change and for the amount of upstream authors. + * debian/control: + - Update Standards-Version and drop XS for Vcs-Bzr. + - Add Homepage and use ${shlibs:Depends}. + * debian/rules: + - Update to not ignore errors from make clean. + - Update with dh_shlibdeps. + + -- Nafallo Bjälevik Sun, 16 Nov 2008 00:26:27 +0000 + +gajim (0.11.4-0ubuntu2) hardy; urgency=low + + * Fix the html entities to be escaped too many times in notification popup + (taken from upstream) (LP: #205973) + + -- Laurent Bigonville Sat, 12 Jul 2008 13:23:49 +0200 + +gajim (0.11.4-0ubuntu1build1) intrepid; urgency=low + + * Rebuild the package to fix systray icon issue (LP: #240215) + + -- Laurent Bigonville Tue, 01 Jul 2008 22:52:05 +0200 + +gajim (0.11.4-0ubuntu1) hardy; urgency=low + + * New upstream release: + + Fix /nick command in groupchats + + Better Metacontacts sorting + + Fix Ctrl + PageUP/Down behaviour + + Fix saving files from filetransfer under windows + * Merge our changes, patches and backports + + -- Nafallo Bjälevik Thu, 06 Dec 2007 22:28:50 +0000 + +gajim (0.11.3-0ubuntu1) hardy; urgency=low + + * New upstream release: + - Fix bookmarks support detection + - Improve file transfer on windows + - Fix some zeroconf bugs + - Fix focus bug in chat window + - Fix nickname changement behaviour in groupchats + * Merge our changes, patches and backports + * po/de.po: + - Removed the fuzzy and the dots for a translation (LP: #162584) + + -- Nafallo Bjälevik Sat, 17 Nov 2007 13:26:57 +0000 + +gajim (0.11.2-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: + - Change bazaar.launchpad.net to code.launchpad.net + - Change the recommend on dbus-glib to python-dbus (LP: #152333) + * src/common/zeroconf/connection_zeroconf.py: + - Apply patch from Stefan Bethge to fix an IndexError (LP: #151568) + + -- Nafallo Bjälevik Wed, 07 Nov 2007 10:40:57 +0000 + +gajim (0.11.2-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - Improve idle, transports support + - Enable ellipsization in roster and chatwindow + - Fixed some metacontacts problems (#2156, #2761) + - Better support of XEP-0070 (Verifying HTTP Requests via XMPP) + - Make the same height of a banner for all chat tabs + - Fix a bug with french translation and invitations (#3043) + - Fix a bug with UTF-8 and emoticons + - Corrected many bugs with passwords and gnome-keyring + - Improve xhtml-im and pictures support + - Improve Ad-Hoc support + - And many other bufixes + * Merge our changes and patches + + -- Nafallo Bjälevik Tue, 02 Oct 2007 00:19:08 +0100 + +gajim (0.11.1-0ubuntu6) gutsy; urgency=low + + * src/common/passwords.py: + - fixed issue with gnome-keyring DeniedError. + see: http://trac.gajim.org/changeset/8701 + It appears only, when there is no keyring available. + + -- Stephan Hermann Sat, 08 Sep 2007 11:43:03 +0200 + +gajim (0.11.1-0ubuntu5) gutsy; urgency=low + + * debian/control: + - Remove python-gnome2 from Suggests and add python-gnomecanvas + to binary Depends (LP: #125957). + * src/network_manager_listener.py: + - Fix bug in 0.11.1 where Gajim failed the interaction with NM + (LP: #116184) (Thanks Stefan Bethge). + - Apply upstream changeset 7718 for this. + * src/common/zeroconf/connection_zeroconf.py: + - Backport the function _disconnectedReconnCB for the above. + + -- Nafallo Bjälevik Sat, 21 Jul 2007 12:31:09 +0200 + +gajim (0.11.1-0ubuntu4) gutsy; urgency=low + + * po/fr.po: + - Fix bug that breaks invitation with the french translation. + (LP: #114301) + - Apply upstream changeset 8022 for this. + + -- Christian Bjälevik Thu, 21 Jun 2007 19:03:17 +0200 + +gajim (0.11.1-0ubuntu3) feisty; urgency=low + + * src/roaster_window.py: + - Remove "" around %(title)s to fix error when reporting + which song you're playing. + * src/{roster_window,music_track_listener}.py: + - music_track_listener for Banshee was crashing internally + if Banshee was closed while listening. + - Apply upstream changeset 8007 to fix the above problem. + * src/roaster_window.py: + - if gajim is quit while roster was hidden, start gajim with + roster minimized next time. + - Apply upstream changeset 7973. + * src/common/contacts.py, src/roaster_window.py: + - when we compare 2 offline contacts, the one which has a + status messages is shown above the one without. + - Apply upstream changeset 8006. + * src/common/config.py, src/roaster_window.py: + - add an ACE option to disable the fact that gajim auto-expand + and selects the contact who sent last message. + - Apply upstream changeset 8015. + * data/glade/gc_control_popup_menu.glade, src/dialogs.py, + src/common/connection_handlers.py, src/common/connection.py, + src/groupchat_control.py, data/glade/dubbleinput_dialog.glade: + - ability to destroy a room when we are owner, give a reason and + alternative room jid. + - Apply upstream changesets 8010 and 8011 to support XEP-0045. + + -- Christian Bjälevik Tue, 20 Mar 2007 15:58:16 +0100 + +gajim (0.11.1-0ubuntu2) feisty; urgency=low + + * debian/control: + - Remove XSBC-Original-Maintainer and finally make myself Maintainer. + We have diverged from Debian since the beginning of this package and + doesn't even have the same packaging they do. + * po/pl.po: + - s/\·/\ /g again... *sighs* + * src/dialogs.py: + - Applied dropped patch to open Debianspecific copyright path. + * src/roster_window.py: + - Re-add LaunchpadIntegration. + + -- Christian Bjälevik Sat, 3 Mar 2007 04:42:21 +0100 + +gajim (0.11.1-0ubuntu1) feisty; urgency=low + + * New upstream release (LP: #86318 and LP: #80770) + * Set Ubuntu maintainer + + -- Emilio Pozuelo Monfort Thu, 22 Feb 2007 20:05:52 +0100 + +gajim (0.11-0ubuntu1) feisty; urgency=low + + * New upstream release: + + Changes: + http://trac.gajim.org/browser/branches/gajim_0.11/ChangeLog + + Bugs fixed: + http://trac.gajim.org/query?status=closed&milestone=0.11 + * debian/compat: 4 -> 5. + * debian/pycompat: Add with value 2. + * debian/control: + - Standards-Version 3.7.2, no changes needed. + - Added dbus-glib and python-avahi to Recommends for link-local + messaging (avahi). + - Bump python-g* from >= 2.4.0 to 2.6.0. + - Bump debhelper from >= 4.0.0 to 5.0.37.2. + - Added libdbus-1-dev to Build-Depends. + * debian/rules: + - Use configure. Upstream changed to GNU automake. + + -- Christian Bjälevik Wed, 20 Dec 2006 05:10:09 +0100 + +gajim (0.10.1-0ubuntu5) edgy; urgency=low + + * po/{de,pl}.po: s/\·/\ /g. Translators should now this... + Closes: Ubuntu #66291. + + -- Christian Bjälevik Wed, 18 Oct 2006 21:37:59 +0200 + +gajim (0.10.1-0ubuntu4) edgy; urgency=low + + * src/common/connection_handlers.py: + - Applied changeset 6606 and 6685 from upstream SVN. + Closes Ubuntu: #44321 + + -- Christian Bjälevik Mon, 18 Sep 2006 20:52:35 +0200 + +gajim (0.10.1-0ubuntu3) edgy; urgency=low + + * debian/control: + - Dependency changes for the python transition. + + -- Christian Bjälevik Wed, 19 Jul 2006 23:20:47 +0200 + +gajim (0.10.1-0ubuntu2) edgy; urgency=low + + * Upload to edgy aswell. + + -- Christian Bjälevik Fri, 30 Jun 2006 14:59:47 +0200 + +gajim (0.10.1-0ubuntu1) dapper-updates; urgency=low + + * New upstream release: + + freeze and lost contacts in roster (#1953) + + popup menus are correctly placed + + high CPU usage on FreeBSD (#1963) + + nickname can contain '|' (#1913) + + update pl, cs, fr translations + + don't play sound, when no event is shown (#1970) + + set gajim icon for history manager + + gajim.desktop is generated with translation (#834) + + preventing several TBs and annoyances (r6273, r6275, r6279, r6301, + r6308, r6311, r6323, r6326, r6327, r6335, r6342, r6346, r6348) + + -- Christian Bjälevik Fri, 30 Jun 2006 14:31:09 +0200 + +gajim (0.10-0ubuntu4) dapper; urgency=low + + * debian/control: + - Add Binary Recommends on libnotify1, notification-daemon + (Closes: Malone #29590). + * Makefile, po/**: + - Applied upstream changeset #6317 (Closes: Malone #45448). + - Reference: http://trac.gajim.org/changeset/6317 + + -- Christian Bjälevik Tue, 23 May 2006 19:17:43 +0200 + +gajim (0.10-0ubuntu3) dapper; urgency=low + + * src/eggtrayicon.c: + + Make the notification area icon background transparent + + -- Sebastian Dröge Tue, 9 May 2006 10:25:29 +0200 + +gajim (0.10-0ubuntu2) dapper; urgency=low + + * po/sv/LC_MESSAGES/gajim.po: + - s/eddeande/eddelande/ (i.e. fix typo). + - Thanks Linus Mannervik! + + -- Christian Bjälevik Mon, 8 May 2006 14:48:23 +0200 + +gajim (0.10-0ubuntu1) dapper; urgency=low + + * New upstream release: + + One Messages Window ability (default to it) with tab reorder ability + + Gajim no longer remains unresponsive + + Gajim now uses less memory + + File Transfer works better (now should work out of the box for all) + + Meta Contacts ability (relationships between contacts) + + Support for legacy composing event (JEP-0022). + Now 'Contact is composing a message' will always work + + Gajim now defaults to theme that uses GTK colors + + Roster Management Improvements (f.e. editablity of transport names, + extended Drag and Drop Functionality) + + History (chat logs) Manager (search globally, delete, etc) + + Animated Emoticons ability + + Support for GTalk email notifications for GMail + + Room administrators can modify room ban list + + Gajim no longer optionally depends on pydns or dnspython. + Requires dnsutils (or whatever package provides the nslookup binary) + + gajim-remote has extended functionality + + Improved Preset Status Messages Experience + + Detection for CRUX as user's operating system + + New art included, appropriate sizes of icons used where available + + Translations under Windows now work okay + + Tons of fixes for bugs and annoyances. + * debian/control: + - Binary Depend on dnsutils instead of dnspython | python-dns + + -- Christian Bjälevik Tue, 2 May 2006 02:11:53 +0200 + +gajim (0.9.1-2ubuntu8) dapper; urgency=low + + * src/common/xmpp/auth.py: + - Reworked and applied patch taken from upstream + (http://trac.gajim.org/changeset/5590). + Will hopefully close Malone #29806. + + -- Christian Bjälevik Thu, 16 Mar 2006 17:59:35 +0100 + +gajim (0.9.1-2ubuntu7) dapper; urgency=low + + * Don't set the MimeType to application/x-executable. Gajim IS an executable + but can't open executables... (Closes: Malone #33321) + + -- Sebastian Dröge Thu, 16 Mar 2006 16:47:08 +0100 + +gajim (0.9.1-2ubuntu6) dapper; urgency=low + + * po/{sk,sv}/LC_MESSAGES/gajim.po: + - Updates taken from the gajim-translators mailinglist. + + -- Christian Bjälevik Thu, 16 Mar 2006 12:30:46 +0100 + +gajim (0.9.1-2ubuntu5) dapper; urgency=low + + * Version-checking patch for libnotify found on upstream + bugtracker (http://trac.gajim.org/ticket/1347). + + -- Christian Bjälevik Mon, 23 Jan 2006 02:01:46 +0100 + +gajim (0.9.1-2ubuntu4) dapper; urgency=low + + * Fixed timeout calculating (seconds*1000 not seconds/1000) + + -- Stephan Hermann Wed, 11 Jan 2006 19:04:42 +0100 + +gajim (0.9.1-2ubuntu3) dapper; urgency=low + + * Fixed one missing line in the libnotify patch (thx to Kaahl) + + -- Stephan Hermann Wed, 11 Jan 2006 16:12:04 +0100 + +gajim (0.9.1-2ubuntu2) dapper; urgency=low + + * Applied patch to fix libnotify issue (Closes: upstram + #1347) + + -- Stephan Hermann Tue, 10 Jan 2006 13:33:07 +0100 + +gajim (0.9.1-2ubuntu1) dapper; urgency=low + + * Resynchronize with Debian + * Got rid of the patch system and moving all ubuntu development to a bzr repos + * Applied all patches + * Applied all debian changes + * debian/control: + + Changed Recommends of dnspython | python-dns to Dependencies (it should be + the default) + * debian/changelog: + + Merged all missing changelog entries from debian + + -- Stephan Hermann Thu, 5 Jan 2006 18:39:41 +0100 + +gajim (0.9.1-2) unstable; urgency=low + + * fix group bug Closes: #345306 + + -- Yann Le Boulanger Fri, 30 Dec 2005 13:09:55 +0100 + +gajim (0.9.1-1) unstable; urgency=low + + * new upstream release + * Gajim now reconnects when connection is lost Closes: #329376 + * Status-changer widget's behaviour has been improved Closes: #340499 + * Gajim now recommends python-dns Closes: #340492 + * new russian translation Closes: #337971 + * Gajim now depends on python-pysqlite2, recommends python-dbus and + notification-daemon, and suggests python-gnome2 + + -- Yann Le Boulanger Fri, 27 Dec 2005 01:20:54 +0100 + +gajim (0.9.1-0ubuntu1) dapper; urgency=low + + * New upstream release: + + Fix a bug when joining a group chat. + + Fix a bug when starting Gajim. + * debian/watch: + - Updated to download tar.gz instead of tar.bz2. + + -- Christian Bjälevik Tue, 27 Dec 2005 10:11:50 +0100 + +gajim (0.9.0-0ubuntu1) dapper; urgency=low + + * New upstream release + * Applied ubuntu human patch + * Applied ubuntu launchpad integration patch + + -- Stephan Hermann Sat, 24 Dec 2005 19:46:28 +0100 + +gajim (0.8.2-0ubuntu4) breezy; urgency=low + + * debian/patches/02_gpg_agent.patch: + - Dropped, crashes without a gpg-agent. + - Closes: Malone #2179. + * debian/watch: + - readded after disapperance. + * po/*: + - Synced with the Rosetta breezy translations. + * po/Makefile: + - Add sv, it, eu. + + -- Christian Bjälevik Fri, 30 Sep 2005 15:22:53 +0200 + +gajim (0.8.2-0ubuntu3) breezy; urgency=low + + * Added patch to provide launchpad integration + * debian/control: added python-launchpad-integration to depends + + -- Stephan Hermann Fri, 9 Sep 2005 20:07:04 +0200 + +gajim (0.8.2-0ubuntu2) breezy; urgency=low + + * debian/gajim.install + + Added the po-files. + + -- Sebastian Dröge Wed, 7 Sep 2005 18:11:51 +0200 + +gajim (0.8.2-0ubuntu1) breezy; urgency=low + + * New upstream release + + Gajim now works in pygtk28. + + Gajim now also can use pydns (apart from dnspython) to + do srv lookups. + * debian/control: + - Added python-dns as an alternative to dnspython in deps. + * debian/patches/03_chatwindow_fix.patch: + - Dropped, this patch is in the new upstream. + * debian/watch: + - Added watchfile. + + -- Christian Bjälevik Tue, 6 Sep 2005 19:14:20 +0200 + +gajim (0.8.1-0ubuntu2) breezy; urgency=low + + * debian/patches/02_gpg-agent.patch: + - Bring back exactly one (1) part of this patch: + We now set "use_gpg_agent = True" by default again! + * debian/patches/04_human-default.patch: + - Applied patch to set "human" as the default theme :-). + + -- Christian Bjälevik Sun, 4 Sep 2005 21:29:30 +0200 + +gajim (0.8.1-0ubuntu1) breezy; urgency=low + + * New upstream release + + Gajim is now also available in Dutch. + + Gajim can now optionally use gpg-agent (advanced setting). + * debian/patches/01_srv-dns-lookup.patch: + - Removed, deprecated. + * debian/patches/02_gpg-agent.patch: + - Removed, deprecated. + + -- Christian Bjälevik Sat, 3 Sep 2005 18:49:56 +0200 + +gajim (0.8-0ubuntu5) breezy; urgency=low + + * debian/patches/02_gpg-agent.patch: + - Replaced with a modified version which also fixes + the BADSIG detection and does not sign auto-presence. + - Reference: http://trac.gajim.org/ticket/733 + * debian/patches/03_chatwindow-fix.patch: + - Applied patch to fix the chatwindow crasher + (thanks Sebastian Dröge). + * debian/control: + - Add Suggests for seahorse (seahorse-agent is nifty). + + -- Christian Bjälevik Sat, 3 Sep 2005 15:14:27 +0200 + +gajim (0.8-0ubuntu4) breezy; urgency=low + + * Applied patch to provide gpg-agent support to gajim + (Closes Upstream: http://trac.gajim.org/ticket/733) + + -- Stephan Hermann Thu, 25 Aug 2005 09:44:35 +0200 + +gajim (0.8-0ubuntu3) breezy; urgency=low + + * Applied patch to fix the srv dns lookup for broken server installs + (Closes Upstream: http://trac.gajim.org/ticket/735) + + -- Stephan Hermann Wed, 24 Aug 2005 20:26:47 +0200 + +gajim (0.8-0ubuntu2) breezy; urgency=low + + * debian/control: added python-gnome2-extras to the build-deps and + python2.4-gnome2-extras to install-deps + + -- Stephan Hermann Wed, 24 Aug 2005 11:26:52 +0200 + +gajim (0.8-0ubuntu1) breezy; urgency=low + + * adjusted debian/rules to use dh_python + * Rewrite debian/rules to debhelper + * replaced debmake with debhelper + * New Upstream Version + * Initial Ubuntu Release + + -- Stephan Hermann Sun, 21 Aug 2005 18:07:58 +0200 --- gajim-0.12.1.orig/debian/copyright +++ gajim-0.12.1/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Yann L.B. asterix@lagaule.org on +Wed, 16 Jun 2005 20:00:00 +0100. + +Upstream Authors: + - Stephan Erb (steve-e AT h3c.de) + - Nikos Kouremenos (kourem AT gmail.com) + - Yann Leboulanger (asterix AT lagaule.org) + - Julien Pivotto (roidelapluie AT gmail.com) + - Jonathan Schleifer (js-gajim AT webkeks.org) + - Travis Shirk (travis AT pobox.com) + - Brendan Taylor (whateley AT gmail.com) + - Jean-Marie Traissard (jim AT lapin.org) + - Stefan Bethge (stefan AT lanpartei.de) + - Vincent Hanquez (tab AT snarc.org) + - Dimitur Kirov (dkirov AT gmail.com) + + +Copyright: (c) 2003-2008 Gajim Team + +Gajim is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published +by the Free Software Foundation; version 3 only. + +Gajim is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +your Ubuntu system; see the file /usr/share/common-licenses/GPL-3. If not, +write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301, USA. + + --- gajim-0.12.1.orig/debian/pycompat +++ gajim-0.12.1/debian/pycompat @@ -0,0 +1 @@ +2 --- gajim-0.12.1.orig/debian/menu +++ gajim-0.12.1/debian/menu @@ -0,0 +1,8 @@ +?package(gajim): \ + needs="X11" \ + section="Apps/Net" \ + command="/usr/bin/gajim" \ + icon="/usr/share/pixmaps/gajim.xpm" \ + title="Gajim" \ + longtitle="Gajim: GTK Jabber Client" \ + description="GTK Jabber Client." --- gajim-0.12.1.orig/debian/compat +++ gajim-0.12.1/debian/compat @@ -0,0 +1 @@ +5 --- gajim-0.12.1.orig/debian/watch +++ gajim-0.12.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.gajim.org/downloads/gajim-(.*)\.tar\.gz debian uupdate --- gajim-0.12.1.orig/debian/rules +++ gajim-0.12.1/debian/rules @@ -0,0 +1,84 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure --prefix=/usr --enable-remote --enable-gtkspell --enable-idle --disable-trayicon + + touch configure-stamp + + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + rm -f build + [ ! -f Makefile ] || $(MAKE) clean + rm -f `find . -name "*~"` + rm -rf debian/tmp debian/files* core debian/substvars files + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp + + dh_install --sourcedir=debian/tmp + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_python + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- gajim-0.12.1.orig/debian/control +++ gajim-0.12.1/debian/control @@ -0,0 +1,18 @@ +Source: gajim +Section: net +Priority: optional +Maintainer: Nafallo Bjälevik +Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5.0.37.2), python-dev, python-gtk2-dev, libgtk2.0-dev, libxss-dev, libgtkspell-dev, libdbus-1-dev, intltool +Vcs-Bzr: http://code.launchpad.net/~ubuntu-dev/gajim/devel + +Package: gajim +Architecture: any +Section: net +Priority: optional +Depends: ${shlibs:Depends}, python (>= 2.4), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.8.0), python-gnome2-desktop, python-gnome2-extras, python-openssl, dnsutils +Recommends: python-crypto, python-notify, python-sexy, python-dbus, python-avahi, python-kerberos (>= 1.1), aspell-dictionary +Suggests: python-gnupginterface, seahorse +Homepage: http://www.gajim.org +Description: Jabber client written in PyGTK + Gajim is a Jabber client written in Python, with a GTK+ frontend. --- gajim-0.12.1.orig/debian/gajim.install +++ gajim-0.12.1/debian/gajim.install @@ -0,0 +1,8 @@ +usr/bin/gajim +usr/bin/gajim-remote +usr/lib/gajim/*.so +usr/share/applications/gajim.desktop +usr/share/gajim/ +usr/share/pixmaps/* +usr/share/man/man1/* +usr/share/locale/* --- gajim-0.12.1.orig/src/notify.py +++ gajim-0.12.1/src/notify.py @@ -372,8 +372,9 @@ notification.set_data('account', account) notification.set_data('msg_type', msg_type) notification.set_property('icon-name', path_to_image) - notification.add_action('default', 'Default Action', - on_pynotify_notification_clicked) + if "actions" in pynotify.get_server_caps(): + notification.add_action('default', 'Default Action', + on_pynotify_notification_clicked) try: notification.show() @@ -500,6 +501,7 @@ if self.notif is None: raise dbus.DBusException('unable to get notifications interface') self.ntype = ntype + self.capabilities = self.notif.GetCapabilities() self.get_version() @@ -509,6 +511,9 @@ ntype = self.ntype if version[:2] == [0, 2]: try: + actions = {} + if "actions" in self.capabilities: + actions = {'default': 0} self.notif.Notify( dbus.String(_('Gajim')), dbus.String(self.path_to_image), @@ -518,7 +523,7 @@ dbus.String(self.title), dbus.String(self.text), [dbus.String(self.path_to_image)], - {'default': 0}, + actions, [''], True, dbus.UInt32(timeout), @@ -545,13 +550,16 @@ text = self.text else: text = ' ' + actions = () + if "actions" in self.capabilities: + actions = ( dbus.String('default'), dbus.String(self.event_type) ) self.notif.Notify( dbus.String(_('Gajim')), dbus.UInt32(0), # this notification does not replace other dbus.String(self.path_to_image), dbus.String(self.title), dbus.String(text), - ( dbus.String('default'), dbus.String(self.event_type) ), + actions, hints, dbus.UInt32(timeout*1000), reply_handler=self.attach_by_id, --- gajim-0.12.1.orig/src/common/passwords.py +++ gajim-0.12.1/src/common/passwords.py @@ -56,7 +56,7 @@ def __init__(self): self.keyring = gnomekeyring.get_default_keyring_sync() if self.keyring is None: - self.keyring = 'default' + self.keyring = 'login' try: gnomekeyring.create_sync(self.keyring, None) except gnomekeyring.AlreadyExistsError: