From f29ef39cee5c435ce1141d24fe2a5205747be468 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 27 Jul 2013 20:13:53 +0200
Subject: [PATCH] prepare 0.16-alpha1 release
---
autogen.sh | 2 +-
debian/changelog | 6 ++++++
debian/control | 2 +-
gajim.nsi | 2 +-
src/common/defs.py | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 8b99755eb0..28c4366ce8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15.4"
+ gajimversion="0.16-alpha1"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff --git a/debian/changelog b/debian/changelog
index 05d86a5ea2..47c35cd328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gajim (0.16~alpha1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Yann Leboulanger <yann@leboulanger.org> Sat, 27 Jul 2013 19:21:47 +0200
+
gajim (0.15.3-1) experimental; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 4aa683f0b1..fafcd4d6e4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://hg.gajim.org/gajim/file
Package: gajim
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils
+Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils, python-nbxmpp
Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1
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-farstream, gstreamer0.10-plugins-ugly, python-pycurl, python-gupnp-igd
Description: Jabber client written in PyGTK
diff --git a/gajim.nsi b/gajim.nsi
index 8bef329f91..51e99c2d2e 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -201,7 +201,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.15.4"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16"
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 8bd5ab1631..aa92c0edb7 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
basedir = '../'
localedir = '../po'
-version = '0.15.4.0'
+version = '0.16-alpha1'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,
--
GitLab