Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incorporate changes from 2.4 release.

Browse Source 
Bump standards version.
Update overrides for 2.5
Disable generation of gtk-univ package.
Update wx-config manpage.
Add wxPython-tools manpage(s).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-03 22:51:42 +00:00
parent 6c99908c51
commit 0ecfbbea12
7 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@@ -7,6 +7,11 @@ wxwindows2.5 (2.5.0) unstable; urgency=low
wxwindows2.4 (2.4.0) unstable; urgency=low wxwindows2.4 (2.4.0) unstable; urgency=low
* The fingers crossed release. * 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 <ron@debian.org> Thu, 19 Dec 2002 00:50:48 -0800 -- Ron Lee <ron@debian.org> Thu, 19 Dec 2002 00:50:48 -0800

2
debian/control.in vendored
View File

@@ -3,7 +3,7 @@ Section: libs
Priority: optional Priority: optional
Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng3-dev, libtiff3g-dev, libgl-dev, libesd0-dev Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng3-dev, libtiff3g-dev, libgl-dev, libesd0-dev
Maintainer: Ron Lee <ron@debian.org> Maintainer: Ron Lee <ron@debian.org>
Standards-Version: 3.5.7.0 Standards-Version: 3.5.8.0
Package: libwxbase=V Package: libwxbase=V
Architecture: any Architecture: any

3
debian/copyright vendored
View File

@@ -29,7 +29,8 @@ alters the actual terms of the authorative licence detailed below, it is
intended to be purely informative of the fact that the Debian binary packages intended to be purely informative of the fact that the Debian binary packages
will be built primarily with features useful to Free Software developers and will be built primarily with features useful to Free Software developers and
may not be suitable "as is" for compiling software for distribution that is may not be suitable "as is" for compiling software for distribution that is
licenced incompatibly with the LGPL. licenced incompatibly with the LGPL. See /usr/share/common-licenses for
the full text of the LGPL.
Modifications and additions to the Library itself are encouraged to be Modifications and additions to the Library itself are encouraged to be
placed under the wxWindows Library Licence. We hope you find it useful. placed under the wxWindows Library Licence. We hope you find it useful.

6
debian/lintian-override vendored
View File

@@ -1,4 +1,4 @@
libwxgtk2.3-dbg: non-dev-pkg-with-shlib-symlink libwxgtk2.5-dbg: non-dev-pkg-with-shlib-symlink
libwxbase2.3-dbg: non-dev-pkg-with-shlib-symlink libwxbase2.5-dbg: non-dev-pkg-with-shlib-symlink
libwxgtk2.3-univ: non-dev-pkg-with-shlib-symlink libwxgtk2.5-univ: non-dev-pkg-with-shlib-symlink

44
debian/rules vendored
View File

@@ -78,10 +78,12 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
build-wxbase-debug-stamp build-gtk-shared-stamp \ build-wxbase-debug-stamp build-gtk-shared-stamp \
build-gtk-static-stamp build-gtk-debug-stamp \ build-gtk-static-stamp build-gtk-debug-stamp \
build-gtk-univ-stamp \
build-contrib-shared-stamp build-contrib-static-stamp \ build-contrib-shared-stamp build-contrib-static-stamp \
build-gtk-py-stamp build-i18n-stamp build-gtk-py-stamp build-i18n-stamp
# disable gtk-univ build, we'll replace it with x11-univ later.
# build-gtk-univ-stamp
build_indep_stamps=build-examples-stamp build-doc-stamp build_indep_stamps=build-examples-stamp build-doc-stamp
build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \ build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
@@ -95,10 +97,12 @@ build_stamps=$(build_stamps_native) $(build_cross_stamps)
# Install targets: # Install targets:
install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
install-gtk-lib install-gtk-dev install-gtk-dbg \ install-gtk-lib install-gtk-dev install-gtk-dbg \
install-gtk-univ \
install-gtk-contrib install-gtk-contrib-dev install-gtk-py \ install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
install-headers install-i18n install-headers install-i18n
# disable gtk-univ build, we'll replace it with x11-univ later.
# install-gtk-univ
install_all_indep=install-examples install-doc install_all_indep=install-examples install-doc
install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
@@ -484,7 +488,6 @@ clean: debian/control
rm -f $(objdir_i18n)/*.mo rm -f $(objdir_i18n)/*.mo
cd wxPython \ cd wxPython \
&& ./setup.py clean \
&& rm -rf licence \ && rm -rf licence \
&& rm -rf build \ && rm -rf build \
&& rm -rf contrib/gizmos/contrib \ && rm -rf contrib/gizmos/contrib \
@@ -493,6 +496,10 @@ clean: debian/control
&& rm -rf contrib/xrc/contrib \ && rm -rf contrib/xrc/contrib \
&& rm -rf *.pyc && rm -rf *.pyc
# We do the equivalent of this above by removing build, unfortunately
# its not enough by itself to get the tree properly clean again.
# && ./setup.py clean
dh_clean dh_clean
rm -f debian/$(package_wxbase_lib).* rm -f debian/$(package_wxbase_lib).*
rm -f debian/$(package_wxbase_dev).* rm -f debian/$(package_wxbase_dev).*
@@ -613,10 +620,21 @@ install-gtk-py: build-gtk-py-stamp
dh_clean -k dh_clean -k
dh_installdirs dh_installdirs
cd wxPython \ 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 \ find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
-name '*.py?' -exec rm '{}' ';' -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: DH_OPTIONS=-p$(package_headers)
install-headers: install-gtk-lib install-headers: install-gtk-lib
dh_testdir dh_testdir
@@ -628,19 +646,13 @@ install-headers: install-gtk-lib
# them. Do that in a scratch dirs, and move the gtk ones last, so at least # them. Do that in a scratch dirs, and move the gtk ones last, so at least
# they win in the result of any uncaught conflict. # they win in the result of any uncaught conflict.
cd $(objdir_gtk_univ) \ # cd $(objdir_gtk_univ) \
&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr # && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
dh_movefiles --sourcedir=$(objdir_univ_install) # dh_movefiles --sourcedir=$(objdir_univ_install)
dh_movefiles --sourcedir=debian/$(package_gtk_lib) dh_movefiles --sourcedir=debian/$(package_gtk_lib)
dh_installmanpages \ dh_installman debian/wx-config.1
ansi2knr.1 \
jpegtran.1 \
libpng.3 \
libpngpf.3 \
zlib.3 \
png.5
install-i18n: DH_OPTIONS=-p$(package_i18n) install-i18n: DH_OPTIONS=-p$(package_i18n)
install-i18n: build-i18n-stamp install-gtk-lib install-i18n: build-i18n-stamp install-gtk-lib
@@ -756,13 +768,13 @@ binary-common:
# building the arch specific package files needed to create them. # building the arch specific package files needed to create them.
binary-indep: build_all install binary-indep: build_all install
$(MAKE) -f debian/rules \ $(MAKE) -f debian/rules \
DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
binary-common binary-common
# Build just the architecture-dependent files here. # Build just the architecture-dependent files here.
binary-arch: build_arch install_arch binary-arch: build_arch install_arch
$(MAKE) -f debian/rules \ $(MAKE) -f debian/rules \
DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
binary-common binary-common
# Build all packages target. # Build all packages target.

32
debian/wx-config.1 vendored
View File

@@ -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 .SH NAME
wx-config - generate compile time info for wxWindows wx-config \- generate compile time info for wxWindows
.SH SYNOPSIS .SH SYNOPSIS
.nh .nh
.B wxbase-config .B wxbase\-config
.br .br
.B wxgtk-config .B wxgtk\-config
.HP .HP
.B wx-config .B wx\-config
[\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld] [\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
.SH DESCRIPTION .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). flags required for applications using the \fIwxWindows\fP toolkit(s).
.PP .PP
\fIwx-config\fP is normally a symlink to one of the port-specific \fIwx\-config\fP is normally a symlink to one of the port\-specific
versions like \fIwxbase-config\fP or \fIwxgtk-config\fP which versions like \fIwxbase\-config\fP or \fIwxgtk\-config\fP which
designates the default port to compile applications with. designates the default port to compile applications with.
You can override this default either by using one of the specific You can override this default either by using one of the specific
versions directly, or by changing which version the symlink points to. versions directly, or by changing which version the symlink points to.
On Debian systems this can be done using the On Debian systems this can be done using the
.BR update-alternatives (8) .BR update\-alternatives (8)
mechanism. mechanism.
.hy .hy
.SH OPTIONS .SH OPTIONS
.l .l
\fIwx-config\fP accepts the following options: \fIwx\-config\fP accepts the following options:
.TP 8 .TP 8
.B \-\-version .B \-\-version
What to What to
@@ -58,7 +58,7 @@ before any \-\-libs or \-\-cflags options.
.br .br
.nh .nh
.HP .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 .hy
.TP 8 .TP 8
.B \-\-exec\-prefix=PREFIX .B \-\-exec\-prefix=PREFIX
@@ -69,18 +69,18 @@ and \-\-libs options. This option must be specified before any
.br .br
.nh .nh
.HP .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 .hy
.SH SEE ALSO .SH SEE ALSO
.BR gtk-config (1), .BR gtk\-config (1),
.BR update-alternatives (8) .BR update\-alternatives (8)
.SH COPYRIGHT .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 <brianb@debian.org> for the Debian GNU/Linux distribution of by Brian Bassett <brianb@debian.org> for the Debian GNU/Linux distribution of
wxGTK. It was then updated to include new options and otherwise bastardised wxGTK. It was then updated to include new options and otherwise bastardised
generally by Ron Lee <ron@debian.org> generally by Ron Lee <ron@debian.org>
The original gtk-config manpage copyright: The original gtk\-config manpage copyright:
Copyright \(co 1995 Spencer Kimball and Peter Mattis Copyright \(co 1995 Spencer Kimball and Peter Mattis

25
debian/wxPython-tools.1 vendored Normal file
View File

@@ -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 <ron@debian.org> for the Debian GNU/Linux
distribution of wxWindows. It may be freely distributed by anyone insane enough
to find it useful.