diff --git a/ChangeLog b/ChangeLog
index 86d456790dcbe302fead25bbc5b2e953ac9a985f..657ed6337c3aa8991fcca153f911a92fe43b1e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Gajim 0.15 (XX XX 2011)
+
+ * Plugin system
+ * Whiteboard (via a plugin)
+ * Message archiving
+ * Stream managment
+ * IBB
+ * Nested roster group
+ * Roster filtrering
+
Gajim 0.14.4 (22 July 2011)
* Fix translation issue
diff --git a/autogen.sh b/autogen.sh
index 433d39a4ed0eb48abff82a6306bd535cf95dab58..f6c5575d6f4071dc9c32bfe2af189d0ea0674119 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.14.0.1"
+ gajimversion="0.15-alpha1"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff --git a/debian/README.Debian b/debian/README.Debian
index 1c24acc9c2abedabfe3be35bc1f927fb92e5b635..f9444264361d90708761c3077d615b34b2beeab6 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,8 +1,6 @@
gajim for Debian
----------------
-If you want to use OpenPGP in gajim, you have to install python-gnupginterface.
-
For video chat support, you have to install python-farsight.
-- Yann Le Boulanger <asterix@lagaule.org>, Mon, 20 Jun 2005 12:02:31 +0200
diff --git a/debian/changelog b/debian/changelog
index 3760d9c88e157b028f3ec22ac393cdc311160c15..fe9ca177c876ecd04425b541a90d4da4a2f193b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gajim (0.15~alpha1-1) unstable; urgency=low
+
+ * New upstream release.
+ * remove 00_debian-copying.diff because upstream doesn't install it anymore
+ * remove 01_configure-ac.diff because upstream changed configure dependencies
+ * remove python-gnupginterface from recommands list, it's no more used
+
+ -- Yann Leboulanger <asterix@lagaule.org> Fri, 26 Aug 2011 12:13:51 +0200
+
gajim (0.14.4-1) unstable; urgency=low
* New upstream release. Closes: #637071
diff --git a/debian/control b/debian/control
index ec3323279472fb40d88f2b06ea060c9a543f084a..0bd63d2fcbf2a5744048abdfa722d68777618985 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gajim
Section: net
Priority: optional
Maintainer: Yann Leboulanger <asterix@lagaule.org>
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), dh-autoreconf, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev
Standards-Version: 3.9.2
Homepage: http://www.gajim.org
Vcs-Hg: http://hg.gajim.org/gajim/
@@ -11,7 +11,7 @@ Vcs-Browser: http://hg.gajim.org/gajim/file
Package: gajim
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils
-Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl (>= 0.9), python-crypto
+Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.9), python-crypto
Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly
Description: Jabber client written in PyGTK
Gajim is a Jabber client. It has a tabbed user interface with normal chats,
diff --git a/debian/copyright b/debian/copyright
index 2810d2df514676679da9d82b02cdd990a676c905..09a3c30c76b3945e3003f119ba7bd8116199199a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ It was downloaded from:
http://www.gajim.org/downloads/
Upstream Authors:
- - Alexander Cherniuk <ts33kr@gmail.com>
- - Yann Le Boulanger <asterix@lagaule.org>
+ - Denis Fomin <fominde@gmail.com>
+ - Yann Leboulanger <asterix@lagaule.org>
Copyright: (c) 2003-2011 Gajim Team
diff --git a/debian/docs b/debian/docs
index e845566c06f9bf557d35e8292c37cf05d97a9769..daa30a3f752706bce3bc36b34a7aab39ee5484d4 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.html
diff --git a/debian/rules b/debian/rules
index e44603a7bc6db9b229a32ce8cf6ad83c943c850e..dd60f48b2677f8f94310b34595644fb662bc1b87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2,autoreconf
+ dh $@ --with python2
# test target is broken
override_dh_auto_test:
@@ -10,10 +10,6 @@ override_dh_auto_configure:
convert icons/hicolor/64x64/apps/gajim.png -resize 32x32 debian/gajim.xpm
dh_auto_configure
-override_dh_auto_install:
- dh_auto_install
- rm debian/gajim/usr/share/gajim/src/common/GnuPGInterface.py*
-
override_dh_auto_clean:
-rm -f debian/gajim.xpm
dh_auto_clean
diff --git a/gajim.nsi b/gajim.nsi
index c09d90261526d34346f52d732bb40c2a537cd7ab..842d5f881798cf084de4e2db7fd0a69e0444bc14 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -188,7 +188,7 @@ Section "Gajim" SecGajim
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.1"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
WriteUninstaller "$INSTDIR\Uninstall.exe"
diff --git a/src/common/defs.py b/src/common/defs.py
index e5f286a32793e2a6f6f486cdbc5043a22813bf83..a4728df0501852a1bf2777a67cc435a6fe689ede 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@
basedir = '../'
localedir = '../po'
-version = '0.14.90.0'
+version = '0.15-alpha1'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,