Commit 5914efec authored by anarcat's avatar anarcat
Browse files

Merge branch '2.x' into 2.1.x

parents 9d307835 d86d2fec
......@@ -292,15 +292,15 @@ Release process
git push
git push --tags
8. upload Debian package::
dput ../monkeysign*.changes
9. publish on PyPI::
8. publish on PyPI::
python setup.py bdist_wheel
twine upload dist/*
9. upload Debian package::
dput ../monkeysign*.changes
10. add announcement on website and mailing list:
monkeysphere@lists.riseup.net
......
monkeysign (2.1.2) unstable; urgency=medium
* reroll release: forgot to bump version number in ode
* upload to pypi before debian, which will notice those errors in the future
-- Antoine Beaupré <anarcat@debian.org> Wed, 28 Sep 2016 09:17:20 -0400
monkeysign (2.1.1) unstable; urgency=medium
* properly transition monkeysign-doc packages to ensure upgrades work
......
......@@ -13,7 +13,7 @@ No more reciting tedious strings of hexadecimal characters. And, you
can build a little rogue's gallery of the people that you have met and
exchanged keys with!
"""
__version_info__ = ('2', '1', '0')
__version_info__ = ('2', '1', '2')
__version__ = '.'.join(__version_info__)
__copyright__ = """Copyright (C) 2010-2013 Antoine Beaupré, Jerome Charaoui
This program comes with ABSOLUTELY NO WARRANTY.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment