diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | debian/README.Debian | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | debian/docs | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | gajim.nsi | 2 | ||||
| -rw-r--r-- | src/common/defs.py | 2 |
10 files changed, 28 insertions, 15 deletions
@@ -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 433d39a4e..f6c5575d6 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 1c24acc9c..f94442643 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 3760d9c88..fe9ca177c 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 ec3323279..0bd63d2fc 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 2810d2df5..09a3c30c7 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 e845566c0..daa30a3f7 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -README +README.html diff --git a/debian/rules b/debian/rules index e44603a7b..dd60f48b2 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 @@ -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 e5f286a32..a4728df05 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -27,7 +27,7 @@ docdir = '../' 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, |