[Python-modules-commits] [pygments] 05/05: Merge Piotr's 2.0.1+dfsg-2 upload

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository pygments.

commit 94abac654ca447812256a3cae1f3f8fbcaaa8a90
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jan 25 17:51:21 2016 +0300

    Merge Piotr's 2.0.1+dfsg-2 upload
---
 debian/changelog | 16 +++++++++++++++-
 debian/dirs      |  2 +-
 debian/rules     |  2 +-
 debian/watch     |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 166e675..898a993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,23 @@
-pygments (2.0.1+dfsg-2) UNRELEASED; urgency=medium
+pygments (2.1+dfsg-1) UNRELEASED; urgency=medium
 
   * Disable two tests that need example files, again.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 28 Jul 2015 22:29:07 +0300
 
+pygments (2.0.1+dfsg-2) unstable; urgency=high
+
+  [ Salvatore Bonaccorso ]
+  * Add CVE-2015-8557.patch patch.
+    CVE-2015-8557: Shell injection in FontManager._get_nix_font_path.
+    (Closes: #802828)
+
+  [ Piotr Ożarowski ]
+  * debian/watch: use pypi.debian.net redirector
+  * install pygmentize's bash completion to
+    /usr/share/bash-completion/completions
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 10 Jan 2016 18:56:35 +0100
+
 pygments (2.0.1+dfsg-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/dirs b/debian/dirs
index 19bcc32..3096425 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1 @@
-/etc/bash_completion.d
+/usr/share/bash-completion/completions
diff --git a/debian/rules b/debian/rules
index 09af065..2caabdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ install: build install-stamp $(PYVERS:%=install-python%-stamp)
 
 install-stamp:
 	dh_installdirs
-	install -m 644 external/pygments.bashcomp debian/python-pygments/etc/bash_completion.d/pygmentize
+	install -m 644 external/pygments.bashcomp debian/python-pygments/usr/share/bash-completion/completions/pygmentize
 	touch $@
 
 install-python%-stamp:
diff --git a/debian/watch b/debian/watch
index d16c08e..a591c89 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+dfsg//,uversionmangle=s/(beta|rc|a|b|c)/~$1/ \
-http://pypi.python.org/packages/source/P/Pygments/Pygments-(.*)\.tar\.gz
+https://pypi.debian.net/Pygments/Pygments-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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