remove miniframe stuff from GtkOnSize(), it's handled by wxFrame

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 937ebc47ac708eb66d8c050d645d6ea09f3225f5..8c89fd845b363b871dd1534893560f2449805f96 100755 (executable)
--- 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@')
 
 # 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
 
 # This is broken completely now by bakefiles changes.  Until we add
 # some hocus pocus to the main tree, to export these values from it


@@ -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
 # 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
 else
     compatible_release := $(release)
 endif


@@ -105,11 +112,12 @@ BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
 
 GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
     --with-gtk \
 
 GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
     --with-gtk \

-    --with-gnomeprint \

     --enable-mediactrl \
     --enable-sound \
     --with-sdl \
     --enable-display \
     --enable-mediactrl \
     --enable-sound \
     --with-sdl \
     --enable-display \

+    --enable-geometry \
+    --enable-graphics_ctx \

     --with-libjpeg=sys \
     --with-libpng=sys \
     --with-libtiff=sys \
     --with-libjpeg=sys \
     --with-libpng=sys \
     --with-libtiff=sys \


@@ -156,6 +164,7 @@ package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg
 package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)
 package_gtk_py_ver       = python-wxversion
 package_gtk_py_tools     = python-wxtools
 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
 
 package_headers         := wx$(release)-headers
 package_i18n            := wx$(release)-i18n


@@ -165,7 +174,7 @@ 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.
 
 # 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)$(unicode_suffix)-dbg
 
 
 package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg


@@ -460,20 +469,29 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
 
 build-doc-stamp: build-gtk-shared-stamp
        dh_testdir
 
 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}
+       # 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); \
+               cd -; \
+               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;                                               \
+               cd -; \
+               cp docs/latex/wx/*.gif $(objdir_doc); \
+               rm -rf $(objdir_doc_cruft); \
+               rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}; \
+       else \
+               mkdir $(objdir_doc); \
+               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
        touch $@
 
 build-examples-stamp: build-gtk-shared-stamp


@@ -730,6 +748,8 @@ else
        rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py
 endif
 
        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
 install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
 install-gtk-py-tools: install-gtk-py-ver
        dh_testdir


@@ -768,7 +788,20 @@ endif
 
        rm -r debian/$(package_gtk_py_lib)/usr/bin
 
 
        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)
 
 
 install-common: DH_OPTIONS=-p$(package_common)


@@ -943,7 +976,7 @@ binary-common:
        fi
 
        dh_installdeb
        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
        dh_gencontrol
        dh_md5sums
        dh_builddeb