[Python-modules-commits] [ipython4] 12/14: Install the changelog

[Gordon Ball]

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

chronitis-guest pushed a commit to branch master
in repository ipython4.

commit e26bc53a5f2167c5d5a00182709186c4baec6db0
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sat Jun 24 12:34:20 2017 +0200

    Install the changelog
---
 debian/changelog     |  1 +
 debian/rules         |  7 +++++++
 debian/tests/control | 11 ++++-------
 debian/tests/ipython | 12 ------------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51e6575..69c28b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ipython (5.4.0-1) UNRELEASED; urgency=medium
   * Set minimum python3 version to 3.3
   * Use python3 sphinx for documentation
   * Add autopkgtests for importability and simple syntax examples
+  * Install the upstream changelog
 
  -- Gordon Ball <gordon at chronitis.net>  Sat, 24 Jun 2017 11:19:04 +0200
 
diff --git a/debian/rules b/debian/rules
index 6fe0e0f..e8d4af0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+DEB_VERSION_MAJOR := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -c 1)
+
 #export DH_VERBOSE=1
 export PYBUILD_NAME=ipython
 export LC_ALL=C.UTF-8
 
+
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
@@ -27,3 +31,6 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. sphinx-build -b html docs/source debian/python-ipython-doc/usr/share/doc/python-ipython-doc/html
 	dh_sphinxdoc -O--buildsystem=pybuild
 endif
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k docs/source/whatsnew/version$(DEB_VERSION_MAJOR).rst
diff --git a/debian/tests/control b/debian/tests/control
index 7bce7af..69b18d7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,8 +1,5 @@
-Test-Command: python -c 'import IPython'
-Depends: python-ipython
+Test-Command: python -c "import IPython; print IPython"
+Depends: python, python-ipython
 
-Test-Command: python3 -c 'import IPython'
-Depends: python3-ipython
-
-Tests: ipython
-Depends: ipython, ipython3
+Test-Command: python3 -c "import IPython; print(IPython)"
+Depends: python3, python3-ipython
diff --git a/debian/tests/ipython b/debian/tests/ipython
deleted file mode 100644
index 5f9cd72..0000000
--- a/debian/tests/ipython
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-export HOME=$AUTOPKGTEST_TMP
-export LC_ALL=C.UTF-8
-
-for ipy in ipython ipython3; do
-    $ipy -c "1+1"
-    $ipy -c "%ls"
-    $ipy -c "%sh echo shtest"
-    $ipy -c "!true"
-    $ipy -c "%timeit __import__('time').sleep(1)"
-done

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