Commit a6a14c0f authored by Tanguy Ortolo's avatar Tanguy Ortolo

Imported upstream version 0.16.5

parent 6df2d35a
Gajim 0.16.5 (28 December 2015)
* Improve MAM implementation
* Improve security on connexion and for roster managment
* Ability for emoticons to be sorted in menu
Gajim 0.16.4 (26 September 2015)
* Fix trusting GPG keys
* Ability to disable synchronization of logs with server
* Improve MAM usage
Gajim 0.16.3 (31 July 2015)
* Fix reading secret file
* Fix reconnection after suspend
* Fix sending GPG-encrypted file to non-trusted key
Gajim 0.16.2 (24 July 2015)
* improve Zeroconf under windows and with IPv6
* Fix errors with GnuPG
* Minor fixes and improvements
Gajim 0.16.1 (28 February 2015)
* Fix sending Zeroconf messages
* Make ipython compatible to version >= 1.0
* Support XEP-0313 MAM
* Minor fixes and improvements
Gajim 0.16 (04 October 2014)
* Improve File transfer support by adding Jingle file transfer
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,22 +89,14 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(top_srcdir)/scripts/gajim.in COPYING \
THANKS config/compile config/config.guess config/config.sub \
config/install-sh config/missing config/ltmain.sh \
$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
$(top_srcdir)/config/config.sub \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
$(top_srcdir)/config/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/hgversion.m4 $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
......@@ -188,6 +190,14 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
$(top_srcdir)/config/config.sub \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
$(top_srcdir)/config/missing $(top_srcdir)/scripts/gajim.in \
AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
config/compile config/config.guess config/config.sub \
config/install-sh config/ltmain.sh config/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -461,7 +471,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -733,15 +742,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -777,17 +786,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -969,6 +978,8 @@ uninstall-am: uninstall-binSCRIPTS
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-binSCRIPTS
.PRECIOUS: Makefile
test:
python test/runtests.py
......
This diff is collapsed.
#!/usr/bin/env bash
gajimversion="0.16"
gajimversion="0.16.5"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
......@@ -14,7 +14,7 @@
echo "[encoding: UTF-8]" > po/POTFILES.in \
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
po/POTFILES.in; done \
&& ls -1 data/gajim.desktop.in.in \
&& ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \
src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
po/POTFILES.in \
&& echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1
......
......@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......
......@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2014-05-01'
timestamp='2014-09-11'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -302,6 +302,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
......@@ -828,6 +829,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
moxiebox)
basic_machine=moxie-unknown
os=-moxiebox
;;
msdos)
basic_machine=i386-pc
os=-msdos
......@@ -1373,7 +1378,7 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
......
This diff is collapsed.
......@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7
# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11
# automake: $automake_version
# autoconf: $autoconf_version
#
......@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
VERSION="2.4.2 Debian-2.4.2-1.7"
VERSION="2.4.2 Debian-2.4.2-1.11"
TIMESTAMP=""
package_revision=1.3337
......
......@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
......
......@@ -3,7 +3,7 @@
scriptversion=2011-06-08.12; # UTC
# Copyright (C) 2000-2013 Free Software Foundation, Inc.
# Copyright (C) 2000-2014 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
......@@ -590,7 +590,7 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Gajim - A Jabber Instant Messager'
PACKAGE_TARNAME='gajim'
PACKAGE_VERSION='0.16'
PACKAGE_VERSION='0.16.5'
PACKAGE_STRING='Gajim - A Jabber Instant Messager "version-set-in-hgversion"'
PACKAGE_BUGREPORT='http://trac.gajim.org/'
PACKAGE_URL=''
......@@ -1585,7 +1585,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Gajim - A Jabber Instant Messager configure 0.16
Gajim - A Jabber Instant Messager configure 0.16.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1954,7 +1954,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Gajim - A Jabber Instant Messager $as_me 0.16, which was
It was created by Gajim - A Jabber Instant Messager $as_me 0.16.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2337,7 +2337,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
am__api_version='1.14'
am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
......@@ -2509,8 +2509,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
......@@ -2529,7 +2529,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
......@@ -2823,7 +2823,7 @@ fi
# Define the identity of the package.
PACKAGE='gajim'
VERSION='0.16'
VERSION='0.16.5'
cat >>confdefs.h <<_ACEOF
......@@ -2857,8 +2857,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
......@@ -14560,7 +14560,7 @@ gajim_pluginsdir=\${datadir}/\${PACKAGE}/plugins
ac_config_files="$ac_config_files Makefile data/Makefile data/gui/Makefile data/emoticons/Makefile data/pixmaps/Makefile data/iconsets/Makefile data/moods/Makefile data/activities/Makefile icons/Makefile data/gajim.desktop.in data/defs.py src/Makefile scripts/gajim scripts/gajim-remote:scripts/gajim.in scripts/gajim-history-manager:scripts/gajim.in po/Makefile.in plugins/Makefile"
ac_config_files="$ac_config_files Makefile data/Makefile data/gui/Makefile data/emoticons/Makefile data/pixmaps/Makefile data/iconsets/Makefile data/moods/Makefile data/activities/Makefile icons/Makefile data/gajim.desktop.in data/gajim-remote.desktop.in data/defs.py src/Makefile scripts/gajim scripts/gajim-remote:scripts/gajim.in scripts/gajim-history-manager:scripts/gajim.in po/Makefile.in plugins/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -15104,7 +15104,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Gajim - A Jabber Instant Messager $as_me 0.16, which was
This file was extended by Gajim - A Jabber Instant Messager $as_me 0.16.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -15170,7 +15170,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Gajim - A Jabber Instant Messager config.status 0.16
Gajim - A Jabber Instant Messager config.status 0.16.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......@@ -15591,6 +15591,7 @@ do
"data/activities/Makefile") CONFIG_FILES="$CONFIG_FILES data/activities/Makefile" ;;
"icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
"data/gajim.desktop.in") CONFIG_FILES="$CONFIG_FILES data/gajim.desktop.in" ;;
"data/gajim-remote.desktop.in") CONFIG_FILES="$CONFIG_FILES data/gajim-remote.desktop.in" ;;
"data/defs.py") CONFIG_FILES="$CONFIG_FILES data/defs.py" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"scripts/gajim") CONFIG_FILES="$CONFIG_FILES scripts/gajim" ;;
......
......@@ -73,6 +73,7 @@ AC_CONFIG_FILES([
data/activities/Makefile
icons/Makefile
data/gajim.desktop.in
data/gajim-remote.desktop.in
data/defs.py
src/Makefile
scripts/gajim
......
......@@ -2,7 +2,7 @@ SUBDIRS = gui emoticons pixmaps iconsets moods activities
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(datadir)/applications
desktop_in_files = gajim.desktop.in.in
desktop_in_files = gajim.desktop.in.in gajim-remote.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
installdefsdir = $(gajim_srcdir)/common
......@@ -29,6 +29,6 @@ EXTRA_DIST = $(desktop_in_files) \
DISTCLEANFILES = $(desktop_DATA) \
$(installdefs_DATA)
CLEANFILES = gajim.desktop
CLEANFILES = gajim.desktop gajim-remote.desktop
MAINTAINERCLEANFILES = Makefile.in
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,17 +89,16 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/gajim.desktop.in.in $(srcdir)/defs.py.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/hgversion.m4 $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gajim.desktop.in defs.py
CONFIG_CLEAN_FILES = gajim.desktop.in gajim-remote.desktop.in defs.py
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -181,6 +190,9 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/defs.py.in \
$(srcdir)/gajim-remote.desktop.in.in \
$(srcdir)/gajim.desktop.in.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
......@@ -374,7 +386,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = gui emoticons pixmaps iconsets moods activities
desktopdir = $(datadir)/applications
desktop_in_files = gajim.desktop.in.in
desktop_in_files = gajim.desktop.in.in gajim-remote.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
installdefsdir = $(gajim_srcdir)/common
installdefs_DATA = defs.py
......@@ -394,7 +406,7 @@ EXTRA_DIST = $(desktop_in_files) \
DISTCLEANFILES = $(desktop_DATA) \
$(installdefs_DATA)
CLEANFILES = gajim.desktop
CLEANFILES = gajim.desktop gajim-remote.desktop
MAINTAINERCLEANFILES = Makefile.in
all: all-recursive
......@@ -411,7 +423,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -431,6 +442,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
gajim.desktop.in: $(top_builddir)/config.status $(srcdir)/gajim.desktop.in.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
gajim-remote.desktop.in: $(top_builddir)/config.status $(srcdir)/gajim-remote.desktop.in.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
defs.py: $(top_builddir)/config.status $(srcdir)/defs.py.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
......@@ -851,6 +864,8 @@ uninstall-man: uninstall-man1
uninstall-installdefsDATA uninstall-man uninstall-man1 \
uninstall-otherDATA uninstall-soundsDATA
.PRECIOUS: Makefile
@INTLTOOL_DESKTOP_RULE@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,14 +89,14 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/activities
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(nobase_dist_activities_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/hgversion.m4 $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_activities_DATA) \
$(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -140,6 +150,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(activitiesdir)"
DATA = $(nobase_dist_activities_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
......@@ -324,7 +335,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/activities/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/activities/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -528,6 +538,8 @@ uninstall-am: uninstall-nobase_dist_activitiesDATA
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-nobase_dist_activitiesDATA
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,14 +89,14 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data/emoticons
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(nobase_dist_emoticons_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/hgversion.m4 $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_emoticons_DATA) \
$(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -140,6 +150,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(emoticonsdir)"
DATA = $(nobase_dist_emoticons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
......@@ -328,7 +339,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/emoticons/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/emoticons/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -532,6 +542,8 @@ uninstall-am: uninstall-nobase_dist_emoticonsDATA
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-nobase_dist_emoticonsDATA
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
.Dd August 11, 2013
.Dd August 26, 2015
.Dt GAJIM-HISTORY-MANAGER 1 URM
.Os UNIX
.Sh NAME
......@@ -24,12 +24,14 @@ For more information on database logs see <https://trac.gajim.org/wiki/LogsDatab
Show help options
.It Fl c Fl Fl config-path Em directory
Where to look for logs file
.El
.Sh FILES
.Bl -tag -width Ds
.It ~/.local/share/gajim/logs.db
.It $XDG_DATA_DIR/gajim/logs.db
The history database log file used when
.Op Fl c
is not specified.
.El
.Sh AUTHORS
.An -nosplit
.Nm
......@@ -44,7 +46,7 @@ and
.Pa THANKS ,
for a complete list.
.Sh COPYRIGHT
Copyright (C) 2003-2013 Gajim Team
Copyright (C) 2003-2015 Gajim Team
.Pp
.Nm
is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only.
......@@ -54,7 +56,7 @@ is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; wit
.Pp
You should have received a copy of the GNU General Public License along with
.Nm .
If not, see <http://www.gnu.org/licenses/>.
If not, see <https://www.gnu.org/licenses/>.
.Sh FEEDBACK
You can report bugs or feature requests in our bug tracker at
.Em trac.gajim.org
......@@ -63,19 +65,19 @@ or in the
mailing list; if you want to send us a patch, please do so in our bug tracker.
You can also find us in our chat room.
.Sh WWW
http://www.gajim.org/
https://www.gajim.org/
.Sh XMPP
You are welcome to join us at gajim@conference.gajim.org
.Sh MAILING LIST
Below are public mailing lists on lists.gajim.org
.Bd -literal -offset indent
http://lists.gajim.org/cgi-bin/listinfo/gajim-devel
http://lists.gajim.org/cgi-bin/listinfo/translators
https://lists.gajim.org/cgi-bin/listinfo/gajim-devel
https://lists.gajim.org/cgi-bin/listinfo/translators
.Ed
.Pp
More mailing lists at
.Bd -literal -offset indent
http://lists.gajim.org/cgi-bin/listinfo
https://lists.gajim.org/cgi-bin/listinfo
.Ed
.Sh BUGS
Please submit bugs at https://trac.gajim.org/
......
.Dd August 11, 2013
.Dd August 26, 2015
.Dt GAJIM-REMOTE 1 URM
.Os UNIX
.Sh NAME
......@@ -16,6 +16,7 @@ by D-Bus.
.Sh OPTIONS
.Bl -tag -width Ds
.It Available commands
.El
.Ss account_info Aq account
Gets detailed info on a account
.Ss add_contact Ao jid Ac Bq account
......@@ -98,7 +99,7 @@ and
.Pa THANKS ,
for a complete list.
.Sh COPYRIGHT
Copyright (C) 2003-2013 Gajim Team
Copyright (C) 2003-2015 Gajim Team
.Pp
.Nm
is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only.
......@@ -108,7 +109,7 @@ is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; wit
.Pp
You should have received a copy of the GNU General Public License along with
.Nm .
If not, see <http://www.gnu.org/licenses/>.
If not, see <https://www.gnu.org/licenses/>.
.Sh FEEDBACK
You can report bugs or feature requests in our bug tracker at
.Em trac.gajim.org
......@@ -117,19 +118,19 @@ or in the
mailing list; if you want to send us a patch, please do so in our bug tracker.
You can also find us in our chat room.
.Sh WWW
http://www.gajim.org/
https://www.gajim.org/
.Sh XMPP