[Python-modules-commits] [pymarkups] 02/06: record new upstream branch created by importing pymarkups_1.0.0.orig.tar.gz and merge it

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch master
in repository pymarkups.

commit bed78af4db4b23fa7c755065e6f61db4f04b17a2
Merge: 35737ac 02474b8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Dec 13 21:01:12 2015 +0300

    record new upstream branch created by importing pymarkups_1.0.0.orig.tar.gz and merge it

 .gitignore                     |   6 ++
 .travis.yml                    |  10 ++
 Markups.egg-info/PKG-INFO      |  54 +++++++----
 Markups.egg-info/SOURCES.txt   |  10 +-
 PKG-INFO                       |  54 +++++++----
 README.rst                     |  43 ++++++---
 changelog                      |   9 ++
 debian/.git-dpm                |  14 +--
 debian/changelog               |   3 +-
 docs/changelog.rst             |   2 +-
 docs/conf.py                   | 212 -----------------------------------------
 docs/index.rst                 |   2 +-
 docs/standard_markups.rst      |   6 +-
 examples/example-template.html |  13 ---
 markups/__init__.py            |   2 +-
 markups/common.py              |   2 +-
 markups/markdown.py            |   2 +-
 markups/textile.py             |   6 +-
 markups/web.py                 |  99 -------------------
 setup.cfg                      |   4 +-
 setup.py                       |  46 ++-------
 tests/data/page.html           |  15 ---
 tests/data/page.rst            |   4 -
 tests/data/template.html       |  15 ---
 tests/test_markdown.py         |   8 +-
 tests/test_public_api.py       |   7 +-
 tests/test_web.py              |  58 -----------
 27 files changed, 171 insertions(+), 535 deletions(-)

diff --cc debian/.git-dpm
index 8a78bf2,0000000..9857e22
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0a12c626ec14a90cf49d396d5a64265136952dc2
- 0a12c626ec14a90cf49d396d5a64265136952dc2
- 0a12c626ec14a90cf49d396d5a64265136952dc2
- 0a12c626ec14a90cf49d396d5a64265136952dc2
- pymarkups_0.6.3.orig.tar.gz
- 4e2323449dc9af8fe0178475c709452a2b24ac15
- 19285
++02474b813a50f551cf542a96b74e84bddc66f968
++02474b813a50f551cf542a96b74e84bddc66f968
++02474b813a50f551cf542a96b74e84bddc66f968
++02474b813a50f551cf542a96b74e84bddc66f968
++pymarkups_1.0.0.orig.tar.gz
++ffd3ef91d122e744a576ca653c00e77be81edadd
++14841
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index f70ec9c,0000000..152d957
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,78 -1,0 +1,79 @@@
- pymarkups (0.6.3-2) UNRELEASED; urgency=medium
++pymarkups (1.0.0-1) UNRELEASED; urgency=medium
 +
++  * New upstream release.
 +  * Update Homepage URL.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 18 Sep 2015 13:41:19 +0300
 +
 +pymarkups (0.6.3-1) unstable; urgency=medium
 +
 +  * New upstream bugfix release.
 +  * Require python3-markdown 2.6, the mathjax extension does not work
 +    with older versions.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 20 Jun 2015 20:10:57 +0300
 +
 +pymarkups (0.6.1-1) unstable; urgency=medium
 +
 +  * Upload to unstable.
 +  * New upstream release.
 +  * Update debian/watch to use pypi.debian.net redirector.
 +  * Add my key to debian/upstream/signing-key.asc and make uscan verify
 +    the signature.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 19 Apr 2015 12:17:05 +0300
 +
 +pymarkups (0.6.0-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Bump copyright year in debian/copyright.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 25 Jan 2015 20:00:24 +0300
 +
 +pymarkups (0.5.2-1) unstable; urgency=medium
 +
 +  * New upstream bugfix release.
 +    - Fixes loading of Markdown extensions with modules (closes: #768179).
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 05 Nov 2014 21:07:10 +0300
 +
 +pymarkups (0.5.1-1) unstable; urgency=medium
 +
 +  * New upstream bugfix release.
 +  * Explicitly build-depend on dh-python.
 +  * Update my e-mail address.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 16 Sep 2014 10:22:49 +0400
 +
 +pymarkups (0.5.0-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Update URLs for upstream move from Launchpad to GitHub.
 +  * Convert to pybuild.
 +  * Bump Standards-Version to 3.9.5, no changes needed.
 +
 + -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 25 Jul 2014 22:51:18 +0400
 +
 +pymarkups (0.4-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * debian/watch: use HTTPS, and correctly escape dots.
 +
 + -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 30 Nov 2013 13:27:43 +0400
 +
 +pymarkups (0.3-1) unstable; urgency=low
 +
 +  [ Jakub Wilk ]
 +  * Use canonical URIs for Vcs-* fields.
 +
 +  [ Dmitry Shachnev ]
 +  * New upstream release.
 +
 + -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 25 Jul 2013 14:30:31 +0400
 +
 +pymarkups (0.2.4-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #687824).
 +
 + -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 25 Nov 2012 18:13:08 +0400

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pymarkups.git