X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7ff293b4280dfad1e4133b51d9e93d67c722752..ab82df46796e18dafbe4a1e45dd2a34de2b5b674:/debian/rules diff --git a/debian/rules b/debian/rules index c51f6776c1..a3b59b9963 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,7 @@ soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR)) pydir := usr/lib/$(python_ver)/site-packages -wxpydir := $(pydir)/wx-$(sorelease)-gtk2-unicode +wxpydir := $(pydir)/wx-$(release)-gtk2-unicode cross_host = i586-mingw32msvc cross_build = $(shell ./config.guess) @@ -55,7 +55,7 @@ config_cache_cross = ../config_deb_cross.cache package_gtk_lib = libwxgtk$(sorelease) package_gtk_dev = libwxgtk$(release)-dev package_gtk_dbg = libwxgtk$(release)-dbg -package_gtk_py_lib = libwxgtk$(sorelease)-python +package_gtk_py_lib = python-wxgtk$(sorelease) package_gtk_py = wxpython$(sorelease) package_common = wx$(release)-common package_headers = wx$(release)-headers @@ -63,14 +63,13 @@ package_i18n = wx$(release)-i18n package_doc = wx$(release)-doc package_examples = wx$(release)-examples -package_gtk_dbg_py = libwxgtk$(sorelease)-dbg-python +package_gtk_dbg_py = python-wxgtk$(sorelease)-dbg package_msw_dev = libwxmsw$(release)-dev package_msw_dbg = libwxmsw$(release)-dbg package_headers_msw = wx$(release)-headers-msw # Build directories: objdir_gtk_shared = objs_gtk_sh -objdir_gtk_static = objs_gtk_st objdir_gtk_debug = objs_gtk_d objdir_gtk_install = objs_gtk_install objdir_doc_cruft = objs_doc_con @@ -83,8 +82,7 @@ objdir_msw_static = objs_msw_st objdir_msw_dbg = objs_msw_d objdir_msw_install = objs_msw_install -objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \ - $(objdir_gtk_install) \ +objdirs = $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install) \ $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg) \ $(objdir_msw_install) @@ -96,7 +94,6 @@ objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \ # Build stamps: build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \ - build-gtk-static-stamp build-gtk-static-contrib-stamp \ build-gtk-debug-stamp build-gtk-debug-contrib-stamp \ build-i18n-stamp build-gtk-py-stamp @@ -153,24 +150,22 @@ control-files-stamp: debian/control 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/=SOV/$(sorelease)/g' \ - < debian/libwxgtk-python.$$f \ + sed -e 's/=PY/$(python_ver)/g;s|=WXPYDIR|$(wxpydir)|g;' \ + -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g' \ + < debian/python-wxgtk.$$f \ > debian/$(package_gtk_py_lib).$$f; \ done; @echo "generating control file $(package_gtk_py).menu"; \ - sed -e 's/=SOV/$(sorelease)/g' < debian/wxpython.menu \ + sed -e 's/=SOV/$(sorelease)/g' < debian/python-wxtools.menu \ > debian/$(package_gtk_py).menu; @for f in docs postinst; do \ echo "generating control file $(package_gtk_dbg_py).$$f"; \ sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \ - < debian/libwxgtk-python.$$f \ + < debian/python-wxgtk.$$f \ > debian/$(package_gtk_dbg_py).$$f; \ done; @echo "generating control file $(package_gtk_dbg_py).prerm"; \ - sed 's/=SOV/$(sorelease)/g' < debian/libwxgtk-dbg-python.prerm \ + sed 's/=SOV/$(sorelease)/g' < debian/python-wxgtk-dbg.prerm \ > debian/$(package_gtk_dbg_py).prerm @for f in docs doc-base; do \ echo "generating control file $(package_doc).$$f"; \ @@ -219,15 +214,13 @@ configure-gtk-shared-stamp: --cache-file=$(config_cache) \ --with-flavour=$(DEBIAN_WXFLAVOUR) \ --with-gtk \ - --enable-unicode \ --with-opengl \ + --with-gnomeprint \ --with-zlib=sys \ --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ - --with-gnomeprint \ - --enable-dynamic-loader \ - --enable-std_iostreams + --enable-unicode touch $@ build-gtk-shared-stamp: configure-gtk-shared-stamp @@ -235,30 +228,6 @@ build-gtk-shared-stamp: configure-gtk-shared-stamp cd $(objdir_gtk_shared) && $(FAST_MAKE) touch $@ -configure-gtk-static-stamp: - dh_testdir - mkdir -p $(objdir_gtk_static) - cd $(objdir_gtk_static) \ - && ../configure --prefix=/usr \ - --cache-file=$(config_cache) \ - --with-flavour=$(DEBIAN_WXFLAVOUR) \ - --with-gtk \ - --enable-unicode \ - --with-opengl \ - --disable-shared \ - --with-zlib=sys \ - --with-libjpeg=sys \ - --with-libpng=sys \ - --with-libtiff=sys \ - --with-gnomeprint \ - --enable-dynamic-loader \ - --enable-std_iostreams - touch $@ - -build-gtk-static-stamp: configure-gtk-static-stamp - dh_testdir - cd $(objdir_gtk_static) && $(FAST_MAKE) - touch $@ configure-gtk-debug-stamp: dh_testdir @@ -268,16 +237,14 @@ configure-gtk-debug-stamp: --cache-file=$(config_cache) \ --with-flavour=$(DEBIAN_WXFLAVOUR) \ --with-gtk \ - --enable-unicode \ --with-opengl \ - --enable-debug \ + --with-gnomeprint \ --with-zlib=sys \ --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ - --with-gnomeprint \ - --enable-dynamic-loader \ - --enable-std_iostreams + --enable-debug \ + --enable-unicode touch $@ build-gtk-debug-stamp: configure-gtk-debug-stamp @@ -290,13 +257,8 @@ build-gtk-shared-contrib-stamp: build-gtk-shared-stamp dh_testdir cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE) cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE) - #cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE) touch $@ -build-gtk-static-contrib-stamp: build-gtk-static-stamp - dh_testdir - cd $(objdir_gtk_static)/contrib/src && $(FAST_MAKE) - touch $@ build-gtk-debug-contrib-stamp: build-gtk-debug-stamp dh_testdir @@ -496,7 +458,7 @@ install-gtk-lib: install-gtk-shared-stamp dh_install $(objdir_gtk_install)/lib/libwx_*.so.* usr/lib install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev) -install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-gtk-shared-stamp +install-gtk-dev: install-gtk-shared-stamp dh_testdir dh_testroot dh_clean -k @@ -504,9 +466,6 @@ install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-g dh_install $(objdir_gtk_install)/lib/libwx_*.so usr/lib dh_install $(objdir_gtk_install)/lib/wx/include usr/lib/wx dh_install $(objdir_gtk_install)/lib/wx/config/gtk* usr/lib/wx/config - dh_install $(objdir_gtk_static)/lib/libwx*.a usr/lib - dh_install $(objdir_gtk_static)/lib/wx/include usr/lib/wx - dh_install $(objdir_gtk_static)/lib/wx/config/gtk* usr/lib/wx/config install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg) install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp @@ -576,11 +535,8 @@ install-common: install-gtk-shared-stamp dh_installman debian/wx-config.1 dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin -# dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin - dh_installman debian/wxrc-tools.1 dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1 -# dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1 install-headers: DH_OPTIONS=-p$(package_headers)