[cvxopt] 37/64: Imported Debian patch 1.1.4-1.5

[Andreas Tille]

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

tille pushed a commit to branch master
in repository cvxopt.

commit 1e16c60bff11eeabfcf6feb4cc03813d0c6c0a68
Author: Bas Couwenberg <sebastic at debian.org>
Date:   Sat Jul 16 17:47:04 2016 +0200

    Imported Debian patch 1.1.4-1.5
---
 debian/changelog | 10 ++++++++++
 debian/control   |  2 +-
 debian/watch     |  8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 527400e..e4ca114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cvxopt (1.1.4-1.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add build dependency on texlive-generic-extra for iftex.sty.
+    (closes: #830343)
+  * Update watch file for GitHub releases.
+    (closes: #780307)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 16 Jul 2016 17:47:04 +0200
+
 cvxopt (1.1.4-1.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index fd5a9bb..1862b60 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 5),
  libatlas-base-dev [!powerpc !alpha !arm !armel], libblas-dev, liblapack-dev,
  python-sphinx, libglpk-dev, libfftw3-dev, libgsl-dev, libdsdp-dev (>= 5.8-4),
  texlive-latex-base, texlive-latex-recommended, texlive-latex-extra,
- texlive-fonts-recommended, python-all-dev (>= 2.6.6-3~),
+ texlive-fonts-recommended, texlive-generic-extra, python-all-dev (>= 2.6.6-3~),
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.2
 Homepage: http://abel.ee.ucla.edu/cvxopt
diff --git a/debian/watch b/debian/watch
index a1dd7a3..4960567 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,8 @@
 version=3
-http://abel.ee.ucla.edu/src/cvxopt-(.*).tar.gz debian debian/orig-tar.sh
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
+filenamemangle=s/(?:.*?)?(?:rel|v|cvxopt)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/cvxopt-$1.$2/ \
+https://github.com/cvxopt/cvxopt/releases \
+(?:.*?/)?(?:rel|v|cvxopt)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \
+debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cvxopt.git