X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ee8fbacaefff66376ccfd44163f0fe6547cca73..11a9b49de9f487938312e63645c371d01fff25d0:/debian/rules diff --git a/debian/rules b/debian/rules index c7136eb61a..79093ca28a 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,14 @@ 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' | sed 's/-ansi//') + +wx_major_version_number := $(shell sed -n 's/^wx_major_version_number=//p' configure.in) +wx_minor_version_number := $(shell sed -n 's/^wx_minor_version_number=//p' configure.in) +wx_release_number := $(shell sed -n 's/^wx_release_number=//p' configure.in) +wx_subrelease_number := $(shell sed -n 's/^wx_subrelease_number=//p' configure.in) + +##release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p' | sed 's/-ansi//') +release := $(wx_major_version_number).$(wx_minor_version_number) # This is broken completely now by bakefiles changes. Until we add # some hocus pocus to the main tree, to export these values from it @@ -64,8 +71,8 @@ release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p' | se # specify $soversion below. Re-automate if incompatible changes # result in it actually changing. #soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/') -soversion := 0 -sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR)) +##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 @@ -73,7 +80,7 @@ sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBI # 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) + compatible_release := $(release).$(wx_release_number) else compatible_release := $(release) endif @@ -110,6 +117,8 @@ GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \ --enable-sound \ --with-sdl \ --enable-display \ + --enable-geometry \ + --enable-graphics_ctx \ --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ @@ -142,20 +151,21 @@ else endif # Packages to build: -package_wxbase_lib := libwxbase$(sorelease)$(unicode_suffix) +package_wxbase_lib := libwxbase$(release)$(unicode_suffix) package_wxbase_dev := libwxbase$(release)$(unicode_suffix)-dev package_wxbase_dbg := libwxbase$(release)$(unicode_suffix)-dbg -package_gtk_lib := libwxgtk$(sorelease)$(unicode_suffix) +package_gtk_lib := libwxgtk$(release)$(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 +package_gtk_py_addons = python-wxaddons package_headers := wx$(release)-headers package_i18n := wx$(release)-i18n @@ -165,15 +175,15 @@ package_common = wx-common # The packages listed here are common to all wx versions, and may be provided # by another source package if more than one is in the release simultaneously. -common_packages := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) +common_packages := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) $(package_gtk_py_addons) -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. @@ -271,7 +281,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;s/=U/$(unicode_suffix)/g'\ + sed -e 's/=V/$(release)/g;s/=SOV/$(release)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/g'\ < debian/control.in > debian/control control-files-stamp: debian/control @@ -353,7 +363,7 @@ control-files-stamp: debian/control # > debian/$(package_common).menu; @echo "generating control file lintian-override"; \ sed -e 's/=V/$(release)/g; '\ -' s/=SOV/$(sorelease)/g' \ +' s/=SOV/$(release)/g' \ < debian/lintian-override.in \ > debian/lintian-override; \ touch $@ @@ -460,20 +470,26 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py build-doc-stamp: build-gtk-shared-stamp dh_testdir - cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE) - rm -rf $(objdir_doc) - rm -rf $(objdir_doc_cruft) - mkdir $(objdir_doc) - mkdir $(objdir_doc_cruft) - cd $(objdir_doc_cruft) \ - && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \ - ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \ - ../docs/latex/wx/manual.tex \ - ../$(objdir_doc)/wx$(release)-manual.html \ - -twice -html - cp docs/latex/wx/*.gif $(objdir_doc) - rm -rf $(objdir_doc_cruft) - rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref} + mkdir $(objdir_doc); + # the tarball may already have the generated docs in it + if [ ! -e docs/html/wx/index.html ]; then \ + cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE); \ + rm -rf $(objdir_doc); \ + rm -rf $(objdir_doc_cruft); \ + mkdir $(objdir_doc_cruft); \ + cd $(objdir_doc_cruft); \ + LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \ + ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \ + ../docs/latex/wx/manual.tex \ + ../$(objdir_doc)/wx$(release)-manual.html \ + -twice -html; \ + cp docs/latex/wx/*.gif $(objdir_doc); \ + rm -rf $(objdir_doc_cruft); \ + rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}; \ + else \ + cp docs/html/wx/* $(objdir_doc); \ + mv $(objdir_doc)/index.html $(objdir_doc)/wx-$(release)-manual_contents.html; \ + fi touch $@ build-examples-stamp: build-gtk-shared-stamp @@ -730,6 +746,8 @@ else rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py endif + + install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools) install-gtk-py-tools: install-gtk-py-ver dh_testdir @@ -768,7 +786,20 @@ endif rm -r debian/$(package_gtk_py_lib)/usr/bin -install-gtk-py: install-gtk-py-tools +install-gtk-py-addons: DH_OPTIONS=-p$(package_gtk_py_addons) +install-gtk-py-addons: install-gtk-py-tools + dh_testdir + dh_testroot + dh_clean -k +ifndef DEBIAN_WX_DEFAULT_VERSION + + dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxaddons +else + rm -r debian/$(package_gtk_py_lib)/$(pydir)/wxaddons +endif + + +install-gtk-py: install-gtk-py-addons install-common: DH_OPTIONS=-p$(package_common) @@ -943,7 +974,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