Enabled std_iostreams for the package builds.
Added more automagic python versioning so the packages don't need to depend on a specific default python version. The version that they were built with now only need to be available, not the system default. Bumped debian version. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
11
debian/changelog
vendored
11
debian/changelog
vendored
@@ -1,3 +1,14 @@
|
|||||||
|
wxwindows2.4 (2.4.2.4) unstable; urgency=low
|
||||||
|
|
||||||
|
* Modified build scripts to use pythonX.Y instead of python(>=X.Y)
|
||||||
|
* Removed bogus hard coded python2.2-xml. Closes: #216182
|
||||||
|
* Enabled iostream support despite my opinion of this c++ 'feature'.
|
||||||
|
Closes: #211050
|
||||||
|
* Event handling for menus with bitmaps fixed. Closes: #214788
|
||||||
|
* Includes fixed from cvs for wxHTTP and wxURL. Closes: #211023, #213600
|
||||||
|
|
||||||
|
-- Ron Lee <ron@debian.org> Sat, 25 Oct 2003 13:48:07 +0930
|
||||||
|
|
||||||
wxwindows2.4 (2.4.1.2) unstable; urgency=low
|
wxwindows2.4 (2.4.1.2) unstable; urgency=low
|
||||||
|
|
||||||
* New stable release. Closes: #198622
|
* New stable release. Closes: #198622
|
||||||
|
6
debian/control.in
vendored
6
debian/control.in
vendored
@@ -1,7 +1,7 @@
|
|||||||
Source: wxwindows=V
|
Source: wxwindows=V
|
||||||
Section: libs
|
Section: libs
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.3), python (<<2.4), python2.3-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
|
Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
|
||||||
Maintainer: Ron Lee <ron@debian.org>
|
Maintainer: Ron Lee <ron@debian.org>
|
||||||
Standards-Version: 3.6.1.0
|
Standards-Version: 3.6.1.0
|
||||||
|
|
||||||
@@ -117,8 +117,8 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
|
|||||||
Package: libwxgtk=V-python
|
Package: libwxgtk=V-python
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Section: python
|
Section: python
|
||||||
Depends: python (>=2.3), python (<<2.4), ${shlibs:Depends}
|
Depends: =PY, ${shlibs:Depends}
|
||||||
Suggests: wxwin=V-doc, wxwin=V-examples, python2.2-xml
|
Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
|
||||||
Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
|
Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
|
||||||
Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
|
Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
|
||||||
Provides: libwxgtk-python
|
Provides: libwxgtk-python
|
||||||
|
156
debian/rules
vendored
156
debian/rules
vendored
@@ -11,7 +11,7 @@ export DH_COMPAT=2
|
|||||||
export DH_OPTIONS
|
export DH_OPTIONS
|
||||||
|
|
||||||
release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
|
release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
|
||||||
python_dir:=python$(shell python -c "import sys;print sys.version[:3]")
|
python_ver:=python$(shell python -c "import sys;print sys.version[:3]")
|
||||||
|
|
||||||
cross_host=i586-mingw32msvc
|
cross_host=i586-mingw32msvc
|
||||||
cross_build=$(shell ./config.guess)
|
cross_build=$(shell ./config.guess)
|
||||||
@@ -125,7 +125,7 @@ wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
|
|||||||
# The Rules:
|
# The Rules:
|
||||||
|
|
||||||
debian/control: debian/control.in
|
debian/control: debian/control.in
|
||||||
sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
|
sed -e 's/=V/$(release)/g;s/=PY/$(python_ver)/g' < debian/control.in > debian/control
|
||||||
|
|
||||||
control-files-stamp: debian/control
|
control-files-stamp: debian/control
|
||||||
dh_testdir
|
dh_testdir
|
||||||
@@ -159,7 +159,7 @@ control-files-stamp: debian/control
|
|||||||
done;
|
done;
|
||||||
@for f in dirs docs menu postinst prerm; do \
|
@for f in dirs docs menu postinst prerm; do \
|
||||||
echo "generating control file $(package_gtk_py).$$f"; \
|
echo "generating control file $(package_gtk_py).$$f"; \
|
||||||
sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
|
sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
|
||||||
> debian/$(package_gtk_py).$$f; \
|
> debian/$(package_gtk_py).$$f; \
|
||||||
done;
|
done;
|
||||||
@for f in dirs postinst; do \
|
@for f in dirs postinst; do \
|
||||||
@@ -234,12 +234,13 @@ build: build_arch
|
|||||||
configure-wxbase-shared-stamp:
|
configure-wxbase-shared-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
mkdir -p $(objdir_wxbase_shared)
|
mkdir -p $(objdir_wxbase_shared)
|
||||||
cd $(objdir_wxbase_shared) \
|
cd $(objdir_wxbase_shared) \
|
||||||
&& ../configure --prefix=/usr \
|
&& ../configure --prefix=/usr \
|
||||||
--cache-file=$(config_cache) \
|
--cache-file=$(config_cache) \
|
||||||
--disable-gui \
|
--disable-gui \
|
||||||
--enable-soname \
|
--enable-soname \
|
||||||
--with-zlib=sys
|
--with-zlib=sys \
|
||||||
|
--enable-std_iostreams
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-wxbase-shared-stamp: configure-wxbase-shared-stamp
|
build-wxbase-shared-stamp: configure-wxbase-shared-stamp
|
||||||
@@ -250,12 +251,13 @@ build-wxbase-shared-stamp: configure-wxbase-shared-stamp
|
|||||||
configure-wxbase-static-stamp:
|
configure-wxbase-static-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
mkdir -p $(objdir_wxbase_static)
|
mkdir -p $(objdir_wxbase_static)
|
||||||
cd $(objdir_wxbase_static) \
|
cd $(objdir_wxbase_static) \
|
||||||
&& ../configure --prefix=/usr \
|
&& ../configure --prefix=/usr \
|
||||||
--cache-file=$(config_cache) \
|
--cache-file=$(config_cache) \
|
||||||
--disable-gui \
|
--disable-gui \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
--with-zlib=sys
|
--with-zlib=sys \
|
||||||
|
--enable-std_iostreams
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-wxbase-static-stamp: configure-wxbase-static-stamp
|
build-wxbase-static-stamp: configure-wxbase-static-stamp
|
||||||
@@ -266,13 +268,14 @@ build-wxbase-static-stamp: configure-wxbase-static-stamp
|
|||||||
configure-wxbase-debug-stamp:
|
configure-wxbase-debug-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
mkdir -p $(objdir_wxbase_debug)
|
mkdir -p $(objdir_wxbase_debug)
|
||||||
cd $(objdir_wxbase_debug) \
|
cd $(objdir_wxbase_debug) \
|
||||||
&& ../configure --prefix=/usr \
|
&& ../configure --prefix=/usr \
|
||||||
--cache-file=$(config_cache) \
|
--cache-file=$(config_cache) \
|
||||||
--disable-gui \
|
--disable-gui \
|
||||||
--enable-debug \
|
--enable-debug \
|
||||||
--enable-soname \
|
--enable-soname \
|
||||||
--with-zlib=sys
|
--with-zlib=sys \
|
||||||
|
--enable-std_iostreams
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-wxbase-debug-stamp: configure-wxbase-debug-stamp
|
build-wxbase-debug-stamp: configure-wxbase-debug-stamp
|
||||||
@@ -283,17 +286,18 @@ build-wxbase-debug-stamp: configure-wxbase-debug-stamp
|
|||||||
configure-gtk-shared-stamp:
|
configure-gtk-shared-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
mkdir -p $(objdir_gtk_shared)
|
mkdir -p $(objdir_gtk_shared)
|
||||||
cd $(objdir_gtk_shared) \
|
cd $(objdir_gtk_shared) \
|
||||||
&& ../configure --prefix=/usr \
|
&& ../configure --prefix=/usr \
|
||||||
--cache-file=$(config_cache) \
|
--cache-file=$(config_cache) \
|
||||||
--with-gtk \
|
--with-gtk \
|
||||||
--with-opengl \
|
--with-opengl \
|
||||||
--enable-soname \
|
--enable-soname \
|
||||||
--with-zlib=sys \
|
--with-zlib=sys \
|
||||||
--with-libjpeg=sys \
|
--with-libjpeg=sys \
|
||||||
--with-libpng=sys \
|
--with-libpng=sys \
|
||||||
--with-libtiff=sys \
|
--with-libtiff=sys \
|
||||||
--enable-dynamic-loader
|
--enable-dynamic-loader \
|
||||||
|
--enable-std_iostreams
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-gtk-shared-stamp: configure-gtk-shared-stamp
|
build-gtk-shared-stamp: configure-gtk-shared-stamp
|
||||||
@@ -304,17 +308,18 @@ build-gtk-shared-stamp: configure-gtk-shared-stamp
|
|||||||
configure-gtk-static-stamp:
|
configure-gtk-static-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
mkdir -p $(objdir_gtk_static)
|
mkdir -p $(objdir_gtk_static)
|
||||||
cd $(objdir_gtk_static) \
|
cd $(objdir_gtk_static) \
|
||||||
&& ../configure --prefix=/usr \
|
&& ../configure --prefix=/usr \
|
||||||
--cache-file=$(config_cache) \
|
--cache-file=$(config_cache) \
|
||||||
--with-gtk \
|
--with-gtk \
|
||||||
--with-opengl \
|
--with-opengl \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
--with-zlib=sys \
|
--with-zlib=sys \
|
||||||
--with-libjpeg=sys \
|
--with-libjpeg=sys \
|
||||||
--with-libpng=sys \
|
--with-libpng=sys \
|
||||||
--with-libtiff=sys \
|
--with-libtiff=sys \
|
||||||
--enable-dynamic-loader
|
--enable-dynamic-loader \
|
||||||
|
--enable-std_iostreams
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-gtk-static-stamp: configure-gtk-static-stamp
|
build-gtk-static-stamp: configure-gtk-static-stamp
|
||||||
@@ -325,18 +330,19 @@ build-gtk-static-stamp: configure-gtk-static-stamp
|
|||||||
configure-gtk-debug-stamp:
|
configure-gtk-debug-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
mkdir -p $(objdir_gtk_debug)
|
mkdir -p $(objdir_gtk_debug)
|
||||||
cd $(objdir_gtk_debug) \
|
cd $(objdir_gtk_debug) \
|
||||||
&& ../configure --prefix=/usr \
|
&& ../configure --prefix=/usr \
|
||||||
--cache-file=$(config_cache) \
|
--cache-file=$(config_cache) \
|
||||||
--with-gtk \
|
--with-gtk \
|
||||||
--with-opengl \
|
--with-opengl \
|
||||||
--enable-debug \
|
--enable-debug \
|
||||||
--enable-soname \
|
--enable-soname \
|
||||||
--with-zlib=sys \
|
--with-zlib=sys \
|
||||||
--with-libjpeg=sys \
|
--with-libjpeg=sys \
|
||||||
--with-libpng=sys \
|
--with-libpng=sys \
|
||||||
--with-libtiff=sys \
|
--with-libtiff=sys \
|
||||||
--enable-dynamic-loader
|
--enable-dynamic-loader \
|
||||||
|
--enable-std_iostreams
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-gtk-debug-stamp: configure-gtk-debug-stamp
|
build-gtk-debug-stamp: configure-gtk-debug-stamp
|
||||||
@@ -347,18 +353,19 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
|
|||||||
configure-gtk-univ-stamp:
|
configure-gtk-univ-stamp:
|
||||||
dh_testdir
|
dh_testdir
|
||||||
mkdir -p $(objdir_gtk_univ)
|
mkdir -p $(objdir_gtk_univ)
|
||||||
cd $(objdir_gtk_univ) \
|
cd $(objdir_gtk_univ) \
|
||||||
&& ../configure --prefix=/usr \
|
&& ../configure --prefix=/usr \
|
||||||
--cache-file=$(config_cache) \
|
--cache-file=$(config_cache) \
|
||||||
--with-gtk \
|
--with-gtk \
|
||||||
--with-opengl \
|
--with-opengl \
|
||||||
--enable-universal \
|
--enable-universal \
|
||||||
--enable-soname \
|
--enable-soname \
|
||||||
--with-zlib=sys \
|
--with-zlib=sys \
|
||||||
--with-libjpeg=sys \
|
--with-libjpeg=sys \
|
||||||
--with-libpng=sys \
|
--with-libpng=sys \
|
||||||
--with-libtiff=sys \
|
--with-libtiff=sys \
|
||||||
--enable-dynamic-loader
|
--enable-dynamic-loader \
|
||||||
|
--enable-std_iostreams
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-gtk-univ-stamp: configure-gtk-univ-stamp
|
build-gtk-univ-stamp: configure-gtk-univ-stamp
|
||||||
@@ -382,7 +389,7 @@ build-gtk-py-stamp: build-gtk-shared-stamp
|
|||||||
dh_testdir
|
dh_testdir
|
||||||
touch docs/lgpl.txt
|
touch docs/lgpl.txt
|
||||||
cd wxPython \
|
cd wxPython \
|
||||||
&& ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
|
&& $(python_ver) ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
build-doc-stamp: build-gtk-shared-stamp
|
build-doc-stamp: build-gtk-shared-stamp
|
||||||
@@ -689,11 +696,12 @@ install-gtk-py: build-gtk-py-stamp
|
|||||||
dh_testroot
|
dh_testroot
|
||||||
dh_clean -k
|
dh_clean -k
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
cd wxPython \
|
cd wxPython \
|
||||||
&& ./setup.py install \
|
&& $(python_ver) ./setup.py install \
|
||||||
--prefix=`pwd`/../debian/$(package_gtk_py)/usr \
|
--prefix=`pwd`/../debian/$(package_gtk_py)/usr \
|
||||||
WX_CONFIG='$(wxconfig)'
|
WX_CONFIG='$(wxconfig)'
|
||||||
find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
|
|
||||||
|
find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython \
|
||||||
-name '*.py?' -exec rm '{}' ';'
|
-name '*.py?' -exec rm '{}' ';'
|
||||||
|
|
||||||
dh_installman debian/wxPython-tools.1
|
dh_installman debian/wxPython-tools.1
|
||||||
@@ -709,7 +717,7 @@ 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/pywrap.1
|
||||||
|
|
||||||
# This is rather bogus, its included in the main copyright file now though.
|
# This is rather bogus, its included in the main copyright file now though.
|
||||||
rm -f debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython/tools/XRCed/license.txt
|
rm -f debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython/tools/XRCed/license.txt
|
||||||
|
|
||||||
install-headers: DH_OPTIONS=-p$(package_headers)
|
install-headers: DH_OPTIONS=-p$(package_headers)
|
||||||
install-headers: install-gtk-shared-stamp
|
install-headers: install-gtk-shared-stamp
|
||||||
|
Reference in New Issue
Block a user