[Python-modules-commits] r9244 - in packages/pydb/trunk/debian (11 files)

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Sun Aug 2 13:29:21 UTC 2009 

    Date: Sunday, August 2, 2009 @ 13:29:20
  Author: smcv
Revision: 9244

* Non-maintainer upload.
* Assume the directory layout seen in python-support 1.0 rather than
  0.8.x, with modules in /usr/share/pyshared (Closes: #516324)
* Do the initial installation into the directories used by the default
  version of Python, not 2.4
* Don't sed away a wrong path in the man page that actually no longer exists
* Lintian fixes:
  - Move python-support to Build-Depends-Indep and do the build in
    build-indep, not build-arch, as this package is architecture-independent
  - Move menu entry from obsolete Apps to Applications
  - Install upstream ChangeLog as conventional changelog.gz, not ChangeLog.gz
  - Copy the actual copyright statements to debian/copyright, not just the
    upstream author's name
  - debian/patches/01_man_hyphens.dpatch: replace all "-" with either "\-"
    (minus) or "\(hy" (hyphen) depending on apparent intention, according to
    the best practice explained by lintian
  - debian/patches/02_man_Sp.dpatch: Remove undefined Sp macro (the man
    page seems to look fine without it)
  - debian/README.Debian: fix a spelling mistake

Added:
  packages/pydb/trunk/debian/patches/01_man_hyphens.dpatch
  packages/pydb/trunk/debian/patches/02_man_Sp.dpatch
Modified:
  packages/pydb/trunk/debian/README.Debian
  packages/pydb/trunk/debian/changelog
  packages/pydb/trunk/debian/control
  packages/pydb/trunk/debian/copyright
  packages/pydb/trunk/debian/menu
  packages/pydb/trunk/debian/patches/00list
  packages/pydb/trunk/debian/pydb.links
  packages/pydb/trunk/debian/rules
Deleted:
  packages/pydb/trunk/debian/pydb.docs

Modified: packages/pydb/trunk/debian/README.Debian
===================================================================
--- packages/pydb/trunk/debian/README.Debian	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/README.Debian	2009-08-02 13:29:20 UTC (rev 9244)
@@ -5,7 +5,7 @@
 
 A little about pydb development. Active development on Pydb stopped sometime
 around 2000. Richard Wolff who was working on that and the python debugger as
-a parallel (not unified) efforts has retired. About the begining of 2006 I
+a parallel (not unified) efforts has retired. About the beginning of 2006 I
 wanted to add a restart to the stock python debugger, pdb. With Richard
 Wolff's blessing, I took over the name pydb. Since then I've merged in
 improvements that had gone on in pdb with those in pydb that were not in pdb

Modified: packages/pydb/trunk/debian/changelog
===================================================================
--- packages/pydb/trunk/debian/changelog	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/changelog	2009-08-02 13:29:20 UTC (rev 9244)
@@ -1,3 +1,27 @@
+pydb (1.25-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Assume the directory layout seen in python-support 1.0 rather than
+    0.8.x, with modules in /usr/share/pyshared (Closes: #516324)
+  * Do the initial installation into the directories used by the default
+    version of Python, not 2.4
+  * Don't sed away a wrong path in the man page that actually no longer exists
+  * Lintian fixes:
+    - Move python-support to Build-Depends-Indep and do the build in
+      build-indep, not build-arch, as this package is architecture-independent
+    - Move menu entry from obsolete Apps to Applications
+    - Install upstream ChangeLog as conventional changelog.gz, not ChangeLog.gz
+    - Copy the actual copyright statements to debian/copyright, not just the
+      upstream author's name
+    - debian/patches/01_man_hyphens.dpatch: replace all "-" with either "\-"
+      (minus) or "\(hy" (hyphen) depending on apparent intention, according to
+      the best practice explained by lintian
+    - debian/patches/02_man_Sp.dpatch: Remove undefined Sp macro (the man
+      page seems to look fine without it)
+    - debian/README.Debian: fix a spelling mistake
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 02 Aug 2009 13:38:32 +0100
+
 pydb (1.25-1) unstable; urgency=low
 
   [Sandro Tosi]

Modified: packages/pydb/trunk/debian/control
===================================================================
--- packages/pydb/trunk/debian/control	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/control	2009-08-02 13:29:20 UTC (rev 9244)
@@ -4,7 +4,8 @@
 Maintainer: Oleksandr Moskalenko <malex at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7), python-support (>= 0.8), dpatch
+Build-Depends: debhelper (>= 7), dpatch
+Build-Depends-Indep: python-support (>= 1.0)
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pydb/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pydb/trunk/
 Homepage: http://bashdb.sourceforge.net/pydb/

Modified: packages/pydb/trunk/debian/copyright
===================================================================
--- packages/pydb/trunk/debian/copyright	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/copyright	2009-08-02 13:29:20 UTC (rev 9244)
@@ -11,6 +11,9 @@
 
 Current upstream author: Rocky Bernstein <rocky at panix.com>
 
+Copyright (C) 2006, 2007, 2008 Rocky Bernstein <rocky at gnu.org>
+Copyright (C) 2006 Nikolaj Schumacher <bugs * nschum , de>
+
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation; either version 2 of the License, or (at your option) any later

Modified: packages/pydb/trunk/debian/menu
===================================================================
--- packages/pydb/trunk/debian/menu	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/menu	2009-08-02 13:29:20 UTC (rev 9244)
@@ -1 +1 @@
-?package(pydb):needs="text" title="pydb" section="Apps/Programming" command="/usr/bin/pydb" hints="Debuggers"
+?package(pydb):needs="text" title="pydb" section="Applications/Programming" command="/usr/bin/pydb" hints="Debuggers"

Modified: packages/pydb/trunk/debian/patches/00list
===================================================================
--- packages/pydb/trunk/debian/patches/00list	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/patches/00list	2009-08-02 13:29:20 UTC (rev 9244)
@@ -0,0 +1,2 @@
+01_man_hyphens.dpatch
+02_man_Sp.dpatch

Added: packages/pydb/trunk/debian/patches/01_man_hyphens.dpatch
===================================================================
--- packages/pydb/trunk/debian/patches/01_man_hyphens.dpatch	                        (rev 0)
+++ packages/pydb/trunk/debian/patches/01_man_hyphens.dpatch	2009-08-02 13:29:20 UTC (rev 9244)
@@ -0,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_man_hyphens.dpatch by Simon McVittie <smcv at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use \(hy or \- rather than - in man page
+## DP:
+## DP: As per `lintian-info --tags hyphen-used-as-minus-sign`, explicit is
+## DP: better than implicit.
+
+ at DPATCH@
+diff -urNad pydb~/Doc/pydb.1.in pydb/Doc/pydb.1.in
+--- pydb~/Doc/pydb.1.in	2008-06-10 02:05:35.000000000 +0100
++++ pydb/Doc/pydb.1.in	2009-08-02 14:24:43.000000000 +0100
+@@ -6,9 +6,9 @@
+ .\"===================================================================
+ .SH SYNOPSIS
+ .B pydb 
+-[debugger-options] 
+-python-script 
+-[script-options...]
++[debugger\(hyoptions] 
++python\(hyscript 
++[script\(hyoptions...]
+ .\"===================================================================
+ .SH DESCRIPTION
+ This manual page documents briefly the
+@@ -43,7 +43,7 @@
+ \ \ \ \(bu Change things in your program, so you can experiment with correcting the effects of one bug and go on to learn about another.
+ .PP
+ 
+-Here are some of the most frequently-needed commands:
++Here are some of the most frequently\(hyneeded commands:
+ 
+ .\"-------------------------------------------------------------------
+ .TP
+@@ -72,12 +72,12 @@
+ .B continue \fR[\fIline\fR]
+ \&
+ Continue running your program until the next breakpoint or until the
+-end of the program. If a line number is given set a one-time
++end of the program. If a line number is given set a one\(hytime
+ breakpoint at that line. 
+ .PP
+ .\"-------------------------------------------------------------------
+ .TP
+-.B delete \fR[\fIbreakpoint-numbers\fR]
++.B delete \fR[\fIbreakpoint\(hynumbers\fR]
+ \& 
+ Delete breakpoints by number. To delete all breakpoints, give no
+ breakpoint number.  See also the 
+@@ -105,9 +105,9 @@
+ Run until the completion of the current function or method.
+ .PP
+ .TP
+-.BI frame " frame-number" 
++.BI frame " frame\(hynumber" 
+ \&
+-Set the stack frame to \fIframe-number\fR for purposes of examinine local variables. For positioning relative to the current frame, use 
++Set the stack frame to \fIframe\(hynumber\fR for purposes of examinine local variables. For positioning relative to the current frame, use 
+ .B up
+ or 
+ .B down.
+@@ -240,8 +240,8 @@
+ .TP
+ .TP
+ .B \-e | \-\-exec
+-Run debugger commands command-list. Commands should be separated by
+-";;"-the same as you would do inside the debugger. You may need to
++Run debugger commands command\(hylist. Commands should be separated by
++";;"\(hythe same as you would do inside the debugger. You may need to
+ quote this option to prevent command shell interpretation, e.g. 
+ .B \-\-exec
+ "break 20;; continue"
+@@ -255,12 +255,12 @@
+ .B \-\-sigcheck
+ Set to watch for signal handler changes.
+ .TP
+-.B -T, --threading
++.B \-T, \-\-threading
+ Start off with threading debug support.
+ .TP
+ .B \-A LEVEL | \-\-annotate=LEVEL
+-Set gdb-like annotation_level. The annotation level is used by
+-front-ends to get posted about program information when things change
++Set gdb\(hylike annotation_level. The annotation level is used by
++front\(hyends to get posted about program information when things change
+ without having to poll for the information.
+ .PD
+ .\"===================================================================


Property changes on: packages/pydb/trunk/debian/patches/01_man_hyphens.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/pydb/trunk/debian/patches/02_man_Sp.dpatch
===================================================================
--- packages/pydb/trunk/debian/patches/02_man_Sp.dpatch	                        (rev 0)
+++ packages/pydb/trunk/debian/patches/02_man_Sp.dpatch	2009-08-02 13:29:20 UTC (rev 9244)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_man_Sp.dpatch by Simon McVittie <smcv at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove undefined .Sp macro; whatever it was meant to do, the man page
+## DP: looks fine without it.
+
+ at DPATCH@
+diff -urNad pydb~/Doc/pydb.1.in pydb/Doc/pydb.1.in
+--- pydb~/Doc/pydb.1.in	2009-08-02 14:22:03.000000000 +0100
++++ pydb/Doc/pydb.1.in	2009-08-02 14:22:09.000000000 +0100
+@@ -265,10 +265,8 @@
+ .PD
+ .\"===================================================================
+ .SH "SEE ALSO"
+-.Sp 
+ http://bashdb.sourceforge.net/pydb/
+ .PP
+-.Sp
+ http://bashdb.sourceforge.net/pydb/lib/index.html
+ .\"===================================================================
+ .SH AUTHOR


Property changes on: packages/pydb/trunk/debian/patches/02_man_Sp.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Deleted: packages/pydb/trunk/debian/pydb.docs
===================================================================
--- packages/pydb/trunk/debian/pydb.docs	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/pydb.docs	2009-08-02 13:29:20 UTC (rev 9244)
@@ -1 +0,0 @@
-ChangeLog

Modified: packages/pydb/trunk/debian/pydb.links
===================================================================
--- packages/pydb/trunk/debian/pydb.links	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/pydb.links	2009-08-02 13:29:20 UTC (rev 9244)
@@ -1 +1 @@
-usr/share/python-support/pydb/pydb/pydb.py usr/bin/pydb
+usr/share/pyshared/pydb/pydb.py usr/bin/pydb

Modified: packages/pydb/trunk/debian/rules
===================================================================
--- packages/pydb/trunk/debian/rules	2009-08-02 12:01:26 UTC (rev 9243)
+++ packages/pydb/trunk/debian/rules	2009-08-02 13:29:20 UTC (rev 9244)
@@ -2,7 +2,7 @@
 #export DH_VERBOSE=1
 DEBIAN_DIR = $(shell pwd)/debian
 PACKAGE = pydb
-PYTHON_VER = 2.4
+PYTHON_VER = $(shell pyversions -d -v)
 DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -38,21 +38,17 @@
 	$(MAKE) install
 	rm -rf $(DEBIAN_DIR)/$(PACKAGE)/usr/man
 	rm -f $(DEBIAN_DIR)/$(PACKAGE)/usr/bin/pydb
-	sed -i 's:^.*site-packages/pydb.doc:/usr/share/python-support/pydb/pydb/pydb.doc and:' Doc/pydb.1
 	touch install-stamp
 
 # Build architecture-independent files here.
 binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
 	dh_installemacsen
 	dh_installmenu
 	dh_installman Doc/pydb.1
-	dh_installchangelogs
+	dh_installchangelogs ChangeLog
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -64,5 +60,8 @@
 	dh_md5sums
 	dh_builddeb
 
+# Build architecture-dependent files here.
+binary-arch: build install
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary patch unpatch

More information about the Python-modules-commits mailing list