# 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')
+
+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
# 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
+# 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).$(wx_release_number)
+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)
--prefix=/usr \
--cache-file=$(config_cache) \
--with-flavour=$(DEBIAN_WXFLAVOUR) \
- --enable-debug \
--with-zlib=sys \
--disable-reserved_virtual \
--enable-sound \
--with-sdl \
--enable-display \
+ --enable-geometry \
+ --enable-graphics_ctx \
--with-libjpeg=sys \
--with-libpng=sys \
--with-libtiff=sys \
COMMON_CONFIGURE_OPTIONS += --enable-unicode
PY_WX_CONFIG_OPTIONS += --unicode
PY_UNICODE="UNICODE=1"
- wxpydir := $(pydir)/wx-$(release)-$(pytoolkit)-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)
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$(release)$(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$(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
# 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.
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/$(release)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/g'\
< debian/control.in > debian/control
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 $@
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
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
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)
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
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
# 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
projects / wxWidgets.git / blobdiff