[Python-modules-commits] [python-pyscss] 04/07: merge patched into master

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository python-pyscss.

commit e08cc6a0ef9dbc6a80e77b199a584a2a604b0ce3
Merge: 6903336 15612dd
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sat Jul 23 12:52:15 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |   6 +-
 .../patches/0001-short-summary-of-the-patch.patch  |   2 +-
 docs/back-matter.rst                               |  32 ++++-
 scss/ast.py                                        |  41 +++++-
 scss/compiler.py                                   | 113 +++++------------
 scss/cssdefs.py                                    |  27 ++--
 scss/extension/compass/gradients.py                |  11 +-
 scss/extension/core.py                             | 141 ++++++++++++++-------
 scss/extension/fonts.py                            |  10 +-
 scss/grammar/expression.g                          |  11 +-
 scss/grammar/expression.py                         |  62 +++++----
 scss/legacy.py                                     |   8 +-
 scss/less2scss.py                                  | 106 ++++++++++++++++
 scss/namespace.py                                  |  14 +-
 scss/scss_meta.py                                  |   4 +-
 scss/selector.py                                   |  24 +++-
 scss/source.py                                     |   6 +-
 scss/tests/extension/test_core.py                  |   8 ++
 scss/tests/files/bugs/append.css                   |   5 +
 scss/tests/files/bugs/append.scss                  |  10 ++
 scss/tests/files/bugs/base64url.css                |   3 +
 scss/tests/files/bugs/base64url.scss               |   5 +
 scss/tests/files/bugs/trailing-combinators.css     |  11 ++
 scss/tests/files/bugs/trailing-combinators.scss    |  18 +++
 scss/tests/files/bugs/unit-float-precision.css     |   3 +
 scss/tests/files/bugs/unit-float-precision.scss    |   7 +
 scss/tests/files/compass/current-color.css         |   3 +
 scss/tests/files/compass/current-color.scss        |   4 +
 scss/tests/files/fonts/fonts.css                   |   4 +-
 scss/tests/files/general/css-calc.css              |   2 +
 scss/tests/files/general/css-calc.scss             |   2 +
 .../tests/files/general/global-variable-exists.css |   5 +
 .../files/general/global-variable-exists.scss      |  27 ++++
 scss/tests/files/general/if-lazy.css               |   4 +
 scss/tests/files/general/if-lazy.scss              |   6 +
 .../files/regressions/include/_issue-334.scss      |   3 +
 .../files/regressions/include/_issue.334.scss      |   3 +
 scss/tests/files/regressions/issue-258.css         |   1 +
 scss/tests/files/regressions/issue-334-a.css       |   3 +
 scss/tests/files/regressions/issue-334-a.scss      |   1 +
 scss/tests/files/regressions/issue-334-b.css       |   3 +
 scss/tests/files/regressions/issue-334-b.scss      |   1 +
 scss/tests/files/regressions/issue-334-c.css       |   3 +
 scss/tests/files/regressions/issue-334-c.scss      |   1 +
 scss/tests/files/regressions/issue-334-d.css       |   3 +
 scss/tests/files/regressions/issue-334-d.scss      |   1 +
 scss/tests/files/regressions/issue-334-e.css       |   3 +
 scss/tests/files/regressions/issue-334-e.scss      |   1 +
 scss/tests/files/regressions/issue-334-f.css       |   3 +
 scss/tests/files/regressions/issue-334-f.scss      |   1 +
 scss/tests/files/regressions/issue-334-g.css       |   3 +
 scss/tests/files/regressions/issue-334-g.scss      |   1 +
 scss/tests/files/regressions/issue-334-h.css       |   3 +
 scss/tests/files/regressions/issue-334-h.scss      |   1 +
 scss/tool.py                                       |   6 +-
 scss/types.py                                      |  19 ++-
 setup.py                                           |   1 +
 tox.ini                                            |   4 +-
 58 files changed, 614 insertions(+), 200 deletions(-)

diff --cc debian/.git-dpm
index 3bd3264,0000000..7d9d42a
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
- c76febc2b974f36b0c2f9830683699671f3535cb
- c76febc2b974f36b0c2f9830683699671f3535cb
- a2ad867fc4f912751d87f62ea08d25d7a262f38e
++15612dd5baa6288777ecf6c3c78d2267fac57c8a
++15612dd5baa6288777ecf6c3c78d2267fac57c8a
++a9738572b12839d4c3f4c7561e5b92f81a04ca67
 +a9738572b12839d4c3f4c7561e5b92f81a04ca67
 +python-pyscss_1.3.5.orig.tar.gz
 +2d00b3a74e45827e8647418ee7a9b6e2df659481
 +316692
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-short-summary-of-the-patch.patch
index 0e89abe,0000000..3c28d7e
mode 100644,000000..100644
--- a/debian/patches/0001-short-summary-of-the-patch.patch
+++ b/debian/patches/0001-short-summary-of-the-patch.patch
@@@ -1,25 -1,0 +1,25 @@@
- From c76febc2b974f36b0c2f9830683699671f3535cb Mon Sep 17 00:00:00 2001
++From 15612dd5baa6288777ecf6c3c78d2267fac57c8a Mon Sep 17 00:00:00 2001
 +From: Thomas Goirand <zigo at debian.org>
 +Date: Wed, 14 Oct 2015 23:48:10 +0200
 +Subject: <short summary of the patch>
 +
 + This produced an FTBFS, so we're removing non-ascii char.
 +Forwarded: no
 +Last-Update: 2014-06-28
 +---
 + README.rst | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/README.rst b/README.rst
 +index b373f15..8fa5851 100644
 +--- a/README.rst
 ++++ b/README.rst
 +@@ -56,7 +56,7 @@ http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html
 + Obligatory
 + ----------
 + 
 +-Copyright © 2012 German M. Bravo (Kronuz).  Additional credits in the
 ++Copyright (c) 2012 German M. Bravo (Kronuz).  Additional credits in the
 + documentation.
 + 
 + Licensed under the `MIT license`_, reproduced in ``LICENSE``.

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