[Python-modules-commits] [python-docutils] 01/02: Stop symlinking rst2html4 → rst2html, use upstream script instead.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch debian/master
in repository python-docutils.

commit cb7429fca36aaf4a7bd8079fcfc48e7e94155a32
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Sep 19 13:41:42 2017 +0300

    Stop symlinking rst2html4 → rst2html, use upstream script instead.
---
 debian/changelog | 1 +
 debian/rules     | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ff0692..ce7bac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-docutils (0.14+dfsg-1) UNRELEASED; urgency=medium
   * Update debian/watch to properly mangle upstream pre-releases.
   * Drop get_column_widths-compatibility.diff, applied upstream.
   * Refresh and rebase other patches.
+  * Stop symlinking rst2html4 → rst2html, use upstream script instead.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 19 Sep 2017 00:17:27 +0300
 
diff --git a/debian/rules b/debian/rules
index c56ffed..54a83ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,14 +95,12 @@ install: build
 	find debian/tmp/ -type d -empty -delete
 	sed -i -e 's/^\(_debian_package\) = /\1 = 1/' debian/tmp/usr/lib/python[23]*/*-packages/docutils/__init__.py
 	# Give scripts canonical names
-	# Temporarily symlink rst2html4 to rst2html, remove this with the next release
 	mkdir -p debian/tmp/usr/share/docutils/scripts/python2/
 	set -ex && for python in python2 python3; do \
 		dir=debian/tmp/usr/share/docutils/scripts/$$python/; \
-		for exe in $(filter-out rst-buildhtml rst2html4,$(scripts)); do \
+		for exe in $(filter-out rst-buildhtml,$(scripts)); do \
 			mv $$dir/$$exe.py $$dir/$$exe; \
 		done; \
-		ln -s rst2html $$dir/rst2html4; \
 		install tools/buildhtml.py $$dir/rst-buildhtml; \
 		sed -i -e "1 s,^#!.*,#!/usr/bin/$${python%2}," $$dir/rst-buildhtml; \
 	done

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