[Python-modules-commits] [ipython4] 01/10: Remove extra '4' from binary package names

Julien Cristau jcristau at moszumanska.debian.org
Fri Apr 8 11:12:58 UTC 2016 

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

jcristau pushed a commit to branch master
in repository ipython4.

commit aef259c6480f664bf9f3377862843e65999636f2
Author: Julien Cristau <julien.cristau at logilab.fr>
Date:   Fri Apr 8 12:31:47 2016 +0200

    Remove extra '4' from binary package names
---
 debian/control                                         | 18 +++++++++++-------
 debian/ipython.install                                 |  2 ++
 debian/{ipython4-3.manpages => ipython.manpages}       |  0
 debian/{ipython4.sh => ipython.sh}                     |  0
 debian/ipython3.install                                |  2 ++
 debian/{ipython4.manpages => ipython3.manpages}        |  0
 debian/{ipython4-3.sh => ipython3.sh}                  |  0
 debian/ipython4-3.install                              |  2 --
 debian/ipython4.install                                |  2 --
 ...ython4-doc.doc-base => python-ipython-doc.doc-base} |  6 +++---
 debian/python3-ipython.lintian-overrides               |  2 ++
 debian/python3-ipython4.lintian-overrides              |  2 --
 debian/rules                                           | 16 ++++++++--------
 13 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/debian/control b/debian/control
index 6f6a411..70a2aaf 100644
--- a/debian/control
+++ b/debian/control
@@ -29,9 +29,11 @@ X-Python3-Version: >= 3.2
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/ipython4.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/ipython4.git
 
-Package: python-ipython4
+Package: python-ipython
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
+Breaks: ipython (<< 4)
+Replaces: ipython (<< 4)
 Description: Enhanced interactive Python shell (Python 2 version)
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific
@@ -45,7 +47,7 @@ Description: Enhanced interactive Python shell (Python 2 version)
  This package contains the backend terminal shell for Python 2: for
  the actual frontend install ipython.
 
-Package: python-ipython4-doc
+Package: python-ipython-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
@@ -61,9 +63,11 @@ Description: Enhanced interactive Python shell (documentation)
  .
  This package contains the documentation.
 
-Package: python3-ipython4
+Package: python3-ipython
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
+Breaks: ipython3 (<< 4)
+Replaces: ipython3 (<< 4)
 Description: Enhanced interactive Python shell (Python 3 version)
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific
@@ -77,10 +81,10 @@ Description: Enhanced interactive Python shell (Python 3 version)
  This package contains the backend terminal shell for Python 3: for
  the actual frontend install ipython.
 
-Package: ipython4
+Package: ipython
 Architecture: all
 Section: interpreters
-Depends: python-ipython4 (= ${binary:Version}), ${misc:Depends}
+Depends: python-ipython (= ${binary:Version}), ${misc:Depends}
 Description: Enhanced interactive Python 2 shell
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific
@@ -93,10 +97,10 @@ Description: Enhanced interactive Python 2 shell
  .
  This package contains the actual terminal shell for Python 2.
 
-Package: ipython4-3
+Package: ipython3
 Architecture: all
 Section: interpreters
-Depends: python3-ipython4 (= ${binary:Version}), ${misc:Depends}
+Depends: python3-ipython (= ${binary:Version}), ${misc:Depends}
 Description: Enhanced interactive Python 3 shell
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific
diff --git a/debian/ipython.install b/debian/ipython.install
new file mode 100755
index 0000000..df68638
--- /dev/null
+++ b/debian/ipython.install
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+debian/ipython.sh => /usr/bin/ipython
diff --git a/debian/ipython4-3.manpages b/debian/ipython.manpages
similarity index 100%
rename from debian/ipython4-3.manpages
rename to debian/ipython.manpages
diff --git a/debian/ipython4.sh b/debian/ipython.sh
similarity index 100%
rename from debian/ipython4.sh
rename to debian/ipython.sh
diff --git a/debian/ipython3.install b/debian/ipython3.install
new file mode 100755
index 0000000..4cb431d
--- /dev/null
+++ b/debian/ipython3.install
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+debian/ipython3.sh => /usr/bin/ipython3
diff --git a/debian/ipython4.manpages b/debian/ipython3.manpages
similarity index 100%
rename from debian/ipython4.manpages
rename to debian/ipython3.manpages
diff --git a/debian/ipython4-3.sh b/debian/ipython3.sh
similarity index 100%
rename from debian/ipython4-3.sh
rename to debian/ipython3.sh
diff --git a/debian/ipython4-3.install b/debian/ipython4-3.install
deleted file mode 100755
index 0e87bad..0000000
--- a/debian/ipython4-3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-debian/ipython4-3.sh => /usr/bin/ipython4-3
diff --git a/debian/ipython4.install b/debian/ipython4.install
deleted file mode 100755
index 3b80d7e..0000000
--- a/debian/ipython4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-debian/ipython4.sh => /usr/bin/ipython4
diff --git a/debian/python-ipython4-doc.doc-base b/debian/python-ipython-doc.doc-base
similarity index 51%
rename from debian/python-ipython4-doc.doc-base
rename to debian/python-ipython-doc.doc-base
index 1445f57..434dc1c 100644
--- a/debian/python-ipython4-doc.doc-base
+++ b/debian/python-ipython-doc.doc-base
@@ -1,9 +1,9 @@
-Document: python-ipython4-doc
+Document: python-ipython-doc
 Title: IPython Documentation
 Author: IPython Development Team
 Abstract: Sphinx documentation for IPython
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-ipython4-doc/html/index.html
-Files: /usr/share/doc/python-ipython4-doc/html/*
+Index: /usr/share/doc/python-ipython-doc/html/index.html
+Files: /usr/share/doc/python-ipython-doc/html/*
diff --git a/debian/python3-ipython.lintian-overrides b/debian/python3-ipython.lintian-overrides
new file mode 100644
index 0000000..8b0c553
--- /dev/null
+++ b/debian/python3-ipython.lintian-overrides
@@ -0,0 +1,2 @@
+# necessary because of bug #804249
+python3-ipython: python-module-in-wrong-location
diff --git a/debian/python3-ipython4.lintian-overrides b/debian/python3-ipython4.lintian-overrides
deleted file mode 100644
index a4e0132..0000000
--- a/debian/python3-ipython4.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# necessary because of bug #804249
-python3-ipython4: python-module-in-wrong-location
diff --git a/debian/rules b/debian/rules
index 9e2d8a4..c17f8d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export PYBUILD_NAME=ipython4
+export PYBUILD_NAME=ipython
 export LC_ALL=C.UTF-8
 
 %:
@@ -10,21 +10,21 @@ export LC_ALL=C.UTF-8
 override_dh_auto_install:
 	dh_auto_install
 
-	rm -r `find debian/python-ipython4 -name tests -type d`
-	rm -r debian/python-ipython4/usr/bin debian/python-ipython4/usr/share/man
-	rm -r `find debian/python3-ipython4 -name tests -type d`
-	rm -r debian/python3-ipython4/usr/bin debian/python3-ipython4/usr/share/man
+	rm -r `find debian/python-ipython -name tests -type d`
+	rm -r debian/python-ipython/usr/bin debian/python-ipython/usr/share/man
+	rm -r `find debian/python3-ipython -name tests -type d`
+	rm -r debian/python3-ipython/usr/bin debian/python3-ipython/usr/share/man
 
 override_dh_auto_test:
 	@echo "No test to avoid circular dependencies"
 
 override_dh_installman:
 	dh_installman
-	mv debian/ipython4/usr/share/man/man1/ipython.1 debian/ipython4/usr/share/man/man1/ipython4.1
-	mv debian/ipython4-3/usr/share/man/man1/ipython.1 debian/ipython4-3/usr/share/man/man1/ipython4-3.1
+	mv debian/ipython/usr/share/man/man1/ipython.1 debian/ipython/usr/share/man/man1/ipython.1
+	mv debian/ipython3/usr/share/man/man1/ipython.1 debian/ipython3/usr/share/man/man1/ipython3.1
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. sphinx-build -b html docs/source debian/python-ipython4-doc/usr/share/doc/python-ipython4-doc/html
+	PYTHONPATH=. sphinx-build -b html docs/source debian/python-ipython-doc/usr/share/doc/python-ipython-doc/html
 	dh_sphinxdoc -O--buildsystem=pybuild
 endif

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

More information about the Python-modules-commits mailing list