[Python-modules-commits] r2162 - in /packages/ipython/trunk/debian:
./ changelog compat control
ipython-lintian patches/00list patches/03_ipy_gnuglobal.dpatch rules
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Mon Apr 23 23:56:56 UTC 2007
Author: bzed-guest
Date: Mon Apr 23 23:56:55 2007
New Revision: 2162
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2162
Log:
a lot of changes:
* fixing bugs
* making lintian clean
* cleaning up
... not testet yet, need to commit, though.
Added:
packages/ipython/trunk/debian/ipython-lintian
packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch
Modified:
packages/ipython/trunk/debian/ (props changed)
packages/ipython/trunk/debian/changelog
packages/ipython/trunk/debian/compat
packages/ipython/trunk/debian/control
packages/ipython/trunk/debian/patches/00list
packages/ipython/trunk/debian/rules (contents, props changed)
Propchange: packages/ipython/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Modified: packages/ipython/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/changelog?rev=2162&op=diff
==============================================================================
--- packages/ipython/trunk/debian/changelog (original)
+++ packages/ipython/trunk/debian/changelog Mon Apr 23 23:56:55 2007
@@ -1,3 +1,38 @@
+ipython (0.8.0-2) UNRELEASED; urgency=low
+
+ * debian/changelog:
+ - adding missing colons to Closes entries to fix two
+ lintian warnings
+ * debian/compat:
+ - bumping compat level to 5
+ * debian/control:
+ - adding XS-Vcs-Browser
+ - remove no longer needed X*-Python-Version fields
+ - moving python-pexpect from Recommends to Depends because
+ /usr/bin/irunner is not useable without it
+ - moving debhelper and dpatch from Build-Depends-Indep to
+ Build-Depends, fixing the following lintian errors:
+ - clean-should-be-satisfied-by-build-depends debhelper
+ - clean-should-be-satisfied-by-build-depends dpatch
+ - removing unnecessary Build-Depends-Indep on python-all-dev,
+ adding python to Build-Depends instead
+ - replacing python-central by python-support to be able to
+ fix #420134 without hassle
+ - adding ${misc:Depends}
+ - adding the missing identation for Homepage:
+ - adding cdbs as Build-Depends
+ - adding myself to Uploaders
+ * debian/patches/03_ipy_gnuglobal.dpatch:
+ - fix the location of the global binary - we're not on windows
+ * debian/rules:
+ - removing old crust, using cdbs to make things clear again
+ - using python-support instead of python-central to make
+ modules for 2.5 avaiable now. (Closes: #420134)
+ * adding lintian ovverrides for several scripts included in the
+ IPython/Extensions directory.
+
+ -- Bernd Zeimetz <bernd at bzed.de> Tue, 24 Apr 2007 01:53:33 +0200
+
ipython (0.8.0-1) unstable; urgency=low
* New upstream release. (closes: #419716)
@@ -280,8 +315,8 @@
ipython (0.4.0-1) unstable; urgency=low
- * New upstream release (Closes #195215)
- * Updated Build-Depends (Closes #200021)
+ * New upstream release (Closes: #195215)
+ * Updated Build-Depends (Closes: #200021)
-- Jack Moffitt <jack at xiph.org> Fri, 25 Jul 2003 10:16:12 -0600
Modified: packages/ipython/trunk/debian/compat
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/compat?rev=2162&op=diff
==============================================================================
--- packages/ipython/trunk/debian/compat (original)
+++ packages/ipython/trunk/debian/compat Mon Apr 23 23:56:55 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: packages/ipython/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/control?rev=2162&op=diff
==============================================================================
--- packages/ipython/trunk/debian/control (original)
+++ packages/ipython/trunk/debian/control Mon Apr 23 23:56:55 2007
@@ -2,19 +2,18 @@
Section: python
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 (>= 5.0.37.2), dpatch (>= 2.0.10), python-all-dev (>= 2.3.5-11), python-central (>= 0.5)
-XS-Python-Version: all
+Uploaders: Norbert Tretkowski <nobse at debian.org>, Bernd Zeimetz <bernd at bzed.de>
+Build-Depends: debhelper (>= 5.0.37.2), dpatch (>= 2.0.10), cdbs (>= 0.4.43), python, python-support (>= 0.4)
XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/ipython/trunk/
-Standards-Version: 3.7.2.1
+XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/
+Standards-Version: 3.7.2.2
Package: ipython
Architecture: all
-Depends: ${python:Depends}
-Recommends: python-numeric, python-numeric-ext, python-pexpect
+Depends: ${python:Depends}, ${misc:Depends}, python-pexpect
+Recommends: python-numeric, python-numeric-ext
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
IPython is an enhanced interactive Python shell. It can be used as a
@@ -27,4 +26,4 @@
reports, auto-parentheses, auto-quoting, and is embeddable in other
Python programs.
.
- Homepage: http://ipython.scipy.org/
+ Homepage: http://ipython.scipy.org/
Added: packages/ipython/trunk/debian/ipython-lintian
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/ipython-lintian?rev=2162&op=file
==============================================================================
--- packages/ipython/trunk/debian/ipython-lintian (added)
+++ packages/ipython/trunk/debian/ipython-lintian Mon Apr 23 23:56:55 2007
@@ -1,0 +1,5 @@
+ipython: script-not-executable ./usr/share/pycentral/ipython/site-packages/IPython/Extensions/ipy_completers.py
+ipython: script-not-executable ./usr/share/pycentral/ipython/site-packages/IPython/Extensions/ipy_gnuglobal.py
+ipython: script-not-executable ./usr/share/pycentral/ipython/site-packages/IPython/Extensions/pickleshare.py
+ipython: script-not-executable ./usr/share/pycentral/ipython/site-packages/IPython/irunner.py
+ipython: script-not-executable ./usr/share/pycentral/ipython/site-packages/IPython/upgrade_dir.py
Modified: packages/ipython/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/patches/00list?rev=2162&op=diff
==============================================================================
--- packages/ipython/trunk/debian/patches/00list (original)
+++ packages/ipython/trunk/debian/patches/00list Mon Apr 23 23:56:55 2007
@@ -1,2 +1,3 @@
01_docdir-base
02_profiler-message
+03_ipy_gnuglobal
Added: packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch?rev=2162&op=file
==============================================================================
--- packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch (added)
+++ packages/ipython/trunk/debian/patches/03_ipy_gnuglobal.dpatch Mon Apr 23 23:56:55 2007
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ipy_gnuglobal.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: we're not in windows - there's /usr/bin/global for us
+
+ at DPATCH@
+diff -urNad ipython~/IPython/Extensions/ipy_gnuglobal.py ipython/IPython/Extensions/ipy_gnuglobal.py
+--- ipython~/IPython/Extensions/ipy_gnuglobal.py 2007-03-25 07:22:14.000000000 +0200
++++ ipython/IPython/Extensions/ipy_gnuglobal.py 2007-04-24 01:18:12.000000000 +0200
+@@ -13,7 +13,7 @@
+ import os
+
+ # alter to your liking
+-global_bin = 'd:/opt/global/bin/global'
++global_bin = '/usr/bin/global'
+
+ def global_f(self,cmdline):
+ simple = 0
Modified: packages/ipython/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/debian/rules?rev=2162&op=diff
==============================================================================
--- packages/ipython/trunk/debian/rules (original)
+++ packages/ipython/trunk/debian/rules Mon Apr 23 23:56:55 2007
@@ -1,76 +1,11 @@
#!/usr/bin/make -f
# ipython debian/rules file
-#
-# Based on sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+DEB_PYTHON_SYSTEM=pysupport
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
-# 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
-
- set -e; \
- for v in $(PYVERS); do \
- python$$(echo $$v | sed "s/$(PYDEF)//") setup.py config; \
- done
-
- touch configure-stamp
-
-
-build: patch configure build
-
-build-stamp:
- dh_testdir
-
- set -e; \
- for v in $(PYVERS); do \
- python$$(echo $$v | sed "s/$(PYDEF)//") setup.py build; \
- done
-
- touch build-stamp
-
-clean: clean-patched unpatch
-
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- set -e; \
- for v in $(PYVERS); do \
- python$$v setup.py clean --all; \
- done
- rm -rf build
- rm -f setupext/*.pyc
-
- dh_clean
-
-patch: patch-stamp
-
-patch-stamp:
- dpatch apply-all
- dpatch list-all > patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- set -e; \
- for v in $(PYVERS); do \
- python$$(echo $$v | sed "s/$(PYDEF)//") setup.py install --prefix $(CURDIR)/debian/ipython/usr; \
- done
-
+ipython/install::
# remove documentation
rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/COPYING
rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/ChangeLog
@@ -81,54 +16,5 @@
# change permission on scripts
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
- mv $(CURDIR)/debian/python2.3-ipython/usr/bin/pycolor $(CURDIR)/debian/python2.3-ipython/usr/bin/python2.3-pycolor
- mv $(CURDIR)/debian/python2.4-ipython/usr/bin/ipython $(CURDIR)/debian/python2.4-ipython/usr/bin/python2.4-ipython
- mv $(CURDIR)/debian/python2.4-ipython/usr/bin/pycolor $(CURDIR)/debian/python2.4-ipython/usr/bin/python2.4-pycolor
- mv $(CURDIR)/debian/python2.4-ipython/usr/bin/irunner $(CURDIR)/debian/python2.4-ipython/usr/bin/python2.4-irunner
-
- # rename manpages
- mv $(CURDIR)/debian/python2.3-ipython/usr/share/man/man1/ipython.1.gz $(CURDIR)/debian/python2.3-ipython/usr/share/man/man1/python2.3-ipython.1.gz
- 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
- dh_installdocs
-# dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_installman doc/ipython.1.gz doc/pycolor.1.gz
- dh_compress -Xexamples
- dh_fixperms
- dh_pycentral
- dh_python
-# dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+ # add lintian overrides
+ cp $(CURDIR)/debian/ipython-lintian $(CURDIR)/debian/ipython/usr/share/lintian/overrides/
Propchange: packages/ipython/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
More information about the Python-modules-commits
mailing list