[Python-modules-commits] r6010 - in packages/pydb/trunk/debian (9 files)
malex at users.alioth.debian.org
malex at users.alioth.debian.org
Mon Jul 21 04:44:58 UTC 2008
Date: Monday, July 21, 2008 @ 04:44:56
Author: malex
Revision: 6010
Push an upstream patch to fix ipython import and simplify emacsen file install
Added:
packages/pydb/trunk/debian/patches/
packages/pydb/trunk/debian/patches/00list
packages/pydb/trunk/debian/patches/01_pydbbdb.py.dpatch
Modified:
packages/pydb/trunk/debian/changelog
packages/pydb/trunk/debian/control
packages/pydb/trunk/debian/rules
Deleted:
packages/pydb/trunk/debian/emacsen-install
packages/pydb/trunk/debian/emacsen-remove
packages/pydb/trunk/debian/emacsen-startup
Modified: packages/pydb/trunk/debian/changelog
===================================================================
--- packages/pydb/trunk/debian/changelog 2008-07-20 23:59:21 UTC (rev 6009)
+++ packages/pydb/trunk/debian/changelog 2008-07-21 04:44:56 UTC (rev 6010)
@@ -1,10 +1,20 @@
-pydb (1.23-2) UNRELEASED; urgency=low
+pydb (1.23-2) unstable; urgency=low
[Carlos Galisteo]
* debian/control
- Added Homepage field.
+ [Oleksandr Moskalenko]
+ * debian/control: Added a dependency on dpatch.
+ * debian/rules:
+ - Added .PHONY patch and unpatch targets
+ - Included /usr/share/dpatch/dpatch.make and added patch and unpatch
+ targets.
+ * debian/patches/01_pydbbdp.py.dpatch: ipython fix patch from the upstream
+ author.
+ * Removed all emacsen install remove and startup files. Just install pydb.el
+ and run dh_installemacsen (Closes: #443351).
- -- Oleksandr Moskalenko <malex at debian.org> Mon, 07 Jul 2008 17:11:54 +0000
+ -- Oleksandr Moskalenko <malex at debian.org> Sun, 20 Jul 2008 21:55:31 -0600
pydb (1.23-1) unstable; urgency=low
Modified: packages/pydb/trunk/debian/control
===================================================================
--- packages/pydb/trunk/debian/control 2008-07-20 23:59:21 UTC (rev 6009)
+++ packages/pydb/trunk/debian/control 2008-07-21 04:44:56 UTC (rev 6010)
@@ -4,7 +4,7 @@
Maintainer: Oleksandr Moskalenko <malex at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), python-support (>= 0.4)
+Build-Depends: debhelper (>= 5), python-support (>= 0.4), dpatch
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pydb/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pydb/trunk/?op=log
Homepage: http://bashdb.sourceforge.net/pydb/
Deleted: packages/pydb/trunk/debian/emacsen-install
===================================================================
--- packages/pydb/trunk/debian/emacsen-install 2008-07-20 23:59:21 UTC (rev 6009)
+++ packages/pydb/trunk/debian/emacsen-install 2008-07-21 04:44:56 UTC (rev 6010)
@@ -1,57 +0,0 @@
-#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/pydb
-
-# Written by Jim Van Zandt <jrv at debian.org>, borrowing heavily
-# from the install scripts for gettext by Santiago Vila
-# <sanvila at ctv.es> and octave by Dirk Eddelbuettel <edd at debian.org>.
-
-FLAVOR=$1
-PACKAGE=pydb
-
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
-
-# pydb's gud.el doesn't support emacs20
-if [ ${FLAVOR} = emacs20 ]; then exit 0; fi
-
-FILES="pydb.el"
-
-echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-
-FLAVORTEST=`echo $FLAVOR | cut -c-6`
-if [ ${FLAVORTEST} = xemacs ] ; then
- SITEFLAG="-no-site-file"
-else
- SITEFLAG="--no-site-file"
-fi
-FLAGS="${SITEFLAG} -q -batch -f batch-byte-compile"
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-# Install-info-altdir does not actually exist.
-# Maybe somebody will write it.
-if test -x /usr/sbin/install-info-altdir; then
- echo install/${PACKAGE}: install Info links for ${FLAVOR}
- install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} \
- /usr/share/info/${PACKAGE}.info.gz
-fi
-
-if [ ${FLAVOR} != emacs ]; then
-
- [ -d ${ELCDIR} ] || install -m 755 -d ${ELCDIR}
-
- # Copy the .el file to flavor site-lisp directory
- (cd ${ELDIR}; cp ${FILES} ${ELCDIR})
-
- # Bite compile it
- (cd ${ELCDIR}; ${FLAVOR} ${FLAGS} ${FILES} 2> /dev/null )
- echo `pwd`
- (cd ${ELCDIR}; for f in ${FILES}; do if [ ! -f ${f}c ]; then echo "Failed $f"; fi; done )
-
- # Remove the redundant .el files - presumes that any .el files in the <flavor>
- # dir are redundant.
- (cd ${ELCDIR}; rm -f ${FILES} )
-
-fi
-
-exit 0
Deleted: packages/pydb/trunk/debian/emacsen-remove
===================================================================
--- packages/pydb/trunk/debian/emacsen-remove 2008-07-20 23:59:21 UTC (rev 6009)
+++ packages/pydb/trunk/debian/emacsen-remove 2008-07-21 04:44:56 UTC (rev 6010)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/pydb
-
-FLAVOR=$1
-PACKAGE=pydb
-
-if [ ${FLAVOR} != emacs ]; then
- if test -x /usr/sbin/install-info-altdir; then
- echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
- install-info-altdir --quiet --remove --dirname=${FLAVOR} \
- /usr/share/info/${PACKAGE}.info.gz
- fi
-
- echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
- rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
Deleted: packages/pydb/trunk/debian/emacsen-startup
===================================================================
--- packages/pydb/trunk/debian/emacsen-startup 2008-07-20 23:59:21 UTC (rev 6009)
+++ packages/pydb/trunk/debian/emacsen-startup 2008-07-21 04:44:56 UTC (rev 6010)
@@ -1,20 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian pydb package
-;;
-;; Originally contributed by Nils Naumann <naumann at unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd at debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv at vanzandt.mv.com>
-
-;; The bashdb package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...). The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(unless (eq flavor 'emacs20)
- (let ((package-dir (concat "/usr/share/"
- (symbol-name flavor)
- "/site-lisp/pydb")))
- (when (file-directory-p package-dir)
- (setq load-path (cons package-dir load-path))))
- (autoload 'pydb "pydb" "Run the python debugger." t))
Added: packages/pydb/trunk/debian/patches/00list
===================================================================
--- packages/pydb/trunk/debian/patches/00list (rev 0)
+++ packages/pydb/trunk/debian/patches/00list 2008-07-21 04:44:56 UTC (rev 6010)
@@ -0,0 +1 @@
+01_pydbbdb.py.dpatch
Added: packages/pydb/trunk/debian/patches/01_pydbbdb.py.dpatch
===================================================================
--- packages/pydb/trunk/debian/patches/01_pydbbdb.py.dpatch (rev 0)
+++ packages/pydb/trunk/debian/patches/01_pydbbdb.py.dpatch 2008-07-21 04:44:56 UTC (rev 6010)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_pydbbdb.py.dpatch by Oleksandr Moskalenko <malex at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: ipython fix
+
+ at DPATCH@
+
+--- pydb-1.23/pydb/pydbbdb.py 17 May 2008 10:08:33 -0000 1.44
++++ pydbbdb.py 31 May 2008 11:49:01 -0000 1.45
+@@ -1,4 +1,4 @@
+-"""$Id: pydbbdb.py,v 1.44 2008/05/17 10:08:33 rockyb Exp $
++"""$Id: pydbbdb.py,v 1.45 2008/05/31 11:49:01 rockyb Exp $
+ Routines here have to do with the subclassing of bdb. Defines Python
+ debugger Basic Debugger (Bdb) class. This file could/should probably
+ get merged into bdb.py
+@@ -41,8 +41,15 @@
+ def __print_call_params(self, frame):
+ "Show call paramaters and values"
+ self.setup(frame)
+- self.msg(self.format_stack_entry(self.stack[-1],
+- include_location=False))
++
++ # Does sure format_stack_entry have an 'include_location' parameter?
++ fse_code = self.format_stack_entry.func_code
++ fse_args = fse_code.co_varnames
++ if 'include_location' in fse_args:
++ self.msg(self.format_stack_entry(self.stack[-1],
++ include_location=False))
++ else:
++ self.msg(self.format_stack_entry(self.stack[-1]))
+
+ def __print_location_if_trace(self, frame, include_fntrace=True):
+ if self.linetrace or (self.fntrace and include_fntrace):
Modified: packages/pydb/trunk/debian/rules
===================================================================
--- packages/pydb/trunk/debian/rules 2008-07-20 23:59:21 UTC (rev 6009)
+++ packages/pydb/trunk/debian/rules 2008-07-21 04:44:56 UTC (rev 6010)
@@ -12,8 +12,10 @@
CFLAGS="$(OPT_FLAG)"
+include /usr/share/dpatch/dpatch.make
+
build: build-stamp
-build-stamp:
+build-stamp: patch
dh_testdir
dh_clean
./configure \
@@ -22,7 +24,7 @@
$(MAKE)
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp install-stamp config.status config.log
@@ -63,4 +65,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary patch unpatch
More information about the Python-modules-commits
mailing list