[Python-modules-commits] r1169 - in /packages/ipython/trunk/debian: changelog control ipython-common.doc-base ipython.links python2.3-ipython.links python2.3-ipython.postinst python2.3-ipython.prerm python2.4-ipython.links python2.4-ipython.postinst python2.4-ipython.prerm rules

nobse at users.alioth.debian.org nobse at users.alioth.debian.org
Thu Jul 20 00:12:23 UTC 2006


Author: nobse
Date: Thu Jul 20 00:12:20 2006
New Revision: 1169

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1169
Log:
Imported Matthias' NMU.

Removed:
    packages/ipython/trunk/debian/ipython-common.doc-base
    packages/ipython/trunk/debian/ipython.links
    packages/ipython/trunk/debian/python2.3-ipython.links
    packages/ipython/trunk/debian/python2.3-ipython.postinst
    packages/ipython/trunk/debian/python2.3-ipython.prerm
    packages/ipython/trunk/debian/python2.4-ipython.links
    packages/ipython/trunk/debian/python2.4-ipython.postinst
    packages/ipython/trunk/debian/python2.4-ipython.prerm
Modified:
    packages/ipython/trunk/debian/changelog
    packages/ipython/trunk/debian/control
    packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/changelog?rev=1169&op=diff
==============================================================================
--- packages/ipython/trunk/debian/changelog (original)
+++ packages/ipython/trunk/debian/changelog Thu Jul 20 00:12:20 2006
@@ -1,3 +1,18 @@
+ipython (0.7.2-3.1) unstable; urgency=medium
+
+  * NMU.
+  * Convert to updated Python policy. Closes: #377787.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 13 Jul 2006 17:42:06 +0000
+
+ipython (0.7.2-3ubuntu1) edgy; urgency=low
+
+  * Synchronize with Debian unstable.
+  * Convert to updated Python policy. Collapse all packages into one
+    ipython package, don't handle ipython using alternatives.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 11 Jul 2006 09:47:37 +0000
+
 ipython (0.7.2-3) unstable; urgency=low
 
   * Removed alternative for irunner manpage.

Modified: packages/ipython/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/control?rev=1169&op=diff
==============================================================================
--- packages/ipython/trunk/debian/control (original)
+++ packages/ipython/trunk/debian/control Thu Jul 20 00:12:20 2006
@@ -3,14 +3,19 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <nobse at debian.org>
-Build-Depends-Indep: debhelper (>> 4.1.65), dpatch (>= 2.0.10), python, python2.3-dev, python2.4-dev
+Build-Depends-Indep: debhelper (>= 5.0.37.2), dpatch (>= 2.0.10), python-all-dev (>= 2.3.5-11), python-central (>= 0.5)
+XS-Python-Version: all
 Standards-Version: 3.7.2.0
 
 Package: ipython
 Architecture: all
-Depends: python2.3-ipython (= ${Source-Version}), ipython-common
+Depends: ${python:Depends}
+Recommends: python-numeric, python-numeric-ext, python-pexpect
+Conflicts: python2.3-ipython, python2.4-ipython, ipython-common
+Replaces: python2.3-ipython, python2.4-ipython, ipython-common
+XB-Python-Version: all
 Suggests: python-profiler
-Description: enhanced interactive Python shell [dummy package]
+Description: enhanced interactive Python shell
  IPython is an enhanced interactive Python shell. It can be used as a
  replacement for the standard Python shell, or it can be used as a
  complete working environment for scientific computing (like Matlab or
@@ -21,67 +26,4 @@
  reports, auto-parentheses, auto-quoting, and is embeddedable in other
  Python programs.
  .
- This package is an empty dummy package that always depends on a package
- built for Debian's default Python version.
- .
  Homepage: http://ipython.scipy.org/ 
-
-Package: ipython-common
-Architecture: all
-Replaces: ipython (<= 0.6.12-1)
-Description: enhanced interactive Python shell [common files]
- IPython is an enhanced interactive Python shell. It can be used as a
- replacement for the standard Python shell, or it can be used as a
- complete working environment for scientific computing (like Matlab or
- Mathematica) when paired with the standard Python scientific and
- numerical tools. It supports dynamic object introspections, numbered
- input/output prompts, a macro system, session logging, session
- restoring, complete system shell access, verbose and colored traceback
- reports, auto-parentheses, auto-quoting, and is embeddedable in other
- Python programs.
- .
- This package provides files shared by ipython across different python
- versions.
- .
- Homepage: http://ipython.scipy.org/ 
-
-Package: python2.3-ipython
-Architecture: all
-Depends: ${python:Depends}, ipython-common
-Replaces: ipython (<= 0.6.12-1)
-Recommends: python2.3-numeric, python2.3-numeric-ext, python2.3-pexpect
-Suggests: python2.3-profiler
-Description: enhanced interactive Python shell [built for python 2.3]
- IPython is an enhanced interactive Python shell. It can be used as a
- replacement for the standard Python shell, or it can be used as a
- complete working environment for scientific computing (like Matlab or
- Mathematica) when paired with the standard Python scientific and
- numerical tools. It supports dynamic object introspections, numbered
- input/output prompts, a macro system, session logging, session
- restoring, complete system shell access, verbose and colored traceback
- reports, auto-parentheses, auto-quoting, and is embeddedable in other
- Python programs.
- .
- This package is built with Python 2.3.
- .
- Homepage: http://ipython.scipy.org/ 
-
-Package: python2.4-ipython
-Architecture: all
-Depends: ${python:Depends}, ipython-common
-Recommends: python2.4-numeric, python2.4-numeric-ext, python2.4-pexpect
-Suggests: python2.4-profiler
-Description: enhanced interactive Python shell [built for python 2.4]
- IPython is an enhanced interactive Python shell. It can be used as a
- replacement for the standard Python shell, or it can be used as a
- complete working environment for scientific computing (like Matlab or
- Mathematica) when paired with the standard Python scientific and
- numerical tools. It supports dynamic object introspections, numbered
- input/output prompts, a macro system, session logging, session
- restoring, complete system shell access, verbose and colored traceback
- reports, auto-parentheses, auto-quoting, and is embeddedable in other
- Python programs.
- .
- This package is built with Python 2.4.
- .
- Homepage: http://ipython.scipy.org/ 

Modified: packages/ipython/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/rules?rev=1169&op=diff
==============================================================================
--- packages/ipython/trunk/debian/rules (original)
+++ packages/ipython/trunk/debian/rules Thu Jul 20 00:12:20 2006
@@ -7,12 +7,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PYDEF := $(shell pyversions -vd)
+PYVERS := $(filter-out $(PYDEF), $(shell pyversions -vr debian/control)) $(PYDEF)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	python2.3 setup.py config
-	python2.4 setup.py config
+	set -e; \
+	for v in $(PYVERS); do \
+	  python$$(echo $$v | sed "s/$(PYDEF)//") setup.py config; \
+	done
 
 	touch configure-stamp
 
@@ -22,8 +27,10 @@
 build-stamp:
 	dh_testdir
 
-	python2.3 setup.py build
-	python2.4 setup.py build
+	set -e; \
+	for v in $(PYVERS); do \
+	  python$$(echo $$v | sed "s/$(PYDEF)//") setup.py build; \
+	done
 
 	touch build-stamp
 
@@ -34,8 +41,11 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	python2.3 setup.py clean --all
-	python2.4 setup.py clean --all
+	set -e; \
+	for v in $(PYVERS); do \
+	  python$$v setup.py clean --all; \
+	done
+	rm -rf build
 	rm -f setupext/*.pyc
 
 	dh_clean
@@ -56,23 +66,22 @@
 	dh_clean -k
 	dh_installdirs
 
-	python2.3 setup.py install --prefix $(CURDIR)/debian/python2.3-ipython/usr
-	python2.4 setup.py install --prefix $(CURDIR)/debian/python2.4-ipython/usr
+	set -e; \
+	for v in $(PYVERS); do \
+	  python$$(echo $$v | sed "s/$(PYDEF)//") setup.py install --prefix $(CURDIR)/debian/ipython/usr; \
+	done
 
 	# remove documentation
-	mkdir -p $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common
-	mv $(CURDIR)/debian/python2.3-ipython/usr/share/doc/ipython/* $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common
-	rm $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common/COPYING
-	rm $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common/ChangeLog
-	rm $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common/ipython.el
-	rm $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common/README_Windows.txt
-	rm $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common/pycon.ico
-	rm -r $(CURDIR)/debian/python2.3-ipython/usr/share/doc/ipython
-	rm -r $(CURDIR)/debian/python2.4-ipython/usr/share/doc/ipython
+	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/COPYING
+	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/ChangeLog
+	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/ipython.el
+	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/README_Windows.txt
+	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/pycon.ico
 
 	# change permission on scripts
-	chmod a-x $(CURDIR)/debian/ipython-common/usr/share/doc/ipython-common/examples/*
+	chmod a-x $(CURDIR)/debian/ipython/usr/share/doc/ipython/examples/*
 
+ifeq (0,1)
 	# rename binaries
 	mv $(CURDIR)/debian/python2.3-ipython/usr/bin/ipython $(CURDIR)/debian/python2.3-ipython/usr/bin/python2.3-ipython
 	mv $(CURDIR)/debian/python2.3-ipython/usr/bin/irunner $(CURDIR)/debian/python2.3-ipython/usr/bin/python2.3-irunner
@@ -86,13 +95,14 @@
 	mv $(CURDIR)/debian/python2.3-ipython/usr/share/man/man1/pycolor.1.gz $(CURDIR)/debian/python2.3-ipython/usr/share/man/man1/python2.3-pycolor.1.gz
 	mv $(CURDIR)/debian/python2.4-ipython/usr/share/man/man1/ipython.1.gz $(CURDIR)/debian/python2.4-ipython/usr/share/man/man1/python2.4-ipython.1.gz
 	mv $(CURDIR)/debian/python2.4-ipython/usr/share/man/man1/pycolor.1.gz $(CURDIR)/debian/python2.4-ipython/usr/share/man/man1/python2.4-pycolor.1.gz
+endif
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_link
-	dh_installchangelogs doc/ChangeLog -Npython2.3-ipython -Npython2.4-ipython -Nipython
-	dh_installdocs -Npython2.3-ipython -Npython2.4-ipython -Nipython
+	dh_installchangelogs doc/ChangeLog
+	dh_installdocs
 #	dh_installexamples
 	dh_install
 #	dh_installmenu
@@ -107,6 +117,7 @@
 #	dh_installman doc/ipython.1.gz doc/pycolor.1.gz
 	dh_compress -Xexamples
 	dh_fixperms
+	dh_pycentral
 	dh_python
 #	dh_makeshlibs
 	dh_installdeb




More information about the Python-modules-commits mailing list