diff --git a/autogen.sh b/autogen.sh index 8b99755eb00550084662bd45bc34e3ed131d5696..28c4366ce8fc839398eea0f08b57af450c988428 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 05d86a5ea2a3d477f99dab5a1d05d51a90dde98f..47c35cd32862db7b712f29fbdfdb8d1a735ec47b 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 4aa683f0b1347e9fd2f9ff28de297f135d1c6f68..fafcd4d6e400d10b5aa4d3067b1469fac95702ed 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 8bef329f9133b93e022ed7baa15574059d132c21..51e99c2d2e649e4933c9acfb4a69d4de9c61d95d 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 8bd5ab16317fe400a6c7258555eabdc3c34da9c8..aa92c0edb7bd728ee0f8ef26db6029ac64127e5f 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,