Philipp Hörist pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes:

  • README deleted
    1 
    -<!DOCTYPE html
    2 
    -    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    3 
    -    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    4 
    -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
    5 
    -<head>
    6 
    - <title>Gajim - Read Me</title>
    7 
    - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    8 
    -</head>
    9 
    -<body>
    10 
    -
    11 
    -<h1>Gajim Read Me</h1>
    12 
    -
    13 
    -<p>Welcome to Gajim and thank you for trying out our client.</p>
    14 
    -
    15 
    -<h2>Runtime Requirements</h2>
    16 
    -<ul>
    17 
    -<li>python3.4 or higher</li>
    18 
    -<li>python3-gi</li>
    19 
    -<li>python3-gi-cairo</li>
    20 
    -<li>gir1.2-gtk-3.0</li>
    21 
    -<li>python3-nbxmpp</li>
    22 
    -</ul>
    23 
    -
    24 
    -<h2>Optional Runtime Requirements</h2>
    25 
    -<ul>
    26 
    -<li>python3-openssl (>=0.14) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
    27 
    -<li>python3-pyasn1 to check SSL/TLS certificate</li>
    28 
    -<li>python3-crypto to enable End to end encryption</li>
    29 
    -<li>python3-gnupg to enable GPG encryption</li>
    30 
    -<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
    31 
    -<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
    32 
    -<li>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li>
    33 
    -<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li>
    34 
    -<li>gir1.2-notify-0.7 to get cooler popups</li>
    35 
    -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
    36 
    -<li>python3-dbus bindings (>=1.2.0)</li>
    37 
    -<li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li>
    38 
    -<li>gir1.2-gupnpigd-1.0 for better NAT traversing</li>
    39 
    -<li>gir1.2-networkmanager-1.0 for network lose detection</li>
    40 
    -<li>python3-idna and python3-precis-i18n for correctly parsing JIDs</li>
    41 
    -</ul>
    42 
    -
    43 
    -<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>
    44 
    -
    45 
    -<h2>Compile-time Requirements</h2>
    46 
    -<ul>
    47 
    -<li>intltool (>= 0.40.1)</li>
    48 
    -<li>pkg-config</li>
    49 
    -<li>libtool</li>
    50 
    -</ul>
    51 
    -
    52 
    -<p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p>
    53 
    -
    54 
    -<h2>Installation Procedure</h2>
    55 
    -<ol>
    56 
    -<li>tar jxvf gajim-version.tar.bz2</li>
    57 
    -<li>cd gajim</li>
    58 
    -<li>./configure</li>
    59 
    -<li>make (builds translations)</li>
    60 
    -<li>su -c make install</li>
    61 
    -</ol>
    62 
    -
    63 
    -<p>To specify where to install do:</p>
    64 
    -<pre>
    65 
    -    ./configure --prefix=custom_path
    66 
    -</pre>
    67 
    -
    68 
    -<h2>Running Gajim</h2>
    69 
    -<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
    70 
    -or if you use Git version and you didn't 'make install' you can also run from gajim folder with<em>./launch.py</em></p>
    71 
    -<hr />
    72 
    -<h3>Note for Git users</h3>
    73 
    -<p>You will need GNU autotools in order to install Gajim from Git. This includes:</p>
    74 
    -<ul>
    75 
    -<li>automake &gt;= 1.8 </li>
    76 
    -<li>autoconf &gt;= 2.59 </li>
    77 
    -<li>libtool</li>
    78 
    -<li>intltool-0.40.1 </li>
    79 
    -<li>pkgconfig &gt;= 0.19</li>
    80 
    -</ul>
    81 
    -<p>steps to compile gajim:</p>
    82 
    -<pre>
    83 
    -    $ ./autogen.sh
    84 
    -    $ ./configure
    85 
    -    $ make
    86 
    -</pre>
    87 
    -<p>Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:</p>
    88 
    -<pre>
    89 
    -    $ ./configure
    90 
    -    $ make
    91 
    -</pre>
    92 
    -<h2>Uninstallation Procedure</h2>
    93 
    -<pre>
    94 
    -    su -c make uninstall
    95 
    -</pre>
    96 
    -<p>this will try to remove Gajim from the default directories.
    97 
    -If you want to remove it from custom directory provide it as:
    98 
    -</p>
    99 
    -<pre>
    100 
    -    ./configure --prefix=custom_path
    101 
    -    make uninstall
    102 
    -</pre>
    103 
    -
    104 
    -<h2>Miscellaneous</h2>
    105 
    -<h3>XML &amp; Debugging</h3>
    106 
    -<p>If you want to see the xml stanzas and/or help us debugging
    107 
    -you're advised to enable verbose via advanced configuration window.
    108 
    -If you don't want to make this permanent, execute gajim with --verbose
    109 
    -everytime you want to have verbose output.</p>
    110 
    -
    111 
    -<h3>FAQ/Wiki</h3>
    112 
    -<p>FAQ can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</a><br/>
    113 
    -Wiki can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/home">https://dev.gajim.org/gajim/gajim/wikis/home</a></p>
    114 
    -
    115 
    -
    116 
    -<p>That is all, <strong>enjoy!</strong></p>
    117 
    -
    118 
    -<p>
    119 
    -<br/>
    120 
    -<br/>
    121 
    -<br/>
    122 
    -(C) 2003-2017<br/>
    123 
    -The Gajim Team<br/>
    124 
    -https://gajim.org<br/>
    125 
    -<br/>
    126 
    -<br/>
    127 
    -
    128 
    -PS.
    129 
    -We use original art and parts of sounds and other art from Psi, Gossip,
    130 
    -Gnomebaker, Gaim and some icons from various gnome-icons
    131 
    -(mostly Dropline Etiquette) we found at art.gnome.org
    132 
    -If you think we're violating a license please inform us. Thank you.</p>
    133 
    -</body></html>

  • README.md
    1 
    -# Welcome to the Gajim project Wiki
    2 
    -The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, please send tickets here.
    3 
    -
    4 
    -## Links
    5 
    -
    6 
    -- [Help and Documentation](https://dev.gajim.org/gajim/gajim/wikis/help/home)
    7 
    -    * FAQ, Did you know that...
    8 
    -    * Quickstart guides
    9 
    -    * Advanced configuration
    10 
    -- [Community](https://dev.gajim.org/gajim/gajim/wikis/community/home)
    11 
    -    * Advanced use of gajim
    12 
    -    * User groups
    13 
    -    * Reviews
    14 
    -- [Development](https://dev.gajim.org/gajim/gajim/wikis/development/home)
    15 
    -    * Guidelines and documentation
    16 
    -    * How to contribute
    17 
    -    * The Gajim team
    18 
    -- Latest release:
    19 
    -    * [Gajim 0.16.8 (.tar.gz)](https://gajim.org/downloads/0.16/gajim-0.16.8.tar.gz)
    20 
    -    * [Gajim 0.16.8-2 (.exe)](https://gajim.org/downloads/0.16/gajim-0.16.8-2.exe)
    21 
    -    * [Gajim 0.16.8-2 portable (.exe)](https://gajim.org/downloads/0.16/gajim-portable-0.16.8-2.exe)
    22 
    -    * [Daily snapshot](https://www.gajim.org/downloads/snap/?M=D)
    23 
    -
    24 
    -- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues)
    \ No newline at end of file
    1 
    +# Welcome to Gajim
    2 
    +
    3 
    +
    4 
    +### Runtime Requirements
    5 
    +
    6 
    +- python3.4 or higher
    7 
    +- python3-gi
    8 
    +- python3-gi-cairo
    9 
    +- gir1.2-gtk-3.0
    10 
    +- python3-nbxmpp
    11 
    +- python3-openssl (>=0.14)
    12 
    +- python3-pyasn1
    13 
    +
    14 
    +
    15 
    +### Optional Runtime Requirements
    16 
    +
    17 
    +- python3-crypto to enable End to end encryption
    18 
    +- python3-gnupg to enable GPG encryption
    19 
    +- For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi
    20 
    +- dnsutils (or whatever package provides the nslookup binary) for SRV support
    21 
    +- gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc
    22 
    +- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage
    23 
    +- D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.
    24 
    +- python3-dbus bindings (>=1.2.0)
    25 
    +- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls
    26 
    +- gir1.2-gupnpigd-1.0 for better NAT traversing
    27 
    +- gir1.2-networkmanager-1.0 for network lose detection
    28 
    +- python3-idna and python3-precis-i18n for correctly parsing JIDs
    29 
    +
    30 
    +### Compile-time Requirements
    31 
    +
    32 
    +- python-setuptools
    33 
    +
    34 
    +
    35 
    +### Installation Procedure
    36 
    +
    37 
    +##### Linux / Mac
    38 
    +
    39 
    +``./setup.py install --root=/``
    40 
    +
    41 
    +or
    42 
    +
    43 
    +``pip install .`` (python-pip is required)
    44 
    +
    45 
    +##### Windows
    46 
    +
    47 
    +see [README](./win/README.md)
    48 
    +
    49 
    +### Miscellaneous
    50 
    +
    51 
    +##### Snapshots
    52 
    +
    53 
    +- [Daily Linux](https://www.gajim.org/downloads/snap/?M=D)
    54 
    +- [Daily Windows](https://gajim.org/downloads/snap/win)
    55 
    +
    56 
    +
    57 
    +##### Debugging
    58 
    +
    59 
    +Execute gajim with --verbose
    60 
    +
    61 
    +##### Links
    62 
    +
    63 
    +- [FAQ](https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq)
    64 
    +- [Wiki](https://dev.gajim.org/gajim/gajim/wikis/home)
    65 
    +
    66 
    +
    67 
    +
    68 
    +That is all, **enjoy**!
    69 
    +
    70 
    +(C) 2003-2017
    71 
    +The Gajim Team
    72 
    +[https://gajim.org](https://gajim.org)
    73 
    +
    74 
    +
    75 
    +We use original art and parts of sounds and other art from Psi, Gossip, Gnomebaker, Gaim and some icons from various gnome-icons (mostly Dropline Etiquette) we found at art.gnome.org If you think we're violating a license please inform us. Thank you.
    \ No newline at end of file

  • setup.py
    ... ... @@ -271,6 +271,7 @@ setup(
    271 271 
         install_requires=[
    272 272 
             'dbus-python;sys_platform=="linux"',
    273 273 
             'nbxmpp',
    274 
    -        'pyOpenSSL'
    274 
    +        'pyOpenSSL',
    275 
    +        'pyasn1',
    275 276 
         ],
    276 277 
     )

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.