From bb7cbba940067e9762b19f6e5524ed75fd713d25 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Thu, 13 Apr 2006 07:40:31 +0000 Subject: [PATCH] Updates for the Debian 2.4.5 release, includes fixes for broken assignments to a non-lvalue, which fails with a strict compiler. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@38689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 2 +- configure.in | 2 +- contrib/src/mmedia/sndesd.cpp | 6 +- contrib/src/mmedia/sndoss.cpp | 3 +- debian/changelog | 38 +++++++++++ debian/copyright | 6 +- debian/libwxbase-dbg.links | 2 - debian/libwxbase-dev.links | 1 - debian/libwxbase-msw-dbg.links | 2 - debian/libwxbase-msw-dev.links | 2 - debian/libwxgtk-dbg.links | 2 - debian/libwxgtk-dev.links | 2 - debian/libwxmsw-dbg.links | 2 - debian/libwxmsw-dev.links | 2 - debian/rules | 112 +++++++++++++++++++-------------- debian/wx-xy-config.1 | 14 +++++ include/wx/version.h | 8 +-- wxPython/setup.py | 4 +- wxPython/src/__version__.py | 6 +- 19 files changed, 136 insertions(+), 80 deletions(-) delete mode 100644 debian/libwxbase-dbg.links delete mode 100644 debian/libwxbase-dev.links delete mode 100644 debian/libwxbase-msw-dbg.links delete mode 100644 debian/libwxbase-msw-dev.links delete mode 100644 debian/libwxgtk-dbg.links delete mode 100644 debian/libwxgtk-dev.links delete mode 100644 debian/libwxmsw-dbg.links delete mode 100644 debian/libwxmsw-dev.links create mode 100644 debian/wx-xy-config.1 diff --git a/configure b/configure index 52b21dd7b4..2223b2f4d2 100755 --- a/configure +++ b/configure @@ -1086,7 +1086,7 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=4 -WX_RELEASE_NUMBER=4 +WX_RELEASE_NUMBER=5 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER diff --git a/configure.in b/configure.in index 8776c0ed14..4301fbb676 100644 --- a/configure.in +++ b/configure.in @@ -48,7 +48,7 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE) WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=4 -WX_RELEASE_NUMBER=4 +WX_RELEASE_NUMBER=5 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER diff --git a/contrib/src/mmedia/sndesd.cpp b/contrib/src/mmedia/sndesd.cpp index c5e1acce08..d12acfbf8e 100644 --- a/contrib/src/mmedia/sndesd.cpp +++ b/contrib/src/mmedia/sndesd.cpp @@ -104,7 +104,8 @@ wxSoundStream& wxSoundStreamESD::Read(void *buffer, wxUint32 len) return *this; } - m_lastcount = (wxUint32)ret = read(m_fd_input, buffer, len); + ret = read(m_fd_input, buffer, len); + m_lastcount = (wxUint32)ret; if (ret < 0) m_snderror = wxSOUND_IOERROR; @@ -127,7 +128,8 @@ wxSoundStream& wxSoundStreamESD::Write(const void *buffer, wxUint32 len) return *this; } - m_lastcount = (wxUint32)ret = write(m_fd_output, buffer, len); + ret = write(m_fd_output, buffer, len); + m_lastcount = (wxUint32)ret; if (ret < 0) m_snderror = wxSOUND_IOERROR; diff --git a/contrib/src/mmedia/sndoss.cpp b/contrib/src/mmedia/sndoss.cpp index f7b15b8b6f..a76f803d23 100644 --- a/contrib/src/mmedia/sndoss.cpp +++ b/contrib/src/mmedia/sndoss.cpp @@ -83,7 +83,8 @@ wxSoundStream& wxSoundStreamOSS::Read(void *buffer, wxUint32 len) return *this; } - m_lastcount = (wxUint32)ret = read(m_fd, buffer, len); + ret = read(m_fd, buffer, len); + m_lastcount = (wxUint32)ret; m_q_filled = TRUE; if (ret < 0) diff --git a/debian/changelog b/debian/changelog index b41027fc6c..69eda6293e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,41 @@ +wxwindows2.4 (2.4.5) unstable; urgency=low + + * Removes Gnome project GPL code from gtk/menu.cpp. Incorporating + it here invalidates the wxWindows licence exception. If your app + depends on it (and is GPL), you'll have to source it from Gnome; + if your app wasn't GPL, well, it is now... You've got some work + to do (and nice people to apologise to) as well. sigh. + * Remove the wx-*-config manpage symlinks. They are obsolete now. + * Update fr.po, thanks to Thomas Huriaux and debian-l10n-french. + Closes: #329070 + * Fixes FTBFS with new make. If this ugly quoting is the tradeoff, + I'm itching to learn of the fabulous benefits... Closes: #350696 + Ack NMU for this from Kurt Roeckx to keep the amd64 transition + rolling while my x86 build machine was painfully dying. Thanks! + * Trimmed dependency on pangox. + * Use WaitTimeout instead of Wait in threadpsx.cpp. See wx bts + report #1263806 on sf. + * Source fix for solaris/sunos/sgi string bug. Does not affect us. + * Source fix for uninitialised variable trouble on ME. Does not + affect us. + * Respect the CONCURRENCY_LEVEL environment variable before taking + a guess based on DISTCC_HOSTS of how many jobs to load make with. + People may have that set for use with make-kpkg, and consistency + here is surely a Good Thing. + * Fix strange and invalid cast-assignment construct in sndesd.cpp + and sndoss.cpp + * Update FSF address in copyright file. + + -- Ron Lee Sat, 13 Apr 2006 03:06:11 +1030 + +wxwindows2.4 (2.4.4.1.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Make it build using the new make. Patch from + Daniel Schepler (Closes: #350696) + + -- Kurt Roeckx Sun, 9 Apr 2006 12:24:28 +0200 + wxwindows2.4 (2.4.4.1.1) unstable; urgency=low * Disable building of the common packages. The 2.6 source package diff --git a/debian/copyright b/debian/copyright index 031863d2c0..bedca55c73 100644 --- a/debian/copyright +++ b/debian/copyright @@ -100,9 +100,9 @@ under two different licences: You should have received a copy of the GNU Library General Public Licence along with this software, usually in a file named COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA. - + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + EXCEPTION NOTICE 1. As a special exception, the copyright holders of this library give diff --git a/debian/libwxbase-dbg.links b/debian/libwxbase-dbg.links deleted file mode 100644 index 7b8770e7a7..0000000000 --- a/debian/libwxbase-dbg.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz - diff --git a/debian/libwxbase-dev.links b/debian/libwxbase-dev.links deleted file mode 100644 index b470e36be2..0000000000 --- a/debian/libwxbase-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz diff --git a/debian/libwxbase-msw-dbg.links b/debian/libwxbase-msw-dbg.links deleted file mode 100644 index cbf06c9c89..0000000000 --- a/debian/libwxbase-msw-dbg.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-=H-config.1.gz - diff --git a/debian/libwxbase-msw-dev.links b/debian/libwxbase-msw-dev.links deleted file mode 100644 index 7cb936bb34..0000000000 --- a/debian/libwxbase-msw-dev.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz - diff --git a/debian/libwxgtk-dbg.links b/debian/libwxgtk-dbg.links deleted file mode 100644 index 7ef5011266..0000000000 --- a/debian/libwxgtk-dbg.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz - diff --git a/debian/libwxgtk-dev.links b/debian/libwxgtk-dev.links deleted file mode 100644 index ae94c6caa8..0000000000 --- a/debian/libwxgtk-dev.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz - diff --git a/debian/libwxmsw-dbg.links b/debian/libwxmsw-dbg.links deleted file mode 100644 index fe52c044a9..0000000000 --- a/debian/libwxmsw-dbg.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmswd-=V-=H-config.1.gz - diff --git a/debian/libwxmsw-dev.links b/debian/libwxmsw-dev.links deleted file mode 100644 index 7acae87205..0000000000 --- a/debian/libwxmsw-dev.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz - diff --git a/debian/rules b/debian/rules index 9d726f476b..e37d42f844 100755 --- a/debian/rules +++ b/debian/rules @@ -9,18 +9,26 @@ #export DH_VERBOSE=1 export DH_OPTIONS -ifdef DISTCC_HOSTS +ifdef CONCURRENCY_LEVEL - #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#))) - # Nearly as fast, but doesn't raise the room temperature - # or saturate the build machines quite so much. + # A user who knows what they want, that's like gold... + # respect their precious opinion of how much blue smoke to use. + JOB_COUNT := $(CONCURRENCY_LEVEL) + +else ifdef DISTCC_HOSTS + + # Otherwise, if they have a cluster, try to put it to good use. JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#) + + # Not much faster, but it might keep you warm in winter... + #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#))) + +endif + +ifdef JOB_COUNT FAST_MAKE = $(MAKE) -j $(JOB_COUNT) - else - FAST_MAKE = $(MAKE) - endif -include debian/python-version @@ -33,7 +41,8 @@ endif # target release. # # for etch: -DEBIAN_WX_DEFAULT_VERSION = 2.6 +#DEBIAN_WX_DEFAULT_VERSION = 2.6 +# XXX release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p') @@ -189,55 +198,53 @@ 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 \ + @for f in postinst prerm; do \ echo "generating control file $(package_wxbase_dev).$$f"; \ - sed -e 's/=V/$(release)/g; \ - s/=PRIO/$(alt_prio)/g' \ + 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 \ + @for f in postinst prerm; do \ echo "generating control file $(package_wxbase_dbg).$$f"; \ - sed -e 's/=V/$(release)/g; \ - s/=PRIO/$(alt_prio)/g' \ + 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 \ + @for f in postinst prerm; do \ echo "generating control file $(package_gtk_dev).$$f"; \ - sed -e 's/=V/$(release)/g; \ - s/=PRIO/$(alt_prio)/g' \ + 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 \ + @for f in postinst prerm; do \ echo "generating control file $(package_gtk_dbg).$$f"; \ - sed -e 's/=V/$(release)/g; \ - s/=PRIO/$(alt_prio)/g' \ + sed -e 's/=V/$(release)/g; '\ +' s/=PRIO/$(alt_prio)/g' \ < debian/libwxgtk-dbg.$$f \ > debian/$(package_gtk_dbg).$$f; \ done; @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' \ + 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 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' \ + 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; @@ -253,35 +260,35 @@ control-files-stamp: debian/control echo "generating control file $(package_examples).$$f"; \ cp debian/wx-examples.$$f debian/$(package_examples).$$f; \ done; - @for f in dirs links postinst prerm; do \ + @for f in dirs postinst prerm; do \ echo "generating control file $(package_wxbase_msw_dev).$$f";\ - sed -e 's/=V/$(release)/g; \ - s/=H/$(cross_host)/g; \ - s/=PRIO/$(alt_prio)/g' \ + 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 \ + @for f in dirs postinst prerm; do \ echo "generating control file $(package_wxbase_msw_dbg).$$f";\ - sed -e 's/=V/$(release)/g; \ - s/=H/$(cross_host)/g; \ - s/=PRIO/$(alt_prio)/g' \ + 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 \ + @for f in dirs postinst prerm; do \ echo "generating control file $(package_msw_dev).$$f"; \ - sed -e 's/=V/$(release)/g; \ - s/=H/$(cross_host)/g; \ - s/=PRIO/$(alt_prio)/g' \ + 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 \ + @for f in dirs postinst prerm; do \ echo "generating control file $(package_msw_dbg).$$f"; \ - sed -e 's/=V/$(release)/g; \ - s/=H/$(cross_host)/g; \ - s/=PRIO/$(alt_prio)/g' \ + 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; @@ -292,8 +299,8 @@ control-files-stamp: debian/control > debian/$(package_headers_msw).$$f; \ done; @echo "generating control file lintian-override"; \ - sed -e 's/=V/$(release)/g; \ - s/=SOV/$(sorelease)/g' \ + sed -e 's/=V/$(release)/g; '\ +' s/=SOV/$(sorelease)/g' \ < debian/lintian-override.in \ > debian/lintian-override; \ touch $@ @@ -646,6 +653,8 @@ install-wxbase-dev: build-wxbase-shared-stamp dh_clean -k dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config usr/bin dh_install $(objdir_wxbase_shared)/lib/{wx,*.so} usr/lib + dh_link usr/share/man/man1/wx-xy-config.1.gz \ + usr/share/man/man1/wxbase-$(release)-config.1.gz install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg) install-wxbase-dbg: build-wxbase-debug-stamp @@ -656,6 +665,8 @@ install-wxbase-dbg: build-wxbase-debug-stamp 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) + dh_link usr/share/man/man1/wx-xy-config.1.gz \ + usr/share/man/man1/wxbased-$(release)-config.1.gz install-gtk-shared-stamp: dh_testdir @@ -680,6 +691,8 @@ install-gtk-dev: install-gtk-shared-stamp dh_clean -k dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config usr/bin dh_install $(objdir_gtk_install)/lib/{wx,*.so} usr/lib + dh_link usr/share/man/man1/wx-xy-config.1.gz \ + usr/share/man/man1/wxgtk-$(release)-config.1.gz install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg) install-gtk-dbg: build-gtk-debug-stamp @@ -690,6 +703,8 @@ install-gtk-dbg: build-gtk-debug-stamp 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) + dh_link usr/share/man/man1/wx-xy-config.1.gz \ + usr/share/man/man1/wxgtkd-$(release)-config.1.gz install-gtk-contrib-stamp: dh_testdir @@ -804,6 +819,7 @@ install-headers: install-gtk-shared-stamp dh_clean -k dh_install $(objdir_gtk_install)/include usr + dh_installman debian/wx-xy-config.1 install-i18n: DH_OPTIONS=-p$(package_i18n) diff --git a/debian/wx-xy-config.1 b/debian/wx-xy-config.1 new file mode 100644 index 0000000000..23f1b8db7b --- /dev/null +++ b/debian/wx-xy-config.1 @@ -0,0 +1,14 @@ +.TH wx\-xy\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows" +.SH NAME +wx-XY-config \- generate compile time requirements for specific wxWindows versions +.SH DESCRIPTION +You should not call the versioned \fIwx\-XY\-config\fP scripts directly, +instead call \fIwx\-config\fP with the options you require. +These files are deprecated and have (already) been removed from +later releases. +.SH SEE ALSO +.BR wx\-config (1), +.SH COPYRIGHT +This manpage was created by Ron Lee for the Debian +distribution. It may be used freely by anyone who cares to find it +useful. diff --git a/include/wx/version.h b/include/wx/version.h index 68950319c6..db82d7f2db 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -15,13 +15,13 @@ // Bump-up with each new version #define wxMAJOR_VERSION 2 #define wxMINOR_VERSION 4 -#define wxRELEASE_NUMBER 4 -#define wxVERSION_STRING _T("wxWindows 2.4.4") +#define wxRELEASE_NUMBER 5 +#define wxVERSION_STRING _T("wxWindows 2.4.5") // These are used by src/msw/version.rc and should always be ASCII, not Unicode // and must be updated manually as well each time the version above changes -#define wxVERSION_NUM_DOT_STRING "2.4.4" -#define wxVERSION_NUM_STRING "244" +#define wxVERSION_NUM_DOT_STRING "2.4.5" +#define wxVERSION_NUM_STRING "245" // nothing should be updated below this line when updating the version diff --git a/wxPython/setup.py b/wxPython/setup.py index e0f6d4c627..1d1dad1411 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -15,8 +15,8 @@ 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 = 1 # wxPython release num for x.y.z release of wxWindows +VER_RELEASE = 5 +VER_SUBREL = 0 # 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" diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py index b2b5bd83af..f8ef13b2d4 100644 --- a/wxPython/src/__version__.py +++ b/wxPython/src/__version__.py @@ -1,10 +1,10 @@ # This file was generated by setup.py... -wxVERSION_STRING = '2.4.4.1' +wxVERSION_STRING = '2.4.5.0' wxMAJOR_VERSION = 2 wxMINOR_VERSION = 4 -wxRELEASE_VERSION = 4 -wxSUBREL_VERSION = 1 +wxRELEASE_VERSION = 5 +wxSUBREL_VERSION = 0 wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION, wxSUBREL_VERSION, '')