[Python-modules-commits] r31127 - in packages/python-html2text/trunk/debian (13 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Sat Oct 18 18:15:59 UTC 2014
Date: Saturday, October 18, 2014 @ 18:15:58
Author: stefanor
Revision: 31127
* New upstream release.
- New upstream maintainer.
* Update copyright.
* Switch watch file to use https.
* Drop html2markdown transitional package.
* Bump debhelper compat level to 9.
* Port to pybuild.
* Recommend python3-feedparser, which now exists.
* Update manpage, documenting new arguments.
* Bump Standards-Version to 3.9.6, no changes needed.
* Bump X-Python-Version to >= 2.4, 2.3 compatibility isn't claimed any more.
Added:
packages/python-html2text/trunk/debian/clean
packages/python-html2text/trunk/debian/patches/
packages/python-html2text/trunk/debian/patches/series
packages/python-html2text/trunk/debian/patches/skip-install-tests
packages/python-html2text/trunk/debian/python-html2text.install
packages/python-html2text/trunk/debian/python3-html2text.install
Modified:
packages/python-html2text/trunk/debian/changelog
packages/python-html2text/trunk/debian/compat
packages/python-html2text/trunk/debian/control
packages/python-html2text/trunk/debian/copyright
packages/python-html2text/trunk/debian/html2markdown.1
packages/python-html2text/trunk/debian/rules
packages/python-html2text/trunk/debian/watch
Modified: packages/python-html2text/trunk/debian/changelog
===================================================================
--- packages/python-html2text/trunk/debian/changelog 2014-10-18 17:39:11 UTC (rev 31126)
+++ packages/python-html2text/trunk/debian/changelog 2014-10-18 18:15:58 UTC (rev 31127)
@@ -1,9 +1,23 @@
-python-html2text (3.200.3-3) UNRELEASED; urgency=low
+python-html2text (2014.9.25-1) UNRELEASED; urgency=low
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:02:45 +0200
+ [ Stefano Rivera ]
+ * New upstream release.
+ - New upstream maintainer.
+ * Update copyright.
+ * Switch watch file to use https.
+ * Drop html2markdown transitional package.
+ * Bump debhelper compat level to 9.
+ * Port to pybuild.
+ * Recommend python3-feedparser, which now exists.
+ * Update manpage, documenting new arguments.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Bump X-Python-Version to >= 2.4, 2.3 compatibility isn't claimed any more.
+ -- Stefano Rivera <stefanor at debian.org> Fri, 17 Oct 2014 20:59:53 -0700
+
python-html2text (3.200.3-2) unstable; urgency=low
* Add missing Depends on python{3,}-pkg-resources (Closes: #672901). Thanks
Added: packages/python-html2text/trunk/debian/clean
===================================================================
--- packages/python-html2text/trunk/debian/clean (rev 0)
+++ packages/python-html2text/trunk/debian/clean 2014-10-18 18:15:58 UTC (rev 31127)
@@ -0,0 +1 @@
+debian/html2markdown.py*.1
Modified: packages/python-html2text/trunk/debian/compat
===================================================================
--- packages/python-html2text/trunk/debian/compat 2014-10-18 17:39:11 UTC (rev 31126)
+++ packages/python-html2text/trunk/debian/compat 2014-10-18 18:15:58 UTC (rev 31127)
@@ -1 +1 @@
-7
+9
Modified: packages/python-html2text/trunk/debian/control
===================================================================
--- packages/python-html2text/trunk/debian/control 2014-10-18 17:39:11 UTC (rev 31126)
+++ packages/python-html2text/trunk/debian/control 2014-10-18 18:15:58 UTC (rev 31127)
@@ -4,21 +4,22 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Stefano Rivera <stefanor at debian.org>
Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
+ dh-python,
python-all (>= 2.6.5-13~),
python-setuptools,
python3-all (>= 3.1.2-12~),
python3-setuptools
-Standards-Version: 3.9.3
-Homepage: http://www.aaronsw.com/2002/html2text/
+Standards-Version: 3.9.6
+Homepage: https://alir3z4.github.io/html2text
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-html2text/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-html2text/trunk/
-X-Python-Version: >= 2.3
+X-Python-Version: >= 2.4
X-Python3-Version: >= 3.0
Package: python-html2text
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
Recommends: python-feedparser
Conflicts: html2markdown (<< 3.0.1-2)
Description: Python module for converting HTML to Markdown text
@@ -31,7 +32,8 @@
Package: python3-html2text
Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-pkg-resources
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
+Recommends: python3-feedparser
Conflicts: html2markdown (<< 3.0.1-2)
Description: Python module for converting HTML to Markdown text (Python3 version)
html2text is a Python module that converts a page of HTML into clean,
@@ -40,14 +42,3 @@
.
This package contains the Python 3 version of the library, and a script,
html2markdown.
-
-Package: html2markdown
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- python-html2text (= ${source:Version}) | python3-html2text (= ${source:Version}),
- ${misc:Depends}
-Description: Dummy upgrade package for merge of html2markdown into python-html2text
- This is a transitional package and can safely be removed; see the
- python-html2text and python3-html2text packages instead.
Modified: packages/python-html2text/trunk/debian/copyright
===================================================================
--- packages/python-html2text/trunk/debian/copyright 2014-10-18 17:39:11 UTC (rev 31126)
+++ packages/python-html2text/trunk/debian/copyright 2014-10-18 18:15:58 UTC (rev 31127)
@@ -1,10 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: html2text
-Upstream-Contact: Aaron Swartz <me at aaronsw.com>
-Source: http://www.aaronsw.com/2002/html2text/
+Upstream-Contact: Alireza Savand <alireza.savand at gmail.com>
+Source: https://github.com/Alir3z4/html2text/
Files: *
Copyright: 2004-2012, Aaron Swartz
+ 2014, Alireza Savand
+ 2011, Yariv Barkan
+ 2012, Alex Musayev
+ 2013-2014, Matěj Cepl
+ 2014, Ivan Gromov
License: GPL-3
html2text is available under the GNU GPL 3.0.
.
@@ -12,7 +17,7 @@
version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: 2010-2012, Stefano Rivera <stefanor at debian.org>
+Copyright: 2010-2014, Stefano Rivera <stefanor at debian.org>
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: packages/python-html2text/trunk/debian/html2markdown.1
===================================================================
--- packages/python-html2text/trunk/debian/html2markdown.1 2014-10-18 17:39:11 UTC (rev 31126)
+++ packages/python-html2text/trunk/debian/html2markdown.1 2014-10-18 18:15:58 UTC (rev 31127)
@@ -1,4 +1,4 @@
-.TH HTML2MARKDOWN "1" "January 2012" "html2markdown 3.200.1" "User Commands"
+.TH HTML2MARKDOWN "1" "October 2014" "html2markdown 2014.9.25" "User Commands"
.SH NAME
html2markdown \- converts a page of HTML into markdown.
.SH SYNOPSIS
@@ -34,6 +34,9 @@
.BR \-d ", " \-\-dash\-unordered\-list
Use a dash rather than a star for unordered list items.
.TP
+.BR \-e ", " \-\-asterisk\-emphasis
+Use an asterisk rather than an underscore for emphasized text.
+.TP
\fB\-b\fR \fIBODY_WIDTH\fR, \fB\-\-body\-width\fR=\fIBODY_WIDTH\fR
Number of characters per output line, \fB0\fR for no wrap.
.TP
@@ -44,6 +47,12 @@
Hide strike-through text. Only relevant when \fB-g\fR is specified as
well.
.TP
+.B \-\-escape\-all
+Escape all special characters. Output is less readable, but avoids corner case formatting issues.
+.TP
+.B \-\-bypass\-tables
+Format tables in HTML rather than Markdown syntax.
+.TP
.B \-\-version
Show program's version number and exit.
.TP
Added: packages/python-html2text/trunk/debian/patches/series
===================================================================
--- packages/python-html2text/trunk/debian/patches/series (rev 0)
+++ packages/python-html2text/trunk/debian/patches/series 2014-10-18 18:15:58 UTC (rev 31127)
@@ -0,0 +1 @@
+skip-install-tests
Added: packages/python-html2text/trunk/debian/patches/skip-install-tests
===================================================================
--- packages/python-html2text/trunk/debian/patches/skip-install-tests (rev 0)
+++ packages/python-html2text/trunk/debian/patches/skip-install-tests 2014-10-18 18:15:58 UTC (rev 31127)
@@ -0,0 +1,17 @@
+Description: Do not install tests
+ Previously, they were installed as a top-level package.
+Author: Alireza Savand <alireza.savand at gmail.com>
+Bug-Upstream: https://github.com/Alir3z4/html2text/issues/36
+Origin: upstream, https://github.com/Alir3z4/html2text/commit/f7bf5428a0831f5648a2d95e4a0bd9fedcbda0ad
+
+--- a/setup.py
++++ b/setup.py
+@@ -67,7 +67,7 @@
+ license='GNU GPL 3',
+ requires=requires_list,
+ py_modules=['html2text'],
+- packages=find_packages(),
++ packages=find_packages(exclude=['test']),
+ include_package_data=True,
+ zip_safe=False,
+ )
Added: packages/python-html2text/trunk/debian/python-html2text.install
===================================================================
--- packages/python-html2text/trunk/debian/python-html2text.install (rev 0)
+++ packages/python-html2text/trunk/debian/python-html2text.install 2014-10-18 18:15:58 UTC (rev 31127)
@@ -0,0 +1,2 @@
+/usr/lib/python2.*/dist-packages
+/usr/bin/html2markdown.py2
Added: packages/python-html2text/trunk/debian/python3-html2text.install
===================================================================
--- packages/python-html2text/trunk/debian/python3-html2text.install (rev 0)
+++ packages/python-html2text/trunk/debian/python3-html2text.install 2014-10-18 18:15:58 UTC (rev 31127)
@@ -0,0 +1,2 @@
+/usr/lib/python3.*/dist-packages
+/usr/bin/html2markdown.py3
Modified: packages/python-html2text/trunk/debian/rules
===================================================================
--- packages/python-html2text/trunk/debian/rules 2014-10-18 17:39:11 UTC (rev 31126)
+++ packages/python-html2text/trunk/debian/rules 2014-10-18 18:15:58 UTC (rev 31127)
@@ -1,41 +1,17 @@
#!/usr/bin/make -f
-PYVERS := $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
-
%:
- dh $@ --with python2,python3
+ dh $@ --buildsystem pybuild --with python2,python3
-override_dh_auto_build:
- set -e -x; \
- for py in $(PYVERS) $(PY3VERS); do \
- $$py setup.py build; \
- done
-
override_dh_auto_install:
- set -e -x; \
- for py in $(PYVERS); do \
- $$py setup.py install --skip-build --root debian/python-html2text \
- --install-layout deb; \
- done; \
- cd debian/python-html2text/usr/bin; \
- mv html2text html2markdown.py2; \
- sed -i '1s,#!.*python.*,#!/usr/bin/python,' html2markdown.py2
- set -e -x; \
- for py in $(PY3VERS); do \
- $$py setup.py install --skip-build --root debian/python3-html2text \
- --install-layout deb; \
- done; \
- cd debian/python3-html2text/usr/bin; \
- mv html2text html2markdown.py3; \
- sed -i '1s,#!.*python.*,#!/usr/bin/python3,' html2markdown.py3
+ dh_auto_install -- --after-install \
+ 'mv {destdir}/usr/bin/html2text {destdir}/usr/bin/html2markdown.py{version.major}'
+override_dh_installchangelogs:
+ dh_installchangelogs ChangeLog.rst
+
override_dh_installman:
cp debian/html2markdown.1 debian/html2markdown.py2.1
dh_installman -p python-html2text debian/html2markdown.py2.1
cp debian/html2markdown.1 debian/html2markdown.py3.1
dh_installman -p python3-html2text debian/html2markdown.py3.1
-
-override_dh_auto_clean:
- rm -rf build *.egg-info
- rm -f debian/html2markdown.py2.1 debian/html2markdown.py3.1
Modified: packages/python-html2text/trunk/debian/watch
===================================================================
--- packages/python-html2text/trunk/debian/watch 2014-10-18 17:39:11 UTC (rev 31126)
+++ packages/python-html2text/trunk/debian/watch 2014-10-18 18:15:58 UTC (rev 31127)
@@ -1,3 +1,3 @@
version=3
-http://pypi.python.org/packages/source/h/html2text/html2text-(.*)\.tar.gz
+https://pypi.python.org/packages/source/h/html2text/html2text-(.*)\.tar.gz
More information about the Python-modules-commits
mailing list