[Python-modules-commits] [python-textile] 06/11: Merge patched into master

Mon Dec 14 16:30:30 UTC 2015

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

mitya57 pushed a commit to branch master
in repository python-textile.

commit 577ba710241eb9b08190ae0d54943eb27ba0fb30
Merge: 7ecdabf 19b43db
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 14 19:21:45 2015 +0300

    Merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/changelog                                   |  1 +
 ...st-that-requires-access-to-www.google.com.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 textile/tests/__init__.py                          |  5 +----
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index e1c0d9f,0000000..3a7bd5d
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
- 1f8e042a0f9ef31cb7a65ada1c7298699cc8e3cd
- 1f8e042a0f9ef31cb7a65ada1c7298699cc8e3cd
++19b43db38fcae8b47272258ef630ea8918af8bf9
++19b43db38fcae8b47272258ef630ea8918af8bf9
 +1f8e042a0f9ef31cb7a65ada1c7298699cc8e3cd
 +1f8e042a0f9ef31cb7a65ada1c7298699cc8e3cd
 +python-textile_2.2.2.orig.tar.gz
 +e3cf7ef1b8beead2fbef797de27a83edf062cd50
 +32844
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index dd6c474,0000000..ebc911f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,102 -1,0 +1,103 @@@
 +python-textile (1:2.2.2-1) UNRELEASED; urgency=low
 +
 +  [ Jakub Wilk ]
 +  * Use canonical URIs for Vcs-* fields.
 +
 +  [ Jan Dittberner ]
 +  * fix Homepage URL
 +
 +  [ Dmitry Shachnev ]
 +  * New upstream release.
 +  * Switch to pybuild buildsystem and build a python3-textile package
 +    (closes: #802167).
++  * Skip a test that requires network access.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 14 Dec 2015 18:34:21 +0300
 +
 +python-textile (1:2.1.5-1) unstable; urgency=low
 +
 +  [ Janos Guljas ]
 +  * New upstream version.
 +  * Remove public Python module "test" (Closes: #627539).
 +  * Switch to source format 3.0 (quilt).
 +  * Bump standards to 3.9.2.
 +  * Update debian/copyright to DEP5 format.
 +  * Change my email address to janos at resenje.org.
 +  * Switch to dh_python2.
 +
 +  [ Jan Dittberner ]
 +  * add X-Python-Version: >= 2.5
 +  * depend on python (>= 2.6.6-3~) instead of python-all (>= 2.5)
 +
 + -- Janos Guljas <janos at resenje.org>  Fri, 27 May 2011 17:22:14 +0200
 +
 +python-textile (1:2.1.4-1) unstable; urgency=low
 +
 +  * New upstream release 
 +  * Updated debian/patches/01_tests-in-py-modules.diff
 +  * Added override_dh_auto_test in debian/rules
 +  * debian/patches/01_django-test-fix.diff: Fix test failure in python-django
 +
 + -- Janos Guljas <janos at janos.in.rs>  Wed, 09 Dec 2009 02:02:17 +0100
 +
 +python-textile (1:2.1.3-1) unstable; urgency=low
 +
 +  * New maintainer (Closes: #540943)
 +  * New upstream release.
 +  * Added epoch to correct a mistake in version numbering
 +  * debian/compat
 +    - update debhelper compatibility to 7.
 +  * debian/control
 +    - removed python-central from Build-Depends-Indep.
 +    - package now uses python-support and quilt.
 +    - bumped Standards-Version to 3.8.3
 +    - added Homepage
 +    - added Vcs-Svn
 +    - added Vcs-Browser
 +    - added XS-Python-Version
 +    - added XB-Python-Version
 +    - removed recommendation of python-twisted (Closes: #514626)
 +  * debian/copyright
 +    - updated copyright to new upstream author
 +    - added myself as a new maintainer
 +  * debian/docs
 +    - added README.textile
 +  * Added README.source
 +  * debian/rules
 +    - simplified script
 +  * Added debian/watch
 +  * debian/patches/01_tests-in-py-modules.diff: include tests in package
 +
 + -- Janos Guljas <janos at janos.in.rs>  Sat, 21 Nov 2009 23:05:57 +0100
 +
 +python-textile (2.10-3.1.2) unstable; urgency=low
 +
 +  * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490501.
 +
 + -- Matthias Klose <doko at debian.org>  Fri, 18 Jul 2008 15:40:54 +0000
 +
 +python-textile (2.0.10-3.1) unstable; urgency=low
 +
 +  * NMU: Updated to new Python policy. (closes: #373362)
 +  * Updated standards-version.
 +
 + -- Luis Rodrigo Gallardo Cruz <rodrigo at nul-unu.com>  Mon, 26 Jun 2006 13:23:33 -0500
 +
 +python-textile (2.0.10-3) unstable; urgency=low
 +
 +  * This package is Architecture: all, not "any"
 +
 + -- Ricardo Javier Cardenes Medina <rcardenes at debian.org>  Mon,  4 Apr 2005 03:23:50 +0100
 +
 +python-textile (2.0.10-2) unstable; urgency=low
 +
 +  * Fixed Build-Depends to not FTBFS (closes: Bug#288848).
 +
 + -- Ricardo Javier Cardenes Medina <rcardenes at debian.org>  Thu,  6 Jan 2005 17:15:35 +0000
 +
 +python-textile (2.0.10-1) unstable; urgency=low
 +
 +  * Initial Release (closes: Bug#286528).
 +
 + -- Ricardo Javier Cardenes Medina <rcardenes at debian.org>  Mon, 20 Dec 2004 17:10:29 +0000
 +
diff --cc debian/patches/0001-Skip-a-test-that-requires-access-to-www.google.com.patch
index 0000000,0000000..0f69ef7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Skip-a-test-that-requires-access-to-www.google.com.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 19b43db38fcae8b47272258ef630ea8918af8bf9 Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++Date: Mon, 14 Dec 2015 19:21:41 +0300
++Subject: Skip a test that requires access to www.google.com.
++
++---
++ textile/tests/__init__.py | 5 +----
++ 1 file changed, 1 insertion(+), 4 deletions(-)
++
++diff --git a/textile/tests/__init__.py b/textile/tests/__init__.py
++index 9b2d4d9..7cf8c82 100644
++--- a/textile/tests/__init__.py
+++++ b/textile/tests/__init__.py
++@@ -482,10 +482,7 @@ class Tests():
++         eq_(result, expect)
++ 
++     def testImageSize(self):
++-        try:
++-            __import__('PIL')
++-        except ImportError:
++-            raise SkipTest()
+++        raise SkipTest("Requires network access")
++ 
++         test = "!http://www.google.com/intl/en_ALL/images/srpr/logo1w.png!"
++         result = '\t<p><img alt="" height="95" src="http://www.google.com/intl/en_ALL/images/srpr/logo1w.png" width="275" /></p>'
diff --cc debian/patches/series
index 0000000,0000000..9876484
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Skip-a-test-that-requires-access-to-www.google.com.patch

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

