Mostly changes from the Debian 2.4.4 release(s) to improve compatibility

with wx2.6 branch.

Backports wxversion.py and versioned install support for setup.py

Includes new peer reviewed fr.po from http://bugs.debian.org/329070.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@35607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2005-09-20 07:39:07 +00:00
parent 9d11e17f2e
commit d9880bee40
34 changed files with 1379 additions and 1095 deletions

View File

@@ -1461,6 +1461,7 @@ PYTHON_DIST:
wxPython/wxPython/py \
wxPython/wxPython/py/tests \
wxPython/wxPython/py/wxd \
wxPython/wxversion \
; do \
echo "Copying dir: $$dir..."; \
mkdir -p $(DISTDIR)/$$dir; \

21
debian/README.Debian vendored
View File

@@ -35,17 +35,20 @@ libwxgtk wxGTK runtime shared libraries
libwxgtk-dev extra files and static libs for building wxGTK apps
libwxgtk-dbg wxGTK libraries built with -g and __WXDEBUG__
libwxgtk-python Python binding to wxGTK (from 2.2.3 onward, this
libwxgtk-contrib wxWin contrib runtime shared libs (built with wxGTK)
libwxgtk-contrib-dev extra files and static contrib libs for building apps
python-wxgtk Python binding to wxGTK (from 2.2.3 onward, this
obsoletes the libwxgtk-python-contrib package as
all python modules are built into a single monolith)
python-wxversion The wxversion.py version selector, new to wxPython2.6
python-wxtools The ancillary tools from the wxPython distribution.
wxwin-contrib wxWin contrib runtime shared libs (built with wxGTK)
wxwin-contrib-dev extra files and static contrib libs for building apps
wxwin-headers common header files for building wxWindows apps
wxwin-doc HTML version of the wxWindows manual
wxwin-examples wxWindows and wxPython demos and samples (source)
wxwin-i18n message catalogs for native language support
wx-common common helper files and support applications.
wx-headers common header files for building wxWindows apps
wx-doc HTML version of the wxWindows manual
wx-examples wxWindows and wxPython demos and samples (source)
wx-i18n message catalogs for native language support
The following binaries can be built from the source package
@@ -66,7 +69,7 @@ libwxmsw-dev mingw32-cross wxMSW libs.
libwxmsw-dbg mingw32-cross wxMSW (debug) libs.
libwxbase-msw-dev mingw32-cross wxBase libs.
libwxbase-msw-dbg mingw32-cross wxBase (debug) libs.
wxwin-headers-msw extra headers needed for wxMSW.
wx-headers-msw extra headers needed for wxMSW.
You can build all of these extra packages using the binary-cross
target in debian/rules.

27
debian/changelog vendored
View File

@@ -1,3 +1,28 @@
wxwindows2.4 (2.4.4.1.1) unstable; urgency=low
* Disable building of the common packages. The 2.6 source package
builds them now and that precludes 'earlier' versions from being
provided by this one in future. It is a bit premature, but
clearly a goal to punt toward for etch.
-- Ron Lee <ron@debian.org> Tue, 23 Aug 2005 00:43:23 +0930
wxwindows2.4 (2.4.4.1) unstable; urgency=low
* Rebuild for the xorg transition ^W^W^W^W^W^W
* Add conflicts/replaces for the Ubuntu -c2 branded packages.
* Update fr.po, thanks to Thomas Huriaux and debian-l10n-french.
Closes: #323587
* Rearrange the wxPython packages to comply with the Debian -python
policy now that we have one, and to better support apps that
depend on a particular version of wxPython.
* Backport the multi-version install system from 2.6 where helpful.
* Fully automate priority creep in the lib package alternatives.
* Collapse the wx-common package, it does not need multiple versions
present simultaneously.
-- Ron Lee <ron@debian.org> Sat, 16 Jul 2005 16:03:52 +0930
wxwindows2.4 (2.4.4) unstable; urgency=low
* Remove the (apparently long obsolete) #pragma interface goop.
@@ -8,6 +33,8 @@ wxwindows2.4 (2.4.4) unstable; urgency=low
* Bump library soname. The api has changed independently to the -c2
transition, but this release will be held back briefly to coincide
nicely with that.
* Switch from libpng2-dev to libpng12-dev in accordance with the libpng
transition plan for etch.
-- Ron Lee <ron@debian.org> Wed, 22 Jun 2005 20:19:41 +0930

242
debian/control.in vendored
View File

@@ -1,14 +1,16 @@
Source: wxwindows=V
Section: libs
Priority: optional
Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk1.2-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff4-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk1.2-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu-dev, libesd0-dev
Maintainer: Ron Lee <ron@debian.org>
Standards-Version: 3.6.1.1
Standards-Version: 3.6.2.1
Package: libwxbase=SOV
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Conflicts: libwxbase2.4c2
Replaces: libwxbase2.4c2
Description: wxBase library (runtime) - non-GUI support classes of wxWindows toolkit
wxBase is a collection of C++ classes providing basic data structures
(strings, lists, arrays), powerful wxDateTime class for date manipulations,
@@ -25,8 +27,8 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
Package: libwxbase=V-dev
Architecture: any
Section: libdevel
Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=SOV (= ${Source-Version}), libc6-dev
Suggests: wxwin=V-doc, gettext
Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV (= ${Source-Version}), libc6-dev
Suggests: wx=V-doc, gettext
Conflicts: libwxbase-dev
Replaces: libwxbase-dev
Provides: libwxbase-dev
@@ -46,7 +48,7 @@ Package: libwxbase=V-dbg
Architecture: any
Section: libdevel
Priority: extra
Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
Depends: wx=V-headers (= ${Source-Version}), libc6-dev
Conflicts: libwxbase-dbg
Replaces: libwxbase-dbg
Provides: libwxbase-dbg
@@ -68,7 +70,8 @@ Package: libwxgtk=SOV
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Replaces: wxgtk2.1
Conflicts: libwxgtk2.4c2
Replaces: wxgtk2.1, libwxgtk2.4c2
Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
@@ -81,8 +84,8 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
Package: libwxgtk=V-dev
Architecture: any
Section: libdevel
Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libc6-dev
Suggests: wxwin=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libc6-dev
Suggests: wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
Conflicts: libwxgtk-dev
Replaces: libwxgtk-dev, wxgtk2.1-dev
Provides: libwxgtk-dev
@@ -99,7 +102,7 @@ Package: libwxgtk=V-dbg
Architecture: any
Section: libdevel
Priority: extra
Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
Depends: wx=V-headers (= ${Source-Version}), libc6-dev
Conflicts: libwxgtk-dbg
Replaces: libwxgtk-dbg
Provides: libwxgtk-dbg
@@ -113,27 +116,12 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
provides many internal checks by wxWindows itself that are not performed on
apps compiled with the 'release version' libs in the -dev package.
Package: libwxgtk=SOV-python
Architecture: any
Section: python
Depends: =PY, ${shlibs:Depends}
Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
Conflicts: libwxgtk-python, libwxgtk=SOV-dbg-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
Replaces: libwxgtk-python, libwxgtk=SOV-dbg-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
Provides: libwxgtk-python
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides a Python binding to the wxGTK library and its
contrib libs. If you wish to use xrced you'll also need the python-xml
package installed.
Package: libwxgtk=SOV-contrib
Architecture: any
Section: libs
Depends: libwxgtk=SOV (= ${Source-Version}), ${shlibs:Depends}
Conflicts: libwxgtk2.4c2-contrib
Replaces: libwxgtk2.4c2-contrib
Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
@@ -144,7 +132,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
Package: libwxgtk=V-contrib-dev
Architecture: any
Section: libdevel
Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=SOV-contrib (= ${Source-Version}), libc6-dev
Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=SOV-contrib (= ${Source-Version}), libc6-dev
Conflicts: libwxgtk-contrib-dev
Replaces: libwxgtk-contrib-dev
Provides: libwxgtk-contrib-dev
@@ -156,67 +144,29 @@ Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
Install this package if you wish to compile applications that use the
contrib libs from the wxWindows source tree.
Package: wxwin=V-headers
Architecture: any
Section: devel
Conflicts: wxwin-headers
Replaces: wxwin-headers, wxgtk2.1-dev, libwxgtk2.3
Provides: wxwin-headers
Description: wxWindows Cross-platform C++ GUI toolkit (header files)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides the common header files required to build applications
using the wxWindows toolkit.
Package: wxwin=V-i18n
Architecture: all
Section: libs
Conflicts: wxwin-i18n
Replaces: wxwin-i18n
Provides: wxwin-i18n
Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides the i18n message catalogs for wxWindows.
Package: wxwin=V-doc
Architecture: all
Section: doc
Conflicts: wxwin2.2-doc, wxwin-doc
Replaces: wxwin-doc
Provides: wxwin-doc
Suggests: doc-base, www-browser
Description: wxWindows Cross-platform C++ GUI toolkit (documentation)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides a HTML version of the wxWindows reference manual.
Package: wxwin=V-examples
Architecture: all
Section: devel
Suggests: libwxgtk=V-dev (= ${Source-Version}), wxwin=V-doc
Description: wxWindows Cross-platform C++ GUI toolkit (examples)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package contains examples of using the wxWindows toolkit in
C++ and with the wxPython language binding.
Package: libwxgtk=SOV-dbg-python
Package: python-wxgtk=V
Architecture: any
Section: python
Depends: =PY, ${shlibs:Depends}
Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
Conflicts: libwxgtk=SOV-python
Replaces: libwxgtk=SOV-python
Provides: libwxgtk=SOV-python
Depends: python-wxversion, =PY, ${shlibs:Depends}
Suggests: wx=V-doc, wx=V-examples, =PY-xml
Conflicts: libwxgtk-python, libwxgtk2.4-python, libwxgtk2.4-1-python
Replaces: libwxgtk-python, libwxgtk2.4-python, libwxgtk2.4-1-python
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides a Python binding to the wxGTK library and its
contrib libs. If you wish to use xrced you'll also need the =PY-xml
package installed.
Package: python-wxgtk=V-dbg
Architecture: any
Section: python
Depends: python-wxversion, =PY, ${shlibs:Depends}
Conflicts: python-wxgtk=V
Replaces: python-wxgtk=V
Provides: python-wxgtk=V
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
@@ -227,27 +177,108 @@ Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
Unfortunately it cannot be installed at the same time as the release
packages, but it will replace them for other applications that require
wxPython. You should _never_ upload packages to Debian that depend upon
this package explicitly, use the libwxgtk=SOV-python package instead.
this package explicitly, use the python-wxgtk=V package instead.
.
If you wish to use xrced you'll also need the python-xml package installed.
If you wish to use xrc you'll also need the =PY-xml package installed.
Package: python-wxversion
Architecture: all
Section: python
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython version selector)
wxWindows is a class library for C++ providing GUI components and other
facilities on several popular platforms (and some unpopular ones as well).
For more information see http://wxwidgets.org
.
This package provides the wxPython version selector.
Package: python-wxtools
Architecture: all
Section: python
Depends: python-wxgtk=V, ${shlibs:Depends}
Conflicts: libwxgtk2.4-python, wxpython2.4-1
Replaces: libwxgtk2.4-python, wxpython2.4-1
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython common files)
wxWindows) is a class library for C++ providing GUI components and other
facilities on several popular platforms (and some unpopular ones as well).
For more information see http://wxwidgets.org
.
This package provides support utilities and common files for wxPython=V.
If you wish to use xrced you'll also need the =PY-xml package installed.
Package: wx-common
Architecture: any
Section: devel
Depends: ${shlibs:Depends}
Replaces: wxwin2.4-headers, libwxgtk2.4-contrib-dev
Description: wxWindows Cross-platform C++ GUI toolkit (common support files)
wxWindows is a class library for C++ providing GUI components and other
facilities on several popular platforms (and some unpopular ones as well).
For more information see http://wxwidgets.org
.
This package provides common support files not bound to any particular
wxWindows release, such as miscellaneous developer aids and binary utilities.
Package: wx=V-headers
Architecture: any
Section: devel
Conflicts: wxwin-headers, wxwin2.4-headers
Replaces: wxwin-headers, wxgtk2.1-dev, libwxgtk2.3, wxwin2.4-headers
Description: wxWindows Cross-platform C++ GUI toolkit (header files)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides the common header files required to build applications
using the wxWindows toolkit.
Package: wx=V-i18n
Architecture: all
Section: libs
Conflicts: wxwin-i18n, wxwin2.4-i18n
Replaces: wxwin-i18n, wxwin2.4-i18n
Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides the i18n message catalogs for wxWindows.
Package: wx=V-doc
Architecture: all
Section: doc
Conflicts: wxwin-doc, wxwin2.2-doc, wxwin2.4-doc
Replaces: wxwin-doc, wxwin2.4-doc
Suggests: doc-base, www-browser
Description: wxWindows Cross-platform C++ GUI toolkit (documentation)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package provides a HTML version of the wxWindows reference manual.
Package: wx=V-examples
Architecture: all
Section: devel
Suggests: libwxgtk=V-dev (= ${Source-Version}), wx=V-doc
Description: wxWindows Cross-platform C++ GUI toolkit (examples)
wxWindows is a class library for C++ providing GUI (Graphical User
Interface) and other facilities on more than one platform. Version =V
currently supports subsets of GTK+, Motif, and MS Windows.
.
This package contains examples of using the wxWindows toolkit in
C++ and with the wxPython language binding.
Package: libwxbase-msw=V-dev
Architecture: i386
Section: otherosfs
Depends: wxwin=V-headers-msw (= ${Source-Version})
Conflicts: libwxbase-msw-dev
Replaces: libwxbase-msw-dev
Provides: libwxbase-msw-dev
Depends: wx=V-headers-msw (= ${Source-Version})
Description: wxBase mingw32msvc-cross
mingw32msvc-cross wxBase libs.
Package: libwxbase-msw=V-dbg
Architecture: i386
Section: otherosfs
Depends: wxwin=V-headers-msw (= ${Source-Version})
Conflicts: libwxbase-msw-dbg
Replaces: libwxbase-msw-dbg
Provides: libwxbase-msw-dbg
Depends: wx=V-headers-msw (= ${Source-Version})
Description: wxBase mingw32msvc-cross (debug)
mingw32msvc-cross wxBase libs.
__WXDEBUG__ version.
@@ -255,31 +286,24 @@ Description: wxBase mingw32msvc-cross (debug)
Package: libwxmsw=V-dev
Architecture: i386
Section: otherosfs
Depends: wxwin=V-headers-msw (= ${Source-Version})
Conflicts: libwxmsw-dev
Replaces: libwxmsw-dev
Provides: libwxmsw-dev
Depends: wx=V-headers-msw (= ${Source-Version})
Description: wxMSW mingw32msvc-cross
mingw32msvc-cross wxMSW libs.
Package: libwxmsw=V-dbg
Architecture: i386
Section: otherosfs
Depends: wxwin=V-headers-msw (= ${Source-Version})
Conflicts: libwxmsw-dbg
Replaces: libwxmsw-dbg
Provides: libwxmsw-dbg
Depends: wx=V-headers-msw (= ${Source-Version})
Description: wxMSW mingw32msvc-cross (debug)
mingw32msvc-cross wxMSW libs.
__WXDEBUG__ version.
Package: wxwin=V-headers-msw
Package: wx=V-headers-msw
Architecture: i386
Section: otherosfs
Depends: wxwin=V-headers (= ${Source-Version})
Conflicts: wxwin-headers-msw
Replaces: wxwin-headers-msw
Provides: wxwin-headers-msw
Depends: wx=V-headers (= ${Source-Version})
Conflicts: wxwin-headers-msw, wxwin2.4-headers-msw
Replaces: wxwin-headers-msw, wxwin2.4-headers-msw
Description: Extra wxWindows headers for mingw32msvc-cross
Headers required by the wxWindows mingw32msvc-cross libraries.

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxbased-=V-config \
$(( =PRIO * 10 + 5 ))
#DEBHELPER#

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxbase-=V-config \
$(( =PRIO * 10 + 7 ))
#DEBHELPER#

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-=H-config 40
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxbased-=V-=H-config \
$(( =PRIO * 10 + 1 ))
#DEBHELPER#

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxbase-=V-=H-config \
$(( =PRIO * 10 + 3 ))
#DEBHELPER#

View File

@@ -1,3 +0,0 @@
?package(libwxgtk=V-contrib-dev):needs="X11" section="Apps/Programming"\
title="wxrcedit" command="/usr/bin/wxrcedit"

View File

@@ -1,7 +0,0 @@
?package(libwxgtk=SOV-dbg-python):needs="X11" section="Apps/Programming"\
title="pycrust" command="/usr/bin/pycrust"
?package(libwxgtk=SOV-dbg-python):needs="X11" section="Apps/Programming"\
title="pyshell" command="/usr/bin/pyshell"
?package(libwxgtk=SOV-dbg-python):needs="X11" section="Apps/Programming"\
title="xrced" command="/usr/bin/xrced"

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxgtkd-=V-config \
$(( =PRIO * 10 + 6 ))
#DEBHELPER#

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxgtk-=V-config \
$(( =PRIO * 10 + 8 ))
#DEBHELPER#

View File

@@ -1,2 +0,0 @@
usr/lib/=PY/site-packages/wxPython/lib

View File

@@ -1,7 +0,0 @@
?package(libwxgtk=SOV-python):needs="X11" section="Apps/Programming"\
title="pycrust" command="/usr/bin/pycrust"
?package(libwxgtk=SOV-python):needs="X11" section="Apps/Programming"\
title="pyshell" command="/usr/bin/pyshell"
?package(libwxgtk=SOV-python):needs="X11" section="Apps/Programming"\
title="xrced" command="/usr/bin/xrced"

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmswd-=V-=H-config 40
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxmswd-=V-=H-config \
$(( =PRIO * 10 + 2 ))
#DEBHELPER#

View File

@@ -1,7 +1,9 @@
#! /bin/sh
set -e
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmsw-=V-=H-config 40
update-alternatives --install /usr/bin/wx-config wx-config \
/usr/bin/wxmsw-=V-=H-config \
$(( =PRIO * 10 + 4 ))
#DEBHELPER#

View File

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

View File

@@ -1,2 +1,9 @@
libwxbase=V-dbg: non-dev-pkg-with-shlib-symlink
libwxbase=V-dbg: package-name-doesnt-match-sonames
libwxbase=SOV: package-name-doesnt-match-sonames
libwxgtk=V-dbg: non-dev-pkg-with-shlib-symlink
libwxgtk=V-dbg: package-name-doesnt-match-sonames
libwxgtk=SOV: package-name-doesnt-match-sonames
libwxgtk=SOV-contrib: package-name-doesnt-match-sonames
python-wxtools: python-script-but-no-python-dep

16
debian/python-wxgtk-dbg.postinst vendored Normal file
View File

@@ -0,0 +1,16 @@
#!/bin/sh
set -e
WXPYTHONDIR="/=WXPYDIR"
if [ "$1" = "configure" ]; then
=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
fi
update-alternatives --install /usr/lib/=PY/site-packages/wx.pth wx.pth \
/usr/lib/wx/config/wx=V-dbg.pth $(( =PRIO - 10 ))
#DEBHELPER#

View File

@@ -2,8 +2,10 @@
set -e
PACKAGE="libwxgtk=V-python"
PACKAGE="python-wxgtk=V-dbg"
dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
update-alternatives --remove wx.pth /usr/lib/wx/config/wx=V-dbg.pth
#DEBHELPER#

View File

@@ -2,12 +2,15 @@
set -e
WXPYTHONDIR="/usr/lib/=PY/site-packages/wxPython"
WXPYTHONDIR="/=WXPYDIR"
if [ "$1" = "configure" ]; then
=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
fi
update-alternatives --install /usr/lib/=PY/site-packages/wx.pth wx.pth \
/usr/lib/wx/config/wx=V.pth =PRIO
#DEBHELPER#

View File

@@ -2,8 +2,10 @@
set -e
PACKAGE="libwxgtk=V-dbg-python"
PACKAGE="python-wxgtk=V"
dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
update-alternatives --remove wx.pth /usr/lib/wx/config/wx=V.pth
#DEBHELPER#

7
debian/python-wxtools.menu vendored Normal file
View File

@@ -0,0 +1,7 @@
?package(python-wxtools):needs="X11" section="Apps/Programming"\
title="pycrust" command="/usr/bin/pycrust"
?package(python-wxtools):needs="X11" section="Apps/Programming"\
title="pyshell" command="/usr/bin/pyshell"
?package(python-wxtools):needs="X11" section="Apps/Programming"\
title="xrced" command="/usr/bin/xrced"

357
debian/rules vendored
View File

@@ -25,46 +25,80 @@ endif
-include debian/python-version
# If another source package is to supply the common binary packages
# for a particular Debian release, then define this variable to indicate
# the $(release) that is expected to provide it. Do not define it at
# all if this is to be the default (or only) wx source package for the
# target release.
#
# for etch:
DEBIAN_WX_DEFAULT_VERSION = 2.6
release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
# Disable package soname branding at present since there is no smooth
# way to make the transition without dpkg supporting versioned virtual
# deps or using a set of dummy transition packages. Look at reintroducing
# this after Sarge has safely sailed.
#sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
sorelease := $(release)
# Base value for alternative priorities.
alt_prio := $(subst .,,$(release))
pydir := usr/lib/$(python_ver)/site-packages
wxpydir := $(pydir)/wx-$(release)-gtk-ansi
cross_host = i586-mingw32msvc
cross_build = $(shell ./config.guess)
cross_host := i586-mingw32msvc
cross_build := $(shell ./config.guess)
config_cache = ../config_deb.cache
config_cache_cross = ../config_deb_cross.cache
# Packages to build:
package_wxbase_lib = libwxbase$(sorelease)
package_wxbase_dev = libwxbase$(release)-dev
package_wxbase_dbg = libwxbase$(release)-dbg
package_gtk_lib = libwxgtk$(sorelease)
package_gtk_dev = libwxgtk$(release)-dev
package_gtk_dbg = libwxgtk$(release)-dbg
package_gtk_py = libwxgtk$(sorelease)-python
package_gtk_contrib = libwxgtk$(sorelease)-contrib
package_gtk_contrib_dev = libwxgtk$(release)-contrib-dev
package_headers = wxwin$(release)-headers
package_i18n = wxwin$(release)-i18n
package_doc = wxwin$(release)-doc
package_examples = wxwin$(release)-examples
package_wxbase_lib := libwxbase$(sorelease)
package_wxbase_dev := libwxbase$(release)-dev
package_wxbase_dbg := libwxbase$(release)-dbg
package_gtk_dbg_py = libwxgtk$(sorelease)-dbg-python
package_gtk_lib := libwxgtk$(sorelease)
package_gtk_dev := libwxgtk$(release)-dev
package_gtk_dbg := libwxgtk$(release)-dbg
package_gtk_contrib := libwxgtk$(sorelease)-contrib
package_gtk_contrib_dev := libwxgtk$(release)-contrib-dev
package_gtk_py_lib := python-wxgtk$(release)
package_gtk_py_ver = python-wxversion
package_gtk_py_tools = python-wxtools
package_headers := wx$(release)-headers
package_i18n := wx$(release)-i18n
package_doc := wx$(release)-doc
package_examples := wx$(release)-examples
package_common = wx-common
# The packages listed here are common to all wx versions, and may be provided
# by another source package if more than one is in the release simultaneously.
common_packages := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools)
package_wxbase_msw_dev = libwxbase-msw$(release)-dev
package_wxbase_msw_dbg = libwxbase-msw$(release)-dbg
package_msw_dev = libwxmsw$(release)-dev
package_msw_dbg = libwxmsw$(release)-dbg
package_headers_msw = wxwin$(release)-headers-msw
package_gtk_dbg_py := python-wxgtk$(release)-dbg
package_wxbase_msw_dev := libwxbase-msw$(release)-dev
package_wxbase_msw_dbg := libwxbase-msw$(release)-dbg
package_msw_dev := libwxmsw$(release)-dev
package_msw_dbg := libwxmsw$(release)-dbg
package_headers_msw := wx$(release)-headers-msw
# The packages listed here will not be built by default.
extra_packages := $(package_gtk_dbg_py) \
$(package_wxbase_msw_dev) $(package_wxbase_msw_dbg) \
$(package_msw_dev) $(package_msw_dbg) $(package_headers_msw)
ifdef DEBIAN_WX_DEFAULT_VERSION
extra_packages += $(common_packages)
endif
# Build directories:
objdir_wxbase_shared = objs_wxbase_sh
@@ -74,7 +108,7 @@ objdir_gtk_debug = objs_gtk_d
objdir_gtk_install = objs_gtk_install
objdir_gtk_contrib_install = objs_gtk_contrib_install
objdir_doc_cruft = objs_doc_con
objdir_doc = docs/wxWindows-manual.html
objdir_doc = docs/wx-manual.html
objdir_examples = docs/examples
objdir_i18n = locale
@@ -85,7 +119,7 @@ objdir_msw_shared = objs_msw_sh
objdir_msw_static = objs_msw_st
objdir_msw_dbg = objs_msw_d
objdirs = $(objdir_wxbase_shared) $(objdir_wxbase_debug) \
objdirs := $(objdir_wxbase_shared) $(objdir_wxbase_debug) \
$(objdir_gtk_shared) $(objdir_gtk_debug) \
$(objdir_gtk_install) $(objdir_gtk_contrib_install) \
$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
@@ -96,6 +130,10 @@ objdirs = $(objdir_wxbase_shared) $(objdir_wxbase_debug) \
# note that the i18n package is actually arch indep (once built)
# but must be built (and installed) during the arch any phase as
# it's pulled out of the wxGTK shared lib package.
#
# similarly some of the wxpython packages are arch indep too, but
# all files for it are installed during the arch any phase.
# Build stamps:
build_arch_stamps = build-wxbase-shared-stamp build-wxbase-debug-stamp \
@@ -109,9 +147,10 @@ build_cross_stamps = build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
build-msw-static-stamp build-msw-dbg-stamp
build_stamps_native = $(build_arch_stamps) $(build_indep_stamps)
build_stamps_native := $(build_arch_stamps) $(build_indep_stamps)
build_stamps := $(build_stamps_native) $(build_cross_stamps)
build_stamps = $(build_stamps_native) $(build_cross_stamps)
# Install targets:
install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
@@ -119,13 +158,20 @@ install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
install-gtk-contrib install-gtk-contrib-dev install-gtk-py\
install-headers install-i18n
ifndef DEBIAN_WX_DEFAULT_VERSION
install_all_arch += install-common
endif
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
install_all_native = $(install_all_arch) $(install_all_indep)
install_all_native := $(install_all_arch) $(install_all_indep)
install_all = $(install_all_native) $(install_all_cross)
install_all := $(install_all_native) $(install_all_cross)
wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config \
@@ -143,87 +189,113 @@ debian/python-version:
echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
debian/control: $(addprefix debian/,control.in python-version)
sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g' \
sed -e 's/=V/$(release)/g; \
s/=SOV/$(sorelease)/g; \
s/=PY/$(python_ver)/g' \
< debian/control.in > debian/control
control-files-stamp: debian/control
dh_testdir
@for f in links postinst prerm; do \
echo "generating control file $(package_wxbase_dev).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-dev.$$f \
> debian/$(package_wxbase_dev).$$f; \
done;
@for f in links postinst prerm; do \
echo "generating control file $(package_wxbase_dbg).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-dbg.$$f \
> debian/$(package_wxbase_dbg).$$f; \
done;
@for f in links postinst prerm; do \
echo "generating control file $(package_gtk_dev).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxgtk-dev.$$f \
> debian/$(package_gtk_dev).$$f; \
done;
@for f in links postinst prerm; do \
echo "generating control file $(package_gtk_dbg).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxgtk-dbg.$$f \
> debian/$(package_gtk_dbg).$$f; \
done;
@for f in dirs docs menu postinst prerm; do \
echo "generating control file $(package_gtk_py).$$f"; \
sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \
< debian/libwxgtk-python.$$f \
> debian/$(package_gtk_py).$$f; \
@for f in docs postinst prerm; do \
echo "generating control file $(package_gtk_py_lib).$$f"; \
sed -e 's/=PY/$(python_ver)/g; \
s|=WXPYDIR|$(wxpydir)|g; \
s/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/python-wxgtk.$$f \
> debian/$(package_gtk_py_lib).$$f; \
done;
@for f in menu; do \
echo "generating control file $(package_gtk_contrib_dev).$$f"; \
sed -e 's/=V/$(release)/g' < debian/libwxgtk-contrib-dev.$$f \
> debian/$(package_gtk_contrib_dev).$$f; \
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dbg_py).$$f"; \
sed -e 's/=PY/$(python_ver)/g; \
s/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/python-wxgtk-dbg.$$f \
> debian/$(package_gtk_dbg_py).$$f; \
done;
@echo "generating control file $(package_gtk_dbg_py).docs";
@cp debian/python-wxgtk.docs debian/$(package_gtk_dbg_py).docs;
@for f in docs doc-base; do \
echo "generating control file $(package_doc).$$f"; \
sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
sed -e 's/=V/$(release)/g' \
< debian/wx-doc.$$f \
> debian/$(package_doc).$$f; \
done;
@for f in examples; do \
echo "generating control file $(package_examples).$$f"; \
cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
done;
@for f in dirs docs postinst; do \
echo "generating control file $(package_gtk_dbg_py).$$f"; \
sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
> debian/$(package_gtk_dbg_py).$$f; \
done;
@for f in menu prerm; do \
echo "generating control file $(package_gtk_dbg_py).$$f"; \
sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \
< debian/libwxgtk-dbg-python.$$f \
> debian/$(package_gtk_dbg_py).$$f; \
cp debian/wx-examples.$$f debian/$(package_examples).$$f; \
done;
@for f in dirs links postinst prerm; do \
echo "generating control file $(package_wxbase_msw_dev).$$f";\
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-msw-dev.$$f \
> debian/$(package_wxbase_msw_dev).$$f; \
done;
@for f in dirs links postinst prerm; do \
echo "generating control file $(package_wxbase_msw_dbg).$$f";\
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dbg.$$f \
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-msw-dbg.$$f \
> debian/$(package_wxbase_msw_dbg).$$f; \
done;
@for f in dirs links postinst prerm; do \
echo "generating control file $(package_msw_dev).$$f"; \
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxmsw-dev.$$f \
> debian/$(package_msw_dev).$$f; \
done;
@for f in dirs links postinst prerm; do \
echo "generating control file $(package_msw_dbg).$$f"; \
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dbg.$$f \
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
< debian/libwxmsw-dbg.$$f \
> debian/$(package_msw_dbg).$$f; \
done;
@for f in dirs; do \
echo "generating control file $(package_headers_msw).$$f"; \
sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
sed -e 's/=H/$(cross_host)/g' \
< debian/wx-headers-msw.$$f \
> debian/$(package_headers_msw).$$f; \
done;
@echo "generating control file lintian-override"; \
sed -e 's/=V/$(release)/g; \
s/=SOV/$(sorelease)/g' \
< debian/lintian-override.in \
> debian/lintian-override; \
touch $@
build_arch: control-files-stamp $(build_arch_stamps)
@@ -295,6 +367,7 @@ build-gtk-shared-stamp: configure-gtk-shared-stamp
cd $(objdir_gtk_shared) && $(FAST_MAKE)
touch $@
configure-gtk-debug-stamp:
dh_testdir
mkdir -p $(objdir_gtk_debug)
@@ -323,9 +396,9 @@ build-contrib-shared-stamp: build-gtk-shared-stamp
dh_testdir
cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
cd $(objdir_gtk_shared)/contrib/utils/wxrc && $(FAST_MAKE)
cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
touch $@
purge-dbg-py:
@if [ ! -e build-gtk-py-stamp ]; then \
$(MAKE) -f debian/rules clean-py; \
@@ -336,13 +409,14 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
dh_testdir
touch docs/lgpl.txt
cd wxPython \
&& $(python_ver) ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
&& $(python_ver) ./setup.py build \
WX_CONFIG='$(wxconfig)' \
IN_CVS_TREE=1
touch $@
build-doc-stamp: build-gtk-shared-stamp
dh_testdir
cd $(objdir_gtk_shared)/utils/tex2rtf/src \
&& $(FAST_MAKE)
cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE)
rm -rf $(objdir_doc)
rm -rf $(objdir_doc_cruft)
mkdir $(objdir_doc)
@@ -350,11 +424,12 @@ build-doc-stamp: build-gtk-shared-stamp
cd $(objdir_doc_cruft) \
&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
../docs/latex/wx/manual.tex \
../$(objdir_doc)/wx$(release)-manual.htm \
-twice -html
cp docs/latex/wx/*.gif $(objdir_doc)
rm -rf $(objdir_doc_cruft)
rm -f $(objdir_doc)/wxwin.con $(objdir_doc)/wxwin.hh* \
$(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}
touch $@
build-examples-stamp: build-gtk-shared-stamp
@@ -401,7 +476,9 @@ build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py
dh_testdir
touch docs/lgpl.txt
cd wxPython \
&& $(python_ver) ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig-dbg)'
&& $(python_ver) ./setup.py build \
WX_CONFIG='$(wxconfig-dbg)' \
IN_CVS_TREE=1
touch $@
configure-wxbase-msw-shared-stamp:
@@ -533,7 +610,7 @@ clean: debian/control clean-py
rm -f debian/$(package_gtk_lib).*
rm -f debian/$(package_gtk_dev).*
rm -f debian/$(package_gtk_dbg).*
rm -f debian/$(package_gtk_py).*
rm -f debian/$(package_gtk_py_lib).*
rm -f debian/$(package_gtk_contrib).*
rm -f debian/$(package_gtk_contrib_dev).*
rm -f debian/$(package_headers).*
@@ -547,6 +624,7 @@ clean: debian/control clean-py
rm -f debian/$(package_msw_dev).*
rm -f debian/$(package_msw_dbg).*
rm -f debian/$(package_headers_msw).*
rm -f debian/lintian-override
install_arch: build_arch $(install_all_arch)
@@ -557,15 +635,15 @@ install-wxbase-lib: build-wxbase-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_wxbase_shared)/lib/*.so.* usr/lib
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_wxbase_lib)/usr/share/lintian/overrides/$(package_wxbase_lib)
install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
install-wxbase-dev: build-wxbase-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config usr/bin
dh_install $(objdir_wxbase_shared)/lib/{wx,*.so} usr/lib
@@ -574,9 +652,9 @@ install-wxbase-dbg: build-wxbase-debug-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs usr/share/lintian/overrides
dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config usr/bin
dh_install $(objdir_wxbase_debug)/lib usr
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
install-gtk-shared-stamp:
@@ -591,15 +669,15 @@ install-gtk-lib: build-gtk-shared-stamp install-gtk-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_install)/lib/*.so.* usr/lib
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_gtk_lib)/usr/share/lintian/overrides/$(package_gtk_lib)
install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
install-gtk-dev: install-gtk-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config usr/bin
dh_install $(objdir_gtk_install)/lib/{wx,*.so} usr/lib
@@ -608,9 +686,9 @@ install-gtk-dbg: build-gtk-debug-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs usr/share/lintian/overrides
dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config usr/bin
dh_install $(objdir_gtk_debug)/lib usr
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
install-gtk-contrib-stamp:
@@ -625,41 +703,64 @@ install-gtk-contrib: build-contrib-shared-stamp install-gtk-contrib-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_contrib_install)/lib/*.so.* usr/lib
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_gtk_contrib)/usr/share/lintian/overrides/$(package_gtk_contrib)
install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
install-gtk-contrib-dev: install-gtk-contrib-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_contrib_install)/include usr
dh_install $(objdir_gtk_contrib_install)/lib/*.so usr/lib
dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc usr/bin
dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin
dh_installman debian/wxrc-tools.1
dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1 \
usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
install-gtk-py: build-gtk-py-stamp
install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib)
install-gtk-py-lib: build-gtk-py-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_installdirs usr/lib/wx/config
cd wxPython \
&& $(python_ver) ./setup.py install \
--prefix=`pwd`/../debian/$(package_gtk_py)/usr \
--prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr \
WX_CONFIG='$(wxconfig)'
find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages \
-name '*.py?' -exec rm '{}' ';'
# Why do we need this here?
rm debian/$(package_gtk_py_lib)/$(wxpydir).pth
mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth \
debian/$(package_gtk_py_lib)/usr/lib/wx/config/wx$(release).pth
find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';'
# This is rather bogus, its included in the main copyright file now though.
rm -f debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython/tools/XRCed/license.txt
rm -f debian/$(package_gtk_py_lib)/$(wxpydir)/wxPython/tools/XRCed/license.txt
install-gtk-py-ver: DH_OPTIONS=-p$(package_gtk_py_ver)
install-gtk-py-ver: install-gtk-py-lib
dh_testdir
dh_testroot
dh_clean -k
ifndef DEBIAN_WX_DEFAULT_VERSION
dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxversion.py
else
rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py
endif
install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
install-gtk-py-tools: install-gtk-py-ver
dh_testdir
dh_testroot
dh_clean -k
ifndef DEBIAN_WX_DEFAULT_VERSION
dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin
dh_installman debian/wxPython-tools.1
dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1 \
@@ -674,25 +775,42 @@ install-gtk-py: build-gtk-py-stamp
usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1 \
usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_gtk_py_tools)/usr/share/lintian/overrides/$(package_gtk_py_tools)
endif
rm -r debian/$(package_gtk_py_lib)/usr/bin
install-gtk-py: install-gtk-py-tools
install-common: DH_OPTIONS=-p$(package_common)
install-common: install-gtk-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_install $(objdir_gtk_install)/share/aclocal usr/share
dh_installman debian/wx-config.1
dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc usr/bin
dh_installman debian/wxrc-tools.1
dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
install-headers: DH_OPTIONS=-p$(package_headers)
install-headers: install-gtk-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_install)/include usr
dh_install $(objdir_gtk_install)/share/aclocal usr/share
dh_installman debian/wx-config.1
install-i18n: DH_OPTIONS=-p$(package_i18n)
install-i18n: build-i18n-stamp install-gtk-shared-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
dh_install $(objdir_gtk_install)/share/locale usr/share
install-doc: DH_OPTIONS=-p$(package_doc)
@@ -700,43 +818,34 @@ install-doc: build-doc-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
install-examples: DH_OPTIONS=-p$(package_examples)
install-examples: build-examples-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py)
install-gtk-dbg-py: build-gtk-dbg-py-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
cd wxPython \
&& $(python_ver) ./setup.py install \
--prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \
WX_CONFIG='$(wxconfig-dbg)'
find debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages \
-name '*.py?' -exec rm '{}' ';'
# Why do we need this here?
rm debian/$(package_gtk_py_lib)/$(wxpydir).pth
mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth \
debian/$(package_gtk_py_lib)/usr/lib/wx/config/wx$(release)-dbg.pth
find debian/$(package_gtk_dbg_py)/$(pydir) -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 \
usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1 \
usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
# This is rather bogus, its included in the main copyright file now though.
rm -f debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages/wxPython/tools/XRCed/license.txt
rm -f debian/$(package_gtk_dbg_py)/$(wxpydir)/wxPython/tools/XRCed/license.txt
install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
@@ -822,8 +931,8 @@ binary-common:
@# Don't do this for the dbg-py special build because dh_makeshlibs
@# will crap out if it is called with no packages to act on.
@if [ "x$(DH_OPTIONS)" != "-p$(package_gtk_dbg_py)" ]; then \
echo "dh_makeshlibs -N$(package_gtk_py) -V"; \
dh_makeshlibs -N$(package_gtk_py) -V; \
echo "dh_makeshlibs -N$(package_gtk_py_lib) -V"; \
dh_makeshlibs -N$(package_gtk_py_lib) -V; \
fi
dh_installdeb
@@ -837,13 +946,13 @@ binary-common:
# building the arch specific package files needed to create them.
binary-indep: build_all install
$(MAKE) -f debian/rules \
DH_OPTIONS="-i -N$(package_gtk_dbg_py) -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 $(addprefix -N,$(extra_packages))" \
binary-common
# Build just the architecture-dependent files here.
binary-arch: build_arch install_arch
$(MAKE) -f debian/rules \
DH_OPTIONS="-a -N$(package_gtk_dbg_py) -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 $(addprefix -N,$(extra_packages))" \
binary-common
# Build all packages target.
@@ -906,8 +1015,10 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers
install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
install-gtk-lib install-gtk-dev install-gtk-dbg \
install-gtk-contrib install-gtk-contrib-dev \
install-gtk-py install-gtk-dbg-py \
install-headers install-i18n install-doc install-examples \
install-gtk-py install-gtk-py-tools install-gtk-py-ver \
install-gtk-py-lib install-gtk-dbg-py \
install-common install-headers install-i18n \
install-doc install-examples \
install-wxbase-msw-dev install-msw-dev install-headers-msw \
install-wxbase-msw-dbg install-msw-dbg

View File

@@ -1,7 +1,7 @@
Document: wx=V-manual
Title: wxWidgets=V Programming Manual
Author: The wxWidgets Cabal
Abstract: This manual describes the wxWidgets=V cross-platform GUI toolkit.
Document: wxwindows-manual
Title: wxWindows Programming Manual
Author: The wxWindows Cabal
Abstract: This manual describes the wxWindows cross-platform GUI toolkit.
Section: Apps/Programming
Format: HTML

6
debian/wxrc-tools.1 vendored
View File

@@ -6,9 +6,9 @@ wxrced \- graphical editing tool for wx xml resource files.
.SH DESCRIPTION
The real documentation for these tools (what of it that exists) is available
in the wxWindows manual, which is packaged in html format in the wxwin2.4-doc
package and installed in /usr/share/doc/wxwin2.4-doc/wxWindows-manual.html on
Debian systems.
in the wxWindows manual, which is packaged in html format in the wx2.4-doc
package and installed in /usr/share/doc/wx2.4-doc/wx-manual.html on Debian
systems.
.SH COPYRIGHT
This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux

View File

@@ -1,10 +0,0 @@
Document: wxwindows-manual
Title: wxWindows Programming Manual
Author: The wxWindows Cabal
Abstract: This manual describes the wxWindows cross-platform GUI toolkit.
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/wxwin_contents.html
Files: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/*

View File

@@ -1,2 +0,0 @@
docs/wxWindows-manual.html

View File

@@ -1,4 +0,0 @@
debian/README.examples
docs/examples/samples
docs/examples/wxPython

File diff suppressed because it is too large Load Diff

View File

@@ -16,7 +16,7 @@ from distutils.command.install_data import install_data
VER_MAJOR = 2 # The first three must match wxWindows
VER_MINOR = 4
VER_RELEASE = 4
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows
VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWindows
VER_FLAGS = "" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
@@ -100,6 +100,24 @@ UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by default defines NDEBUG,
NO_SCRIPTS = 0 # Don't install the tool scripts
INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions
# can co-exist. When turned on the wx and wxPython
# pacakges will be installed in a versioned subdir
# of site-packages, and a *.pth file will be
# created that adds that dir to the sys.path. In
# addition, a wxversion.py module will be installed
# to site-pacakges that will allow applications to
# choose a specific version if more than one are
# installed.
FLAVOUR = "" # Optional flavour string to be appended to VERSION
# in MULTIVERSION installs
EP_ADD_OPTS = 1 # When doing MULTIVERSION installs the wx port and
# ansi/unicode settings can optionally be added to the
# subdir path used in site-packages
WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set
# it to pass an alternate version of wx-config or alternate
# flags, eg. as required by the .deb in-tree build. By
@@ -185,6 +203,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',
'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',
'UNDEF_NDEBUG', 'NO_SCRIPTS',
'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)):
if sys.argv[x].find(flag) == 0:
@@ -194,7 +213,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
sys.argv[x] = ''
# String options
for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT']:
for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'FLAVOUR']:
for x in range(len(sys.argv)):
if sys.argv[x].find(option) == 0:
pos = sys.argv[x].find('=') + 1
@@ -340,6 +359,31 @@ def find_data_files(srcdir, *wildcards):
return file_list
def getExtraPath(shortVer=True, addOpts=False):
"""Get the dirname that wxPython will be installed under."""
if shortVer:
# short version, just Major.Minor
ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR)
# plus release if minor is odd
if VER_MINOR % 2 == 1:
ep += ".%d" % VER_RELEASE
else:
# long version, full version
ep = "wx-%d.%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL)
if addOpts:
port = WXPORT
if port == "msw": port = "win32"
ep += "-%s-%s" % (WXPORT, (UNICODE and 'unicode' or 'ansi'))
if FLAVOUR:
ep += "-" + FLAVOUR
return ep
#----------------------------------------------------------------------
# sanity checks
@@ -1202,6 +1246,13 @@ DATA_FILES += find_data_files('wxPython/py', '*.txt', '*.ico', '*.css', '*.html'
DATA_FILES += find_data_files('wx', '*.txt', '*.css', '*.html')
if INSTALL_MULTIVERSION:
EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
open("src/wx.pth", "w").write(EXTRA_PATH)
else:
EXTRA_PATH = None
#----------------------------------------------------------------------
# Do the Setup/Build/Install/Whatever
#----------------------------------------------------------------------
@@ -1242,6 +1293,8 @@ if __name__ == "__main__":
'wx.tools.XRCed',
],
extra_path = EXTRA_PATH,
ext_package = PKGDIR,
ext_modules = wxpExtensions,
@@ -1255,5 +1308,32 @@ if __name__ == "__main__":
)
if INSTALL_MULTIVERSION:
setup(name = 'wxPython-common',
version = VERSION,
description = DESCRIPTION,
long_description = LONG_DESCRIPTION,
author = AUTHOR,
author_email = AUTHOR_EMAIL,
url = URL,
download_url = DOWNLOAD_URL,
license = LICENSE,
platforms = PLATFORMS,
classifiers = filter(None, CLASSIFIERS.split("\n")),
keywords = KEYWORDS,
package_dir = { '': 'wxversion' },
py_modules = ['wxversion'],
data_files = [('', ['src/wx.pth'])],
options = { 'build' : { 'build_base' : BUILD_BASE },
},
cmdclass = { 'install_data': smart_install_data,
},
)
#----------------------------------------------------------------------
#----------------------------------------------------------------------

View File

@@ -1,10 +1,10 @@
# This file was generated by setup.py...
wxVERSION_STRING = '2.4.4.0'
wxVERSION_STRING = '2.4.4.1'
wxMAJOR_VERSION = 2
wxMINOR_VERSION = 4
wxRELEASE_VERSION = 4
wxSUBREL_VERSION = 0
wxSUBREL_VERSION = 1
wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
wxSUBREL_VERSION, '')