import release diff from 0.11.4, svn version is now 0.11.4.0-svn

ChangeLog

@@ -1,3 +1,32 @@
+Gajim 0.11.4 (06 December 2007)
+
+  * Fix /nick command in groupchats
+  * Better Metacontacts sorting
+  * Fix Ctrl + PageUP/Down behaviour
+  * Fix saving files from filetransfer under windows
+
+Gajim 0.11.3 (17 November 2007)
+
+  * 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
+
+Gajim 0.11.2 (22 September 2007)
+
+  * Improve idle, transports support
+  * Enable ellipsization in roster and chatwindow
+  * Fixed some metacontacts problems (#2156, #2761)
+  * Beter 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
+
 Gajim 0.11.1 (18 February 2007)
   * Fixes in gajim-remote and the way XMPP URI are handled
   * Fix Idle under Windows

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.11.2.2-svn],[http://trac.gajim.org/],[gajim])
+		[0.11.4.0-svn],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.8])
 AC_CONFIG_HEADER(config.h)

debian/changelog

@@ -1,3 +1,12 @@
+gajim (0.11.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix tab switching. Closes: #452257
+  * update to 3.7.3 Debian Policy
+  * Add Homepage, Vcs-Svn, Vcs-Browser fields to control file
+
+ -- Yann Leboulanger <asterix@lagaule.org>  Wed, 05 Dec 2007 22:23:30 +0100
+
 gajim (0.11.3-1) unstable; urgency=low
 
   * New upstream release.

debian/control

@@ -5,7 +5,10 @@ Maintainer: Yann Le Boulanger <asterix@lagaule.org>
 Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev
 Build-Conflicts: python2.3
 XS-Python-Version: >= 2.4
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://www.gajim.org
+Vcs-Svn: svn://svn.gajim.org/gajim/
+Vcs-Browser: http://trac.gajim.org/browser
 
 Package: gajim
 Architecture: any

gajim.iss

@@ -1,6 +1,7 @@
 [Setup]
 AppName=Gajim
-AppVerName=Gajim version 0.11-1
+AppVerName=Gajim version 0.11.4
+OutputBaseFilename=gajim-0.11.4-1
 DefaultDirName={pf}\Gajim
 DefaultGroupName=Gajim
 UninstallDisplayIcon={app}\src\Gajim.exe
@@ -27,6 +28,8 @@ Source: "dist\history_manager.exe"; DestDir: "{app}\src"; components: main
 Source: "data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
 Source: "po\*.mo"; DestDir: "{app}\po"; Flags: recursesubdirs
 ;Source: "gtk\*"; DestDir: "{app}\src\gtk"; Flags: recursesubdirs
+;Source: "gtk\bin\xmlparse.dll"; DestDir: "{app}\src"
+;Source: "gtk\bin\xmltok.dll"; DestDir: "{app}\src"
 
 [Icons]
 Name: "{group}\Gajim"; Filename: "{app}\src\Gajim.exe"; WorkingDir: "{app}\src"

setup_win32.py

@@ -27,14 +27,14 @@ includes = ['encodings', 'encodings.utf-8',]
 
 opts = {
     'py2exe': {
-        'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*',
+        'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,docutils.readers.*,docutils.writers.html4css1',
         'dll_excludes': [
             'iconv.dll','intl.dll','libatk-1.0-0.dll',
             'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',
             'libglib-2.0-0.dll','libgmodule-2.0-0.dll',
             'libgobject-2.0-0.dll','libgthread-2.0-0.dll',
             'libgtk-win32-2.0-0.dll','libpango-1.0-0.dll',
-            'libpangowin32-1.0-0.dll','libcairo-2.dll',
+            'libpangowin32-1.0-0.dll','libcairo-2.dll',
             'libpangocairo-1.0-0.dll','libpangoft2-1.0-0.dll',
         ],
     }
@@ -42,7 +42,7 @@ opts = {
 
 setup(
     name = 'Gajim',
-    version = '0.11',
+    version = '0.11.4',
     description = 'A full featured Jabber client',
     author = 'Gajim Development Team',
     url = 'http://www.gajim.org/',

src/common/defs.py

@@ -2,7 +2,7 @@ docdir = '../'
 
 datadir = '../'
 
-version = '0.11.2.2-svn'
+version = '0.11.4.0-svn'
 
 import sys, os.path
 for base in ('.', 'common'):

src/gajim.py

@@ -25,9 +25,25 @@
 ## along with Gajim.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
+import os
+
+if os.name == 'nt':
+	import warnings
+	warnings.filterwarnings(action='ignore')
+
+# Used to create windows installer with GTK included
+#	paths = os.environ['PATH']
+#	list_ = paths.split(';')
+#	new_list = []
+#	for p in list_:
+#		if p.find('gtk') < 0 and p.find('GTK') < 0:
+#			new_list.append(p)
+#	new_list.insert(0, 'gtk/lib')
+#	new_list.insert(0, 'gtk/bin')
+#	os.environ['PATH'] = ';'.join(new_list)
+#	os.environ['GTK_BASEPATH'] = 'gtk'
 
 import sys
-import os
 import urllib
 
 import logging

src/history_manager.py

@@ -21,9 +21,26 @@
 ## NOTE: some method names may match those of logger.py but that's it
 ## someday (TM) should have common class that abstracts db connections and helpers on it
 ## the same can be said for history_window.py
-
+
+import os
+
+if os.name == 'nt':
+	import warnings
+	warnings.filterwarnings(action='ignore')
+
+# Used to create windows installer with GTK included
+#	paths = os.environ['PATH']
+#	list_ = paths.split(';')
+#	new_list = []
+#	for p in list_:
+#		if p.find('gtk') < 0 and p.find('GTK') < 0:
+#			new_list.append(p)
+#	new_list.insert(0, 'gtk/lib')
+#	new_list.insert(0, 'gtk/bin')
+#	os.environ['PATH'] = ';'.join(new_list)
+#	os.environ['GTK_BASEPATH'] = 'gtk'
+
 import sys
-import os
 import signal
 import gtk
 import gobject