From 7e2d662bd75d25496b7a201cdd41230d0c2010d1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 17 May 2009 03:12:44 +0000 Subject: [PATCH] build tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@60665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- debian/changelog | 12 ++++++++++++ debian/rules | 10 +++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 022400f578..68d223a69a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +wxwidgets2.8 (2.8.10.1-0) unstable; urgency=low + + * New upstream stable release. See docs/changes.txt for details. + + -- Robin Dunn Tue, 12 May 2009 12:58:57 -0700 + +wxwidgets2.8 (2.8.9.2-1) unstable; urgency=low + + * Fixed a Python 2.4 compatibility bug in the FloatCanvas package. + + -- Robin Dunn Thu, 19 Feb 2009 16:46:54 -0800 + wxwidgets2.8 (2.8.9.2-0) unstable; urgency=low * Many minor bugfixes and enhancements. diff --git a/debian/rules b/debian/rules index bf1a972105..ee0cf367c8 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,12 @@ ifeq ($(strip $(PYVERS)),) PY_BUILD_DEPS = python$(PYVERS), python$(PYVERS)-dbg, python$(PYVERS)-dev else DEB_PYTHON_SYSTEM=pycentral - PY_BUILD_DEPS = python-all, python-all-dev, python-dbg, python-central + PY_BUILD_DEPS = python-all, python-all-dev, python-central + + # Etch doesn't have python-all-dbg, so check if it should be added to the dependencies + ifeq (True, $(shell if dpkg-query -s python-all-dbg > /dev/null 2>&1; then echo True; fi)) + PY_BUILD_DEPS := $(PY_BUILD_DEPS), python-all-dbg + endif endif @@ -797,8 +802,7 @@ install-headers: install-gtk-shared-stamp mkdir -p debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython/i_files cp -p wxPython/include/wx/wxPython/*.h \ debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython/ - cp -p wxPython/include/wx/wxPython/src/*.i wxPython/include/wx/wxPython/src/_*.py \ - wxPython/include/wx/wxPython/src/*.swg \ + cp -p wxPython/src/*.i wxPython/src/_*.py wxPython/src/*.swg \ debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython/i_files install-i18n: DH_OPTIONS=-p$(package_i18n)