Updated /debian with the latest changes from 2.2 branch.
Applied patch from 2.2 to setup.py to allow the setting of a 'trick' wx-config for in-tree package builds. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
parent
01a5f47468
commit
afa3e1edcd
18
debian/changelog
vendored
18
debian/changelog
vendored
@ -5,14 +5,30 @@ wxwindows2.2 (2.3.0) unstable; urgency=low
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sat, 27 Jan 2001 01:51:24 -0800
|
||||
|
||||
wxwindows2.2 (2.2.4) unstable; urgency=low
|
||||
wxwindows2.2 (2.2.6) unstable; urgency=low
|
||||
|
||||
* changed i18n package back to building during arch phase
|
||||
so we can reap the .mo files as they are created. Closes: #86174
|
||||
* OBCBLR Closes: #84692
|
||||
* fix wxPython build gremlin. Closes: #89209, #85129
|
||||
* general buglet count reduced.
|
||||
|
||||
-- Ron <ron@debian.org> Thu, 8 Mar 2001 21:10:07 -0800
|
||||
|
||||
wxwindows2.2 (2.2.5.1) unstable; urgency=low
|
||||
|
||||
* "This One's for Dirk" Closes: #84696
|
||||
* 2.2.5 has known issues and will not be released for Debian.
|
||||
* Fixed parser.y for Alpha builds (#82949)
|
||||
* changed mesa dependency to the virtual libgl package and
|
||||
added Conflicts for the old 2.1 packages (which are now
|
||||
gone from woody anyway) Closes: #80120, #70778, #70779, #70780
|
||||
* wxPython now builds as a single unit (including contrib)
|
||||
so removed the libwxgtk-python-contrib package
|
||||
* updated translations
|
||||
* new event table macro to enable code being written with 2.2
|
||||
to be forward compatible with the changes in 2.4
|
||||
* numerous sundry bugfixes
|
||||
|
||||
-- Ron Lee <ron@debian.org> Wed, 24 Jan 2001 18:51:24 -0800
|
||||
|
||||
|
||||
4
debian/control.in
vendored
4
debian/control.in
vendored
@ -1,7 +1,7 @@
|
||||
Source: wxwindows=V
|
||||
Section: libs
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>=1.1.17), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
|
||||
Build-Depends: debhelper (>=2.0), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
|
||||
Maintainer: Ron Lee <ron@debian.org>
|
||||
Standards-Version: 3.2.1.2
|
||||
|
||||
@ -114,7 +114,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
|
||||
Package: libwxgtk=V-python
|
||||
Architecture: any
|
||||
Section: interpreters
|
||||
Depends: libwxgtk=V (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), python-base (>=1.5.2), ${shlibs:Depends}
|
||||
Depends: python-base (>=1.5.2), ${shlibs:Depends}
|
||||
Suggests: wxwin=V-doc
|
||||
Conflicts: libwxgtk=V-python-contrib, python-wxwin
|
||||
Replaces: libwxgtk=V-python-contrib, python-wxwin
|
||||
|
||||
23
debian/rules
vendored
23
debian/rules
vendored
@ -43,14 +43,18 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
|
||||
$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
|
||||
$(objdir_doc) $(objdir_examples)
|
||||
|
||||
# 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.
|
||||
|
||||
# Build stamps:
|
||||
build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
|
||||
build-wxbase-debug-stamp build-gtk-shared-stamp \
|
||||
build-gtk-static-stamp build-gtk-debug-stamp \
|
||||
build-contrib-shared-stamp build-contrib-static-stamp \
|
||||
build-gtk-py-stamp
|
||||
build-gtk-py-stamp build-i18n-stamp
|
||||
|
||||
build_indep_stamps=build-examples-stamp build-doc-stamp build-i18n-stamp
|
||||
build_indep_stamps=build-examples-stamp build-doc-stamp
|
||||
|
||||
build_stamps=$(build_arch_stamps) $(build_indep_stamps)
|
||||
|
||||
@ -58,13 +62,18 @@ build_stamps=$(build_arch_stamps) $(build_indep_stamps)
|
||||
install_all_arch=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-headers
|
||||
install-headers install-i18n
|
||||
|
||||
install_all_indep=install-i18n install-doc install-examples
|
||||
install_all_indep=install-examples install-doc
|
||||
|
||||
install_all=$(install_all_arch) $(install_all_indep)
|
||||
|
||||
|
||||
wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
|
||||
--prefix=$(shell pwd) \
|
||||
--exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
|
||||
|
||||
|
||||
# The Rules:
|
||||
|
||||
debian/control: debian/control.in
|
||||
@ -236,7 +245,7 @@ build-gtk-py-stamp: build-gtk-shared-stamp
|
||||
dh_testdir
|
||||
touch docs/lgpl.txt
|
||||
cd wxPython \
|
||||
&& ./setup.py build IN_CVS_TREE=1
|
||||
&& ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
|
||||
touch $@
|
||||
|
||||
build-doc-stamp: build-gtk-shared-stamp
|
||||
@ -430,7 +439,7 @@ install-examples: build-examples-stamp
|
||||
dh_installdirs
|
||||
|
||||
binary-common:
|
||||
dh_testversion 1.1.17
|
||||
dh_testversion 2
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installdocs
|
||||
@ -440,7 +449,7 @@ binary-common:
|
||||
dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
dh_makeshlibs -N$(package_gtk_py)
|
||||
dh_makeshlibs -N$(package_gtk_py) -V
|
||||
dh_installdeb
|
||||
dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
|
||||
dh_gencontrol
|
||||
|
||||
@ -42,6 +42,10 @@ IN_CVS_TREE = 0 # Set to true if building in a full wxWindows CVS
|
||||
# tree, otherwise will assume all needed files are
|
||||
# available in the wxPython source distribution
|
||||
|
||||
WX_CONFIG = "wx-config" # 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.
|
||||
|
||||
# Some MSW build settings
|
||||
|
||||
@ -75,8 +79,7 @@ debug = '--debug' in sys.argv or '-g' in sys.argv
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY',
|
||||
'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID',
|
||||
'WXDLLVER', ]:
|
||||
'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID', ]:
|
||||
for x in range(len(sys.argv)):
|
||||
if string.find(sys.argv[x], flag) == 0:
|
||||
pos = string.find(sys.argv[x], '=') + 1
|
||||
@ -84,6 +87,14 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY',
|
||||
vars()[flag] = eval(sys.argv[x][pos:])
|
||||
sys.argv[x] = ''
|
||||
|
||||
for option in ['WX_CONFIG', 'WXDLLVER', ]:
|
||||
for x in range(len(sys.argv)):
|
||||
if string.find(sys.argv[x], option) == 0:
|
||||
pos = string.find(sys.argv[x], '=') + 1
|
||||
if pos > 0:
|
||||
vars()[option] = sys.argv[x][pos:]
|
||||
sys.argv[x] = ''
|
||||
|
||||
sys.argv = filter(None, sys.argv)
|
||||
|
||||
|
||||
@ -172,11 +183,11 @@ elif os.name == 'posix':
|
||||
libdirs = []
|
||||
libs = []
|
||||
|
||||
cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
|
||||
cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
|
||||
os.popen('gtk-config --cflags', 'r').read()[:-1]
|
||||
cflags = string.split(cflags)
|
||||
|
||||
lflags = os.popen('wx-config --libs', 'r').read()[:-1]
|
||||
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
|
||||
lflags = string.split(lflags)
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user