[Python-modules-commits] [python-slimmer] 05/12: merge patched into master
Jan Dittberner
jandd at moszumanska.debian.org
Sun Jan 3 20:53:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
jandd pushed a commit to branch master
in repository python-slimmer.
commit c0b89059494ff4b2842d710b8cc014cc1f8c7d72
Merge: 7bb0f91 6cc7acc
Author: Jan Dittberner <jandd at debian.org>
Date: Sun Jan 3 21:14:40 2016 +0100
merge patched into master
debian/.git-dpm | 4 +-
...-missing-test-data-from-github-repository.patch | 294 +++++++++++++++++++++
debian/patches/series | 1 +
slimmer/tests/euc-jp.html | 262 ++++++++++++++++++
slimmer/tests/utf-8.html | 5 +
5 files changed, 564 insertions(+), 2 deletions(-)
diff --cc debian/.git-dpm
index 7b8cde6,0000000..0817e44
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
- 15d4f56531627846caa1e90afeaf74f6c63bac86
- 15d4f56531627846caa1e90afeaf74f6c63bac86
++6cc7acc09c39775217e4192d3bf994f1699ac39b
++6cc7acc09c39775217e4192d3bf994f1699ac39b
+8984aa268299af255706d1dc86319554a14f46fb
+8984aa268299af255706d1dc86319554a14f46fb
+python-slimmer_0.1.30.orig.tar.gz
+171bd94bb9f89fdd8c32fb46d023fceafddbf96a
+17030
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Include-missing-test-data-from-github-repository.patch
index 0000000,0000000..367124f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Include-missing-test-data-from-github-repository.patch
@@@ -1,0 -1,0 +1,294 @@@
++From 6cc7acc09c39775217e4192d3bf994f1699ac39b Mon Sep 17 00:00:00 2001
++From: Jan Dittberner <jandd at debian.org>
++Date: Sun, 3 Jan 2016 21:13:25 +0100
++Subject: Include missing test data from github repository
++
++The files are from
++https://github.com/peterbe/slimmer/blob/master/slimmer/tests/
++---
++ slimmer/tests/euc-jp.html | 262 ++++++++++++++++++++++++++++++++++++++++++++++
++ slimmer/tests/utf-8.html | 5 +
++ 2 files changed, 267 insertions(+)
++ create mode 100644 slimmer/tests/euc-jp.html
++ create mode 100644 slimmer/tests/utf-8.html
++
++diff --git a/slimmer/tests/euc-jp.html b/slimmer/tests/euc-jp.html
++new file mode 100644
++index 0000000..21601d4
++--- /dev/null
+++++ b/slimmer/tests/euc-jp.html
++@@ -0,0 +1,262 @@
+++
+++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+++<html>
+++<head>
+++<META http-equiv=Content-Type content="text/html; charset=euc-jp">
+++<!--��-->
+++<META NAME="keywords" CONTENT="����å���⡢��⡢�ܥ��ƥ��������å������ա�NPO��CSR">
+++<META NAME="Description" CONTENT="����å����ˤ��NPO�ٱ�ǡ����ʤ��ˤ�Ǥ���ܥ��ƥ��������å���������ǵ��ڤ˴��դ˶��ϤǤ��ޤ���">
+++<meta http-equiv="Pragma" content="no-cache">
+++<meta http-equiv="Cache-Control" content="no-cache">
+++<meta http-equiv="Expires" content="Thu, 01 Dec 1994 16:00:00 GMT">
+++<title>����å���� - Yahoo!�ܥ��ƥ���</title>
+++<link rel="stylesheet" href="http://i.yimg.jp/images/volunteer/css/yj_font.css" type="text/css">
+++<link rel="stylesheet" href="http://i.yimg.jp/images/css/yj2.css" type="text/css" media="screen,print">
+++<link rel="stylesheet" href="http://i.yimg.jp/images/css/printexec.css" type="text/css" media="print">
+++<link rel="stylesheet" href="http://i.yimg.jp/images/volunteer/css/common.css" type="text/css" media="screen,print">
+++<script language="javascript" src="http://volunteer.yahoo.co.jp/donation/blog_parts/js/com_dynamic.js"></script>
+++<script language="javascript" src="http://volunteer.yahoo.co.jp/donation/blog_parts/js/com_browser.js"></script>
+++<!--<script type="text/javascript" src="http://i.yimg.jp/yui/jp/plug/js/p/e/plugENV01_pe.js"></script>
+++
+++<script type="text/javascript" src="http://i.yimg.jp/yui/jp/plug/js/p/e/plugCore01_pe.js"></script>
+++<script type="text/javascript" src="http://i.yimg.jp/yui/jp/plug/js/p/e/plugAFP01_pe.js"></script>
+++-->
+++<link rel="stylesheet" href="http://i.yimg.jp/yui/jp/plug/css/p/e/plug01_pe.css" type="text/css" media="screen, print">
+++<script type="text/javascript" src="http://i.yimg.jp/images/help/env/env.js"></script>
+++
+++<!-- overLay module -->
+++<link rel="stylesheet" href="http://i.yimg.jp/images/volunteer/click/css/csvc_overlay.css" type="text/css" media="all">
+++<!-- /overLay module -->
+++</head>
+++<body marginheight=0 topmargin=0>
+++<center>
+++<table width=950 cellpadding=0 cellspacing=0 border=0><tr><td>
+++<!-- SpaceID=0 robot -->
+++</td></tr></table>
+++<div id="wrapper950">
+++<div class="yjmth">
+++<div class="yjmthproplogoarea">
+++<a href="http://rd.yahoo.co.jp/volunteer/top/head/logo/?http://volunteer.yahoo.co.jp"><img id="ygmhlog" src="http://i.yimg.jp/images/mh/volunteer.gif" alt="Yahoo!�ܥ��ƥ���"></a>
+++</div><div class="yjmthloginarea">
+++<b><a href="http://rd.yahoo.co.jp/volunteer/top/head/logo/?https://login.yahoo.co.jp/config/login?.src=yvltr&.lg=jp&.intl=jp&.done=http://volunteer.yahoo.co.jp/click/">������</a></b><br>ID�Ǥ�ä�������[ <a href="http://rd.yahoo.co.jp/volunteer/top/head/logo/?http://edit.yahoo.co.jp/config/eval_register?.src=yvltr&.intl=jp&new=1&.done=http://volunteer.yahoo.co.jp/click/">��������</a> ]</div>
+++<div class="yjmthcmnlnkarea">
+++<a href="http://rd.yahoo.co.jp/volunteer/top/head/yj/?http://www.yahoo.co.jp/">Yahoo! JAPAN</a> - <a href="http://rd.yahoo.co.jp/volunteer/top/head/help/?http://help.yahoo.co.jp/help/jp/volunteer/">�إ��</a>
+++</div>
+++<br class="yjmthclear"></div>
+++</div><p>
+++<table width="950" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td align="center">
+++<!-- SpaceID=0 robot -->
+++<!-- SpaceID=0 robot -->
+++<!-- SpaceID=0 robot -->
+++</td></tr>
+++</table>
+++<br>
+++
+++<!-- �ȥԥå��ѥ� -->
+++<table width="950" border="0" cellpadding="0" cellspacing="0">
+++<tr align="left">
+++<td width="7"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="7" height="1"><br></td>
+++<td width="943"><font size="-1"><a href="http://volunteer.yahoo.co.jp/">Yahoo!�ܥ��ƥ���</a> > ����å����</font><br></td>
+++</tr>
+++</table>
+++<!-- /�ȥԥå��ѥ� -->
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++<!-- �إå��� -->
+++<img src="http://i.yimg.jp/images/volunteer/click/index_side01.gif" width="950" height="11"><br>
+++<table width="950" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td bgcolor="#cccccc"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="1"><br></td>
+++<td bgcolor="#ffffff"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="4" height="1"><br></td>
+++<td bgcolor="#63c105"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="12" height="1"><br></td>
+++<td width="628" align="left" valign="top" bgcolor="#63c105" background="http://i.yimg.jp/images/volunteer/click/index_background02.jpg">
+++<table width="628" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td width="286" align="left" valign="top">
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="3"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/index_title06.jpg" alt="1��1��Τ������� ����å���� ���ʤ��ˤϰ��ڤ���Ϥ�����ޤ���" width="264" height="101"><br>
+++</td>
+++<td width="342" align="left" valign="top">
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++<font color="#ffffff" class="s150">�������������ƥ���å���⡪��1����å��ǴĶ��ٱ���ݶ��ϤΤ������⤬�Ǥ��ޤ���<br>����⤬�Ǥ���Τϡ�1�Ĥ����ˤĤ�1��1��Ǥ���</font><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="10"><br>
+++<a href="qa/index.html"><img src="http://i.yimg.jp/images/volunteer/click/index_button01.gif" alt="����å����Ȥϡ�" width="260" height="38" border="0"></a><br>
+++</td>
+++</tr>
+++</table>
+++</td>
+++<td bgcolor="#63c105"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="30" height="1"><br></td>
+++<td width="120" align="left" valign="top" bgcolor="#63c105">
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/index_photo02.jpg" alt="�Ҷ������μ̿�" width="120" height="120"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++</td>
+++<td bgcolor="#63c105"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="15" height="1"><br></td>
+++<td width="120" align="left" valign="top" bgcolor="#63c105">
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++<a href="http://www.ekokoro.jp/" target="new"><img src="http://i.yimg.jp/images/volunteer/click/index_ekokoro02.gif" alt="powered by ����������" width="120" height="45" border="0"></a><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++</td>
+++<td bgcolor="#63c105"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="15" height="1"><br></td>
+++<td bgcolor="#ffffff"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="4" height="1"><br></td>
+++<td bgcolor="#cccccc"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="1"><br></td>
+++</tr>
+++</table>
+++<img src="http://i.yimg.jp/images/volunteer/click/index_side08.gif" width="950" height="16"><br>
+++<!-- /�إå��� -->
+++<!--</td>
+++</tr>
+++</table>-->
+++<!-- ���顼 -->
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="20"><br>
+++<table border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td bgcolor="#000000">
+++<table width="950" border="0" cellpadding="30" cellspacing="2">
+++<tr>
+++<td align="center" valign="top" bgcolor="#ffffff">
+++
+++����å���⤬�Ǥ��ޤ��֥饦����Cookie��ͭ���ˤ��Ƥ���⤦���٥����������Ƥ���������<br>
+++Cookie��������ˡ��ʬ����ʤ�����<a href="http://help.yahoo.co.jp/help/jp/privacy/privacy-21.html">������</a>�Ǥ���ǧ����������<br><a href="http://volunteer.yahoo.co.jp/click/">�⤦���٥�����������</a></td>
+++</tr>
+++</table>
+++</td>
+++</tr>
+++</table>
+++<!-- /���顼 -->
+++<!-- ����å�����褦������äȤ��ʤ��ˤǤ��륳�Ȥ�õ�� -->
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="20"><br>
+++<table width="950" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td width="467" align="left" valign="top">
+++<img src="http://i.yimg.jp/images/volunteer/click/index_title04.gif" alt="����å�����褦��" width="361" height="35"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="10"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/317b00.gif" width="467" height="2"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="20"><br>
+++<table width="467" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td width="110" align="left" valign="top"><img src="http://i.yimg.jp/images/volunteer/click/index_blogparts.jpg" alt="Yahoo!�֥��ѡ��ĤΥ���ץ����" width="90" height="168"><br></td>
+++<td width="357" align="left" valign="top">
+++<font color="#317b00"><b>�֥��ѡ��ĤǶ��ϡ�</b></font><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++���ʤ��Υ֥��˥֥��ѡ��Ĥ�Ϥä�<br>
+++����å�����ޤ��礦��<br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="15"><br>
+++<table width="357" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td align="center">
+++<a href="blogparts/"><img src="http://i.yimg.jp/images/volunteer/click/index_button02.gif" alt="�֥��ѡ��Ĥ�Ϥ�" width="260" height="38" border="0"></a><br>
+++</td>
+++</tr>
+++</table>
+++</td>
+++</tr>
+++</table>
+++</td>
+++<td><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="16" height="1"><br></td>
+++<td width="467" align="left" valign="top">
+++<img src="http://i.yimg.jp/images/volunteer/click/index_title05.gif" alt="��äȤ��ʤ��ˤǤ��륳�Ȥ�õ��" width="403" height="35"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="10"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/317b00.gif" width="467" height="2"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="20"><br>
+++<table width="467" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td align="left" valign="top">
+++<table border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td align="left" valign="top"><img src="http://i.yimg.jp/images/volunteer/click/arrow01.gif" width="16" height="16"><br></td>
+++<td align="left" valign="top"><a href="/donation/index.html">�����ͥå�����</a><br></td>
+++</tr>
+++<tr>
+++<td><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="15"><br></td>
+++<td><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="1"><br></td>
+++</tr>
+++<tr>
+++<td align="left" valign="top"><img src="http://i.yimg.jp/images/volunteer/click/arrow01.gif" width="16" height="16"><br></td>
+++<td align="left" valign="top"><a href="http://carbonoffset.yahoo.co.jp/">�����ܥե��å�</a><br></td>
+++</tr>
+++<tr>
+++<td><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="15"><br></td>
+++<td><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="1"><br></td>
+++</tr>
+++<tr>
+++<td align="left" valign="top"><img src="http://i.yimg.jp/images/volunteer/click/arrow01.gif" width="16" height="16"><br></td>
+++<td align="left" valign="top"><a href="http://volunteer.yahoo.co.jp/bin/search?p=%B4%C4%B6%AD%A4%CE%CA%DD%C1%B4&t=all">�ִĶ��������פ����Τ�õ��</a><br></td>
+++</tr>
+++<tr>
+++<td><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="15"><br></td>
+++<td><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="1"><br></td>
+++</tr>
+++<tr>
+++<td align="left" valign="top"><img src="http://i.yimg.jp/images/volunteer/click/arrow01.gif" width="16" height="16"><br></td>
+++<td align="left" valign="top"><a href="http://volunteer.yahoo.co.jp/bin/search?p=%B9%F1%BA%DD%B6%A8%CE%CF%A1%A6%B8%F2%CE%AE&t=all">�ֹ�ݶ��ϡ���ή�פ����Τ�õ��</a><br></td>
+++</tr>
+++</table>
+++</td>
+++<td align="center" valign="top"><img src="http://i.yimg.jp/images/volunteer/click/index_photo03.jpg" alt="��äȤ��ʤ��ˤǤ��륳�Ȥ�õ��" width="200" height="150"><br></td>
+++</tr>
+++</table>
+++</td>
+++</tr>
+++</table>
+++<!-- /����å�����褦������äȤ��ʤ��ˤǤ��륳�Ȥ�õ�� -->
+++<!-- �����ͥå�����ߤƤߤ褦�� -->
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="20"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/side01.gif" width="950" height="10"><br>
+++<table width="950" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td width="45" bgcolor="#f5f5eb"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="45" height="1"><br></td>
+++<td width="615" align="left" valign="top" bgcolor="#f5f5eb">
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/index_title07.gif" alt="�����ͥå����Ƥߤ褦��" width="428" height="32"><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="10"><br>
+++<span class="s150">�����ͥå����ˤ⡢���ޤ��ޤ�����˥塼������äƤ��ޤ���<br>Yahoo!������åȤˤ���ɻ��������Yahoo!�ݥ���ȤǤ���⤬��ǽ�Ǥ���</span><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="10"><br>
+++<a href="http://volunteer.yahoo.co.jp/donation/index.html"><img src="http://i.yimg.jp/images/volunteer/click/index_button03.gif" alt="�����ͥå�����" width="260" height="38" border="0"></a><br>
+++</td>
+++<td width="54" bgcolor="#f5f5eb"><img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="54" height="1"><br></td>
+++<td width="236" align="left" valign="top" bgcolor="#f5f5eb"><img src="http://i.yimg.jp/images/volunteer/click/index_illust01.gif" alt="�����ͥå����Ƥߤ褦��" width="186" height="144"><br></td>
+++</tr>
+++</table>
+++<img src="http://i.yimg.jp/images/volunteer/click/index_side09.gif" width="950" height="10"><br>
+++<!-- /�����ͥå�����ߤƤߤ褦�� -->
+++<!-- ����å����եå��� -->
+++<table width="950" border="0" cellpadding="0" cellspacing="0">
+++<tr>
+++<td align="center" valign="top">
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="20"><br>
+++<font size="-1">Copyright (C) 2003-2008 United People Corporation. All Rights Reserved.</font><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="5"><br>
+++<a href="http://volunteer.yahoo.co.jp/">Yahoo!�ܥ��ƥ���</a><br>
+++<img src="http://i.yimg.jp/images/volunteer/click/c.gif" width="1" height="20"><br>
+++</td>
+++</tr>
+++</table>
+++<!-- /����å����եå��� -->
+++<!--</td>
+++</tr>
+++</table>-->
+++
+++
+++
+++<!--�եå�-->
+++<br>
+++<table width="100%" border=0 cellspacing=0 cellpadding=0>
+++<tr><td>
+++<!--==================== yjfooter ===================-->
+++<link href="http://i.yimg.jp/yui/jp/footer/csr/css/csr_footer.css" rel="stylesheet" type="text/css">
+++<div id="yjfooter" class="forgood volunteer yjSt">
+++ <div class="wrap">
+++ <p class="links"><a href="http://privacy.yahoo.co.jp/privacy/jp/">�ץ饤�Х����ιͤ���</a> | <a href="http://docs.yahoo.co.jp/docs/info/terms/">���ѵ���</a> | <a href="http://help.yahoo.co.jp/help/jp/volunteer/">�إ��</a></p>
+++ <p class="copyright">Copyright (C) 2008 Yahoo Japan Corporation. All Rights Reserved.</p>
+++ <p class="Ybang">
+++ <a href="http://forgood.yahoo.co.jp/"><img src="http://i.yimg.jp/yui/jp/footer/csr/images/shakaikouken_footer.gif" alt="Yahoo! JAPAN �ͥåȤǡ���äȡ��������ȡ�" width="79" height="45" border="0"></a></p>
+++ </div>
+++</div>
+++<!--=================== /yjfooter ===================-->
+++</td>
+++</tr>
+++</table><!--/�եå�-->
+++
+++<!-- vol01.yahoo.co.jp uncompressed Sat Nov 29 22:25:00 JST 2008 -->
++diff --git a/slimmer/tests/utf-8.html b/slimmer/tests/utf-8.html
++new file mode 100644
++index 0000000..019c69a
++--- /dev/null
+++++ b/slimmer/tests/utf-8.html
++@@ -0,0 +1,5 @@
+++<html>
+++
+++ <p>สวัสดีครับ</p>
+++
+++</html>
++\ No newline at end of file
diff --cc debian/patches/series
index 63e7598,0000000..10fea9d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+debian-changes-0.1.30-2
++0002-Include-missing-test-data-from-github-repository.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-slimmer.git
More information about the Python-modules-commits
mailing list