X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b945df0092ee4cf28c3ecb2fe1529b126aa752f8..9654efd3327fcb6b6e3d8d803ea80f08904f1197:/debian/rules?ds=sidebyside diff --git a/debian/rules b/debian/rules index ec74bb4153..6e30aa4554 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,7 @@ endif # to correctly set the release below. DEBIAN_WXFLAVOUR := $(shell pwd | sed -e 's@.*/wxwidgets[0-9.]\+-\?\(.*\)-[0-9.]\+-\?.*@\1@') -release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p') +release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p' | sed 's/-ansi//') # This is broken completely now by bakefiles changes. Until we add # some hocus pocus to the main tree, to export these values from it @@ -67,12 +67,23 @@ release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p') soversion := 0 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR)) +# In some places we use the full version number, including the micro version, +# for the development releases (which can be incompatible for the same major +# and minor version) but just the major.minor for the stable releases (which +# are supposed to be compatible), this variable contains the appropriate value +ifeq ($(shell echo `echo $(release) | sed 's/.\+\.\(.\+\)/\1/'`%2 | bc),1) + # development release + compatible_release := $(release).$(soversion) +else + compatible_release := $(release) +endif + # Base value for alternative priorities. alt_prio := $(subst .,,$(release)) pytoolkit := gtk2 pydir := usr/lib/$(python_ver)/site-packages -wxpydir := $(pydir)/wx-$(release)-$(pytoolkit) +wxpydir := $(pydir)/wx-$(compatible_release)-$(pytoolkit) cross_host := i586-mingw32msvc cross_build := $(shell ./config.guess) @@ -86,7 +97,6 @@ COMMON_CONFIGURE_OPTIONS = \ --prefix=/usr \ --cache-file=$(config_cache) \ --with-flavour=$(DEBIAN_WXFLAVOUR) \ - --enable-debug \ --with-zlib=sys \ --disable-reserved_virtual \ @@ -96,6 +106,10 @@ BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \ GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \ --with-gtk \ --with-gnomeprint \ + --enable-mediactrl \ + --enable-sound \ + --with-sdl \ + --enable-display \ --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ @@ -110,7 +124,15 @@ ifeq ($(WX_UNICODE),1) COMMON_CONFIGURE_OPTIONS += --enable-unicode PY_WX_CONFIG_OPTIONS += --unicode PY_UNICODE="UNICODE=1" - wxpydir += "-unicode" + wxpydir := $(pydir)/wx-$(compatible_release)-$(pytoolkit)-unicode + + # for compatibility with the existing 2.6 packages, we don't use "u" in + # the Unicode (default) package names + unicode_suffix := +else + # but we do need to use something for non-Unicode packages to distinguish + # them + unicode_suffix := -ansi endif ifeq ($(WX_OPENGL),1) @@ -120,18 +142,18 @@ else endif # Packages to build: -package_wxbase_lib := libwxbase$(sorelease) -package_wxbase_dev := libwxbase$(release)-dev -package_wxbase_dbg := libwxbase$(release)-dbg +package_wxbase_lib := libwxbase$(sorelease)$(unicode_suffix) +package_wxbase_dev := libwxbase$(release)$(unicode_suffix)-dev +package_wxbase_dbg := libwxbase$(release)$(unicode_suffix)-dbg -package_gtk_lib := libwxgtk$(sorelease) -package_gtk_dev := libwxgtk$(release)-dev -package_gtk_dbg := libwxgtk$(release)-dbg +package_gtk_lib := libwxgtk$(sorelease)$(unicode_suffix) +package_gtk_dev := libwxgtk$(release)$(unicode_suffix)-dev +package_gtk_dbg := libwxgtk$(release)$(unicode_suffix)-dbg -package_gtk_py_lib := python-wxgtk$(release) +package_gtk_py_lib := python-wxgtk$(release)$(unicode_suffix) package_gtk_py_ver = python-wxversion package_gtk_py_tools = python-wxtools @@ -146,12 +168,12 @@ package_common = wx-common common_packages := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) -package_gtk_dbg_py := python-wxgtk$(release)-dbg +package_gtk_dbg_py := python-wxgtk$(release)$(unicode_suffix)-dbg -package_msw_dev := libwxmsw$(release)-dev -package_msw_dbg := libwxmsw$(release)-dbg +package_msw_dev := libwxmsw$(release)$(unicode_suffix)-dev +package_msw_dbg := libwxmsw$(release)$(unicode_suffix)-dbg package_headers_msw := wx$(release)-headers-msw # The packages listed here will not be built by default. @@ -249,7 +271,7 @@ 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;s/=U/$(unicode_suffix)/g'\ < debian/control.in > debian/control control-files-stamp: debian/control @@ -755,10 +777,13 @@ install-common: install-gtk-shared-stamp dh_testroot dh_clean -k - dh_install $(objdir_gtk_install)/share/aclocal usr/share + dh_install $(objdir_gtk_install)/share/bakefile/presets usr/share/bakefile + dh_install $(objdir_gtk_install)/share/bakefile/presets/wx*.bkl usr/share/bakefile/presets + + dh_install $(objdir_gtk_install)/share/aclocal usr/share dh_installman debian/wx-config.1 - dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin + dh_install $(objdir_gtk_shared)/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 @@ -918,7 +943,7 @@ binary-common: fi dh_installdeb - dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib + dh_shlibdeps -ldebian/$(package_wxbase_lib)/usr/lib:debian/$(package_wxbase_dbg)/usr/lib:debian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib dh_gencontrol dh_md5sums dh_builddeb @@ -966,17 +991,21 @@ binary-dbg-py: control-files-stamp install-gtk-dbg-py # Debian policy. Do not distribute packages built with these rules, they # are currently useful for rapid in-house testing by developers only. +DH_OPTIONS_GTK := -p$(package_wxbase_lib) -p$(package_gtk_lib) -p$(package_headers) + # libwxgtk shared lib package -binary-gtk: control-files-stamp install-gtk-lib install-headers - $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_lib) -p$(package_headers)" binary-common +binary-gtk: control-files-stamp install-gtk-lib install-wxbase-lib install-headers + $(MAKE) -f debian/rules DH_OPTIONS="$(DH_OPTIONS_GTK)" binary-common -binary-gtk-dev: control-files-stamp install-gtk-dev install-headers +binary-gtk-dev: control-files-stamp install-gtk-dev install-wxbase-dev install-headers $(MAKE) -f debian/rules \ - DH_OPTIONS="-p$(package_gtk_lib) -p$(package_gtk_dev) -p$(package_headers)" \ - binary-common + DH_OPTIONS="-p$(package_wxbase_dev) -p$(package_gtk_dev) $(DH_OPTIONS_GTK)" \ + binary-common -binary-gtk-dbg: control-files-stamp install-gtk-dbg install-headers - $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_headers)" binary-common +binary-gtk-dbg: control-files-stamp install-gtk-dbg install-wxbase-dbg install-headers + $(MAKE) -f debian/rules \ + DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_gtk_dbg) -p$(package_headers)" \ + binary-common # docs package