[Python-modules-commits] [python-pyscss] 04/06: 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 4ecc495fdc5ff7a0a6300996796ef9f824d9a865
Merge: e785101 c76febc
Author: W. Martin Borgert <debacle at debian.org>
Date:   Wed Oct 14 23:48:22 2015 +0200

    merge patched into master

 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  4 ++--
 .../patches/0001-short-summary-of-the-patch.patch  | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index ff49410,0000000..925ca4a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- a2ad867fc4f912751d87f62ea08d25d7a262f38e
- a2ad867fc4f912751d87f62ea08d25d7a262f38e
++c76febc2b974f36b0c2f9830683699671f3535cb
++c76febc2b974f36b0c2f9830683699671f3535cb
 +a2ad867fc4f912751d87f62ea08d25d7a262f38e
 +a2ad867fc4f912751d87f62ea08d25d7a262f38e
 +python-pyscss_1.3.4.orig.tar.gz
 +6b886bf1ade245dfa7166145cca727a79b4d4792
 +311323
diff --cc debian/patches/0001-short-summary-of-the-patch.patch
index 0000000,0000000..0e89abe
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-short-summary-of-the-patch.patch
@@@ -1,0 -1,0 +1,25 @@@
++From c76febc2b974f36b0c2f9830683699671f3535cb 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``.
diff --cc debian/patches/series
index 0000000,0000000..4dc605b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-short-summary-of-the-patch.patch

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