From c619684a9f8a98d9d342d53d7fb7376a1262a834 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Fri, 3 Jan 2003 22:44:18 +0000 Subject: [PATCH] Add manpage(s) for wxPy scripts. Update wx-config manpage. Feed WXCONFIG to setup.py install too, to keep it from barfing at us. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- debian/changelog | 3 +++ debian/libwxgtk-python.menu | 2 ++ debian/rules | 21 +++++++++++++-------- debian/wx-config.1 | 32 ++++++++++++++++---------------- debian/wxPython-tools.1 | 25 +++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 debian/wxPython-tools.1 diff --git a/debian/changelog b/debian/changelog index 209d1469cc..18430009b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ wxwindows2.4 (2.4.0) unstable; urgency=low * The fingers crossed release. * de.po typo fix. Closes: #174084 * tr.po stable tree patch. Closes: #174667 + * Add a manpage for the wxPython scripts pointing to the pydoc docs. + * Disabled generation of gtk-univ, it is a rather insensible combination + now and should be replaced by x11-univ instead. -- Ron Lee Thu, 19 Dec 2002 00:50:48 -0800 diff --git a/debian/libwxgtk-python.menu b/debian/libwxgtk-python.menu index 3d98d38f7c..aaff547b00 100644 --- a/debian/libwxgtk-python.menu +++ b/debian/libwxgtk-python.menu @@ -4,4 +4,6 @@ title="pyshell" command="/usr/bin/pyshell" ?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ title="xrced" command="/usr/bin/xrced" +?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ + title="helpviewer" command="/usr/bin/helpviewer" diff --git a/debian/rules b/debian/rules index b2e0c69e6d..cfe426fe8a 100755 --- a/debian/rules +++ b/debian/rules @@ -620,10 +620,21 @@ install-gtk-py: build-gtk-py-stamp dh_clean -k dh_installdirs cd wxPython \ - && ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr + && ./setup.py install \ + --prefix=`pwd`/../debian/$(package_gtk_py)/usr \ + WX_CONFIG='$(wxconfig)' find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \ -name '*.py?' -exec rm '{}' ';' + dh_installman debian/wxPython-tools.1 + dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1 \ + usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 + install-headers: DH_OPTIONS=-p$(package_headers) install-headers: install-gtk-lib dh_testdir @@ -641,13 +652,7 @@ install-headers: install-gtk-lib # dh_movefiles --sourcedir=$(objdir_univ_install) dh_movefiles --sourcedir=debian/$(package_gtk_lib) - dh_installmanpages \ - ansi2knr.1 \ - jpegtran.1 \ - libpng.3 \ - libpngpf.3 \ - zlib.3 \ - png.5 + dh_installman debian/wx-config.1 install-i18n: DH_OPTIONS=-p$(package_i18n) install-i18n: build-i18n-stamp install-gtk-lib diff --git a/debian/wx-config.1 b/debian/wx-config.1 index 72aeac5390..fd9f478c19 100644 --- a/debian/wx-config.1 +++ b/debian/wx-config.1 @@ -1,31 +1,31 @@ -.TH wx-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows 2.2" +.TH wx\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows" .SH NAME -wx-config - generate compile time info for wxWindows +wx-config \- generate compile time info for wxWindows .SH SYNOPSIS .nh -.B wxbase-config +.B wxbase\-config .br -.B wxgtk-config +.B wxgtk\-config .HP -.B wx-config +.B wx\-config [\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld] [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] .SH DESCRIPTION -\fIwx-config\fP is a tool to determine the compiler and linker +\fIwx\-config\fP is a tool to determine the compiler and linker flags required for applications using the \fIwxWindows\fP toolkit(s). .PP -\fIwx-config\fP is normally a symlink to one of the port-specific -versions like \fIwxbase-config\fP or \fIwxgtk-config\fP which +\fIwx\-config\fP is normally a symlink to one of the port\-specific +versions like \fIwxbase\-config\fP or \fIwxgtk\-config\fP which designates the default port to compile applications with. You can override this default either by using one of the specific versions directly, or by changing which version the symlink points to. On Debian systems this can be done using the -.BR update-alternatives (8) +.BR update\-alternatives (8) mechanism. .hy .SH OPTIONS .l -\fIwx-config\fP accepts the following options: +\fIwx\-config\fP accepts the following options: .TP 8 .B \-\-version What to @@ -58,7 +58,7 @@ before any \-\-libs or \-\-cflags options. .br .nh .HP -(Translation: this is the root path to the \fIwxWindows\fP headers -- [Ron]) +(Translation: this is the root path to the \fIwxWindows\fP headers \-\- [Ron]) .hy .TP 8 .B \-\-exec\-prefix=PREFIX @@ -69,18 +69,18 @@ and \-\-libs options. This option must be specified before any .br .nh .HP -(Translation: this is the root path to the \fIwxWindows\fP library -- [Ron]) +(Translation: this is the root path to the \fIwxWindows\fP library \-\- [Ron]) .hy .SH SEE ALSO -.BR gtk-config (1), -.BR update-alternatives (8) +.BR gtk\-config (1), +.BR update\-alternatives (8) .SH COPYRIGHT -This manpage was copied whole-heartedly from the \fBgtk-config\fP(1) manpage +This manpage was copied whole\-heartedly from the \fBgtk\-config\fP(1) manpage by Brian Bassett for the Debian GNU/Linux distribution of wxGTK. It was then updated to include new options and otherwise bastardised generally by Ron Lee -The original gtk-config manpage copyright: +The original gtk\-config manpage copyright: Copyright \(co 1995 Spencer Kimball and Peter Mattis diff --git a/debian/wxPython-tools.1 b/debian/wxPython-tools.1 new file mode 100644 index 0000000000..1ef1dd9440 --- /dev/null +++ b/debian/wxPython-tools.1 @@ -0,0 +1,25 @@ +.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWindows" +.SH NAME +img2py \- wxPython tools. +.br +img2xpm \- wxPython tools. +.br +pycrust \- wxPython tools. +.br +pyshell \- wxPython tools. +.br +xrced \- wxPython tools. +.br +helpviewer \- wxPython tools. + +.SH DESCRIPTION +The real documentation for these tools is available in pydoc format. + +.SH SEE ALSO +.BR pydoc (1) + +.SH COPYRIGHT +This manpage was written by Ron Lee for the Debian GNU/Linux +distribution of wxWindows. It may be freely distributed by anyone insane enough +to find it useful. +