[Python-modules-commits] r19870 - in packages/python-html2text/trunk/debian (5 files)

Wed Jan 4 13:32:54 UTC 2012

Date: Wednesday, January 4, 2012 @ 13:32:53
  Author: stefanor
Revision: 19870

* New upstream release.
  - Upstream version numbers are no longer decimal, no need to mangle them.
  - Take advantage of upstream's entry-point binaries.
  - Update manpage for new options.
* debian/rules: set -x for setup.py loops.
* Move html2markdown to oldlibs/extra.

Modified:
  packages/python-html2text/trunk/debian/changelog
  packages/python-html2text/trunk/debian/control
  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	2012-01-04 12:38:36 UTC (rev 19869)
+++ packages/python-html2text/trunk/debian/changelog	2012-01-04 13:32:53 UTC (rev 19870)
@@ -1,3 +1,14 @@
+python-html2text (3.200.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Upstream version numbers are no longer decimal, no need to mangle them.
+    - Take advantage of upstream's entry-point binaries.
+    - Update manpage for new options.
+  * debian/rules: set -x for setup.py loops.
+  * Move html2markdown to oldlibs/extra.
+
+ -- Stefano Rivera <stefanor at debian.org>  Wed, 04 Jan 2012 15:32:49 +0200
+
 python-html2text (3.1.0.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/python-html2text/trunk/debian/control
===================================================================
--- packages/python-html2text/trunk/debian/control	2012-01-04 12:38:36 UTC (rev 19869)
+++ packages/python-html2text/trunk/debian/control	2012-01-04 13:32:53 UTC (rev 19870)
@@ -42,7 +42,8 @@
  html2markdown.
 
 Package: html2markdown
-Section: web
+Section: oldlibs
+Priority: extra
 Architecture: all
 Depends:
  python-html2text (= ${source:Version}) | python3-html2text (= ${source:Version}),

Modified: packages/python-html2text/trunk/debian/html2markdown.1
===================================================================
--- packages/python-html2text/trunk/debian/html2markdown.1	2012-01-04 12:38:36 UTC (rev 19869)
+++ packages/python-html2text/trunk/debian/html2markdown.1	2012-01-04 13:32:53 UTC (rev 19870)
@@ -1,9 +1,9 @@
-.TH HTML2MARKDOWN "1" "February 2011" "html2markdown 3.01" "User Commands"
+.TH HTML2MARKDOWN "1" "January 2012" "html2markdown 3.200.1" "User Commands"
 .SH NAME
 html2markdown \- converts a page of HTML into markdown.
 .SH SYNOPSIS
 .B html2markdown
-[(\fIfilename\fR|\fIurl\fR) [\fIencoding\fR]]
+[options...] [(\fIfilename\fR|\fIurl\fR) [\fIencoding\fR]]
 .SH DESCRIPTION
 \fBhtml2markdown\fR downloads the specified HTML page, and converts it
 to text marked up with markdown.
@@ -19,11 +19,37 @@
 to be UTF-8.
 .SH OPTIONS
 .TP
-\fB\-\-version\fR
-show program's version number and exit
+.B \-\-ignore\-emphasis
+Don't include any formatting for emphasis.
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show a help message and exit
+.B \-\-ignore\-links
+Don't include any formatting for links.
+.TP
+.B \-\-ignore\-images
+Don't include any formatting for images.
+.TP
+.BR \-g ", " \-\-google\-doc
+Convert an html-exported Google Document.
+.TP
+.BR \-d ", " \-\-dash\-unordered\-list
+Use a dash rather than a star for unordered list items.
+.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
+\fB\-i\fR \fILIST_INDENT\fR, \fB\-\-google\-list\-indent\fR=\fILIST_INDENT\fR
+Number of pixels Google indents nested lists.
+.TP
+.BR \-s ", " \-\-hide\-strikethrough
+Hide strike-through text. Only relevant when \fB-g\fR is specified as
+well.
+.TP
+.B \-\-version
+Show program's version number and exit.
+.TP
+.BR \-h ", " \-\-help
+Show a help message and exit.
+
 .SH AUTHOR
 This manpage was written for Debian, by Stefano Rivera
 <stefanor at debian.org>.

Modified: packages/python-html2text/trunk/debian/rules
===================================================================
--- packages/python-html2text/trunk/debian/rules	2012-01-04 12:38:36 UTC (rev 19869)
+++ packages/python-html2text/trunk/debian/rules	2012-01-04 13:32:53 UTC (rev 19870)
@@ -7,22 +7,28 @@
 	dh $@ --with python2,python3
 
 override_dh_auto_build:
-	set -e; \
+	set -e -x; \
 	for py in $(PYVERS) $(PY3VERS); do \
 		$$py setup.py build; \
 	done
 
 override_dh_auto_install:
-	set -e; \
+	set -e -x; \
 	for py in $(PYVERS); do \
 		$$py setup.py install --skip-build --root debian/python-html2text \
 		                      --install-layout deb; \
-	done
-	set -e; \
+	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
+	done; \
+	cd debian/python3-html2text/usr/bin; \
+	mv html2text html2markdown.py3; \
+	sed -i '1s,#!.*python.*,#!/usr/bin/python3,' html2markdown.py3
 
 override_dh_installman:
 	cp debian/html2markdown.1 debian/html2markdown.py2.1
@@ -30,19 +36,6 @@
 	cp debian/html2markdown.1 debian/html2markdown.py3.1
 	dh_installman -p python3-html2text debian/html2markdown.py3.1
 
-override_dh_link:
-	dh_link -p python-html2text /usr/share/pyshared/html2text.py \
-	                            /usr/bin/html2markdown.py2
-	dh_link -p python3-html2text /usr/lib/python3/dist-packages/html2text.py \
-	                             /usr/bin/html2markdown.py3
-	sed -i '1s,python$$,python3,' \
-	    debian/python3-html2text/usr/lib/python3/dist-packages/html2text.py
-
-override_dh_fixperms:
-	dh_fixperms
-	chmod +x debian/python-html2text/usr/share/pyshared/html2text.py
-	chmod +x debian/python3-html2text/usr/lib/python3/dist-packages/html2text.py
-
 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	2012-01-04 12:38:36 UTC (rev 19869)
+++ packages/python-html2text/trunk/debian/watch	2012-01-04 13:32:53 UTC (rev 19870)
@@ -1,6 +1,3 @@
 version=3
 
-# Mangling version is necessary, as upstream pretends that 2.2 < 2.29 < 2.291 < 2.3
-# We put a dot between every digit of the minor number.
-opts="uversionmangle=s/^(\d+)\.(\d)(\d+)/$1.$2.$3/;s/^(\d+)\.(\d).(\d)(\d+)/$1.$2.$3.$4/" \
 http://pypi.python.org/packages/source/h/html2text/html2text-(.*)\.tar.gz


