[Python-modules-commits] [flask-compress] 02/02: merge patched into master

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository flask-compress.

commit 2312abfdc059fe19062fddf91846d4dd2eaed9c7
Merge: 5614ac1 966cf15
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Sep 29 12:04:18 2016 +0200

    merge patched into master

 README.md                                          |  5 -----
 debian/.git-dpm                                    |  4 ++--
 ...nnecessary-image-resources-from-README.md.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index f33b172,0000000..fdddfd3
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
- e64478cc1faad0efb0e20632e3b910dbc70a28a7
- e64478cc1faad0efb0e20632e3b910dbc70a28a7
++966cf1579e60efcf50cfedaa9f260b7cc2ed682e
++966cf1579e60efcf50cfedaa9f260b7cc2ed682e
 +e64478cc1faad0efb0e20632e3b910dbc70a28a7
 +e64478cc1faad0efb0e20632e3b910dbc70a28a7
 +flask-compress_1.3.2.orig.tar.gz
 +a046f42f23f29028be4d59d4f021620f0a573732
 +5897
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-unnecessary-image-resources-from-README.md.patch
index 0000000,0000000..2ffce5d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-unnecessary-image-resources-from-README.md.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 966cf1579e60efcf50cfedaa9f260b7cc2ed682e Mon Sep 17 00:00:00 2001
++From: Dominik George <nik at naturalnet.de>
++Date: Thu, 29 Sep 2016 12:03:08 +0200
++Subject: Remove unnecessary image resources from README.md.
++
++These resources would produce a privacy breach after HTML conversion.
++---
++ README.md | 5 -----
++ 1 file changed, 5 deletions(-)
++
++diff --git a/README.md b/README.md
++index 0396c57..26f4e5f 100644
++--- a/README.md
+++++ b/README.md
++@@ -1,10 +1,5 @@
++ # Flask-Compress
++ 
++-[![Version](https://img.shields.io/pypi/v/flask-compress.svg)](https://pypi.python.org/pypi/Flask-Compress)
++-[![Build Status](https://travis-ci.org/libwilliam/flask-compress.png)](https://travis-ci.org/libwilliam/flask-compress)
++-[![Coverage](https://coveralls.io/repos/libwilliam/flask-compress/badge.svg)](https://coveralls.io/github/libwilliam/flask-compress)
++-[![License](https://img.shields.io/pypi/l/flask-compress.svg)](https://github.com/libwilliam/flask-compress/blob/master/LICENSE.txt)
++-
++ Flask-Compress allows you to easily compress your [Flask](http://flask.pocoo.org/) application's responses with gzip.
++ 
++ The preferred solution is to have a server (like [Nginx](http://wiki.nginx.org/Main)) automatically compress the static files for you. If you don't have that option Flask-Compress will solve the problem for you.
diff --cc debian/patches/series
index 0000000,0000000..caeeb1c
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-unnecessary-image-resources-from-README.md.patch

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