added wxBase & examples & various tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/debian/README.Debian b/debian/README.Debian
index a2597e5822c574b1dde4108bf451f94934229800..bc3cbd2c720fc095494fce68d10e403ef36e969d 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -3,8 +3,11 @@ wxwindows for Debian
 
 The following packages are built from the wxWindows CVS source.
 
 
 The following packages are built from the wxWindows CVS source.
 

-libwxgtk2.1    wxGTK shared library
-libwxgtk-dev   Headers and static lib for building wxGTK apps
+libwxgtk               wxGTK shared library
+libwxgtk-dev           Headers and static lib for building wxGTK apps
+libwxgtk-python                Python binding to wxGTK
+wxwin-doc              HTML version of the wxWindows manual
+wxwin-examples         wxWindows and wxPython demos and samples (source)

 
 
  -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
 
 
  -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

diff --git a/debian/control.in b/debian/control.in
index 13c3af88e170a3ab0dce58f7ffc53cc172f2ed74..9dbe952fb1c13dfa7088c444b8f74b769c9bf4ba 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,6 +5,44 @@ Build-Depends: debhelper, libgtk1.2-dev, python-dev (>=1.5), flex, bison
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.1.1
 
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.1.1
 

+Package: libwxbase=V
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: wxBase library (runtime) - non-GUI support classes of wxWindows toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
+ .
+ This package is only useful for non-gui apps.  It offers a subset of the
+ classes in libwx_gtk=V for use in console apps and daemons.  It is currently
+ under development and may not be as stable as the gui version.
+
+Package: libwxbase=V-dev
+Architecture: any
+Section: devel
+Depends: libwxbase=V (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libc6-dev
+Suggests: wxwin=V-doc, gettext
+Conflicts: libwxbase-dev
+Replaces: libwxbase-dev
+Provides: libwxbase-dev
+Description: wxBase library (development) - non-GUI support classes of wxWindows toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
+ .
+ This package is only useful for non-gui apps.  It offers a subset of the
+ classes in libwx_gtk=V for use in console apps and daemons.  It is currently
+ under development and may not be as stable as the gui version.
+

 Package: libwxgtk=V
 Architecture: any
 Section: libs
 Package: libwxgtk=V
 Architecture: any
 Section: libs


@@ -56,3 +94,14 @@ Description: wxWindows Cross-platform C++ GUI toolkit (documentation)
  .
  This package provides a HTML version of the wxWindows reference manual.
 
  .
  This package provides a HTML version of the wxWindows reference manual.
 

+Package: wxwin=V-examples
+Architecture: all
+Section: devel
+Suggests: libwxgtk=V-dev (= ${Source-Version}), wxwin=V-doc
+Description: wxWindows Cross-platform C++ GUI toolkit (examples)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version 2.1
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package contains examples of using the wxWindows toolkit.
+

diff --git a/debian/libwxbase-dev.dirs b/debian/libwxbase-dev.dirs
new file mode 100644 (file)
index 0000000..22e51e2
--- /dev/null
+++ b/debian/libwxbase-dev.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/wx/include/wx
+usr/share/man/man1

diff --git a/debian/libwxbase-dev.docs b/debian/libwxbase-dev.docs
new file mode 100644 (file)
index 0000000..3596b0d
--- /dev/null
+++ b/debian/libwxbase-dev.docs
@@ -0,0 +1,3 @@
+docs/preamble.txt
+docs/licence.txt
+docs/licendoc.txt

diff --git a/debian/libwxbase-dev.files b/debian/libwxbase-dev.files
new file mode 100644 (file)
index 0000000..a596cb2
--- /dev/null
+++ b/debian/libwxbase-dev.files
@@ -0,0 +1,4 @@
+usr/bin/wxbase-config
+usr/lib/wx/include/wx/setup.h
+usr/lib/libwxbase*.so
+usr/lib/libwxbase*.a

diff --git a/debian/libwxbase-dev.links b/debian/libwxbase-dev.links
new file mode 100644 (file)
index 0000000..e0598ad
--- /dev/null
+++ b/debian/libwxbase-dev.links
@@ -0,0 +1 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-config.1.gz

diff --git a/debian/libwxbase.dirs b/debian/libwxbase.dirs
new file mode 100644 (file)
index 0000000..6845771
--- /dev/null
+++ b/debian/libwxbase.dirs
@@ -0,0 +1 @@
+usr/lib

diff --git a/debian/libwxbase.docs b/debian/libwxbase.docs
new file mode 100644 (file)
index 0000000..561d5c3
--- /dev/null
+++ b/debian/libwxbase.docs
@@ -0,0 +1 @@
+docs/licence.txt

diff --git a/debian/libwxbase.files b/debian/libwxbase.files
new file mode 100644 (file)
index 0000000..35686b0
--- /dev/null
+++ b/debian/libwxbase.files
@@ -0,0 +1 @@
+usr/lib/libwxbase*.so.*

diff --git a/debian/libwxbase.postinst b/debian/libwxbase.postinst
new file mode 100644 (file)
index 0000000..881b6e2
--- /dev/null
+++ b/debian/libwxbase.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+       ldconfig
+fi
+
+#DEBHELPER#
+

diff --git a/debian/libwxgtk-dev.files b/debian/libwxgtk-dev.files
index 6f1b0248c4f912d9e3746a68fb40b3db80a423d6..17f111dbd5591e0a37957dd67e898fd381ec35fa 100644 (file)
--- a/debian/libwxgtk-dev.files
+++ b/debian/libwxgtk-dev.files
@@ -1,5 +1,5 @@
-usr/bin/
+usr/bin/wx-config

 usr/include/wx/
 usr/include/wx/

-usr/lib/wx
+usr/lib/wx/include/wx/gtk/setup.h

 usr/lib/libwx_gtk*.so
 usr/lib/libwx_gtk*.a
 usr/lib/libwx_gtk*.so
 usr/lib/libwx_gtk*.a

diff --git a/debian/libwxgtk-python.postinst b/debian/libwxgtk-python.postinst
index 5972978114cf2741678b09a01afaa27e9a4a4f2d..a1bebf841b47d54c0da210be7e481eeaac61900d 100644 (file)
--- a/debian/libwxgtk-python.postinst
+++ b/debian/libwxgtk-python.postinst
@@ -7,6 +7,7 @@ WXPYTHONDIR="/usr/lib/python1.5/site-packages/wxPython"
 if [ "$1" = "configure" ]; then
        python /usr/lib/python1.5/compileall.py -q ${WXPYTHONDIR}
        python -O /usr/lib/python1.5/compileall.py -q ${WXPYTHONDIR}
 if [ "$1" = "configure" ]; then
        python /usr/lib/python1.5/compileall.py -q ${WXPYTHONDIR}
        python -O /usr/lib/python1.5/compileall.py -q ${WXPYTHONDIR}

+       ldconfig

 fi
 
 #DEBHELPER#
 fi
 
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
index 9544df479563ad0dc66ea5f20a447c5468f84f92..15cdd4fd691c4de9637304d8a30e3338965524ac 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,20 +13,28 @@ export DH_COMPAT=2
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
 
 # Packages to build:
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
 
 # Packages to build:

+package_wxbase_lib=libwxbase$(release)
+package_wxbase_dev=libwxbase$(release)-dev

 package_gtk_lib=libwxgtk$(release)
 package_gtk_dev=libwxgtk$(release)-dev
 package_gtk_py=libwxgtk$(release)-python
 package_doc=wxwin$(release)-doc
 package_gtk_lib=libwxgtk$(release)
 package_gtk_dev=libwxgtk$(release)-dev
 package_gtk_py=libwxgtk$(release)-python
 package_doc=wxwin$(release)-doc

+package_examples=wxwin$(release)-examples

 
 # Build directories:
 
 # Build directories:

+objdir_wxbase_shared=objs_wxbase_sh
+objdir_wxbase_static=objs_wxbase_st

 objdir_gtk_shared=objs_gtk_sh
 objdir_gtk_static=objs_gtk_st
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_gtk_shared=objs_gtk_sh
 objdir_gtk_static=objs_gtk_st
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html

-objdirs=$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_doc)
+objdir_examples=docs/examples
+objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_gtk_shared) \
+       $(objdir_gtk_static) $(objdir_doc) $(objdir_examples)

 
 

-build_stamps=build-gtk-shared-stamp build-gtk-static-stamp \
-             build-gtk-python-stamp build-doc-stamp
+build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
+             build-gtk-shared-stamp build-gtk-static-stamp \
+             build-gtk-python-stamp build-examples-stamp build-doc-stamp

 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
                --prefix=$(shell pwd) \
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
                --prefix=$(shell pwd) \


@@ -43,6 +51,22 @@ debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
 
 build: debian/control debian/wxwin-doc.doc-base $(build_stamps)
 
 
 build: debian/control debian/wxwin-doc.doc-base $(build_stamps)
 

+build-wxbase-shared-stamp:
+       dh_testdir
+       mkdir $(objdir_wxbase_shared)
+       cd $(objdir_wxbase_shared) \
+               && ../configure --prefix=/usr --disable-gui --enable-burnt_name \
+               && $(MAKE)
+       touch $@
+
+build-wxbase-static-stamp:
+       dh_testdir
+       mkdir $(objdir_wxbase_static)
+       cd $(objdir_wxbase_static) \
+               && ../configure --prefix=/usr --disable-gui --disable-shared \
+               && $(MAKE)
+       touch $@
+

 build-gtk-shared-stamp:
        dh_testdir
        mkdir $(objdir_gtk_shared)
 build-gtk-shared-stamp:
        dh_testdir
        mkdir $(objdir_gtk_shared)


@@ -79,13 +103,32 @@ build-doc-stamp: build-gtk-shared-stamp
        cd $(objdir_doc_cruft) \
                && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
                   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
        cd $(objdir_doc_cruft) \
                && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
                   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \

-                  ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin -twice -html
+                  ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html

        cp docs/latex/wx/*.gif $(objdir_doc)
        rm -rf $(objdir_doc_cruft)
        rm -f $(objdir_doc)/wxwin.con $(objdir_doc)/wxwin.hh* \
              $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
        touch $@
 
        cp docs/latex/wx/*.gif $(objdir_doc)
        rm -rf $(objdir_doc_cruft)
        rm -f $(objdir_doc)/wxwin.con $(objdir_doc)/wxwin.hh* \
              $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
        touch $@
 

+build-examples-stamp:
+       dh_testdir
+       mkdir $(objdir_examples)
+       cp -a samples $(objdir_examples)
+       cp -a demos $(objdir_examples)
+       cp -a utils/wxPython/demo $(objdir_examples)/wxPython
+       @for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
+               (cd $$d \
+                       && mv Makefile.in Makefile \
+                       && rm -f configure* \
+                       && find -name 'Makefile.in' -exec rm -f '{}' ';' \
+                       && for f in $$(find -type d); do \
+                               if [ -f $$f/makefile.unx ]; then \
+                                       mv $$f/makefile.unx $$f/Makefile; \
+                               fi; \
+                       done) \
+       done;
+       touch $@
+

 clean: debian/control
        dh_testdir
        dh_testroot
 clean: debian/control
        dh_testdir
        dh_testroot


@@ -94,14 +137,25 @@ clean: debian/control
        -cd utils/wxPython/modules/html && $(MAKE) clean
        -cd utils/wxPython/modules/utils && $(MAKE) clean
        dh_clean
        -cd utils/wxPython/modules/html && $(MAKE) clean
        -cd utils/wxPython/modules/utils && $(MAKE) clean
        dh_clean

+       rm -f debian/$(package_wxbase_lib).*
+       rm -f debian/$(package_wxbase_dev).*

        rm -f debian/$(package_gtk_lib).*
        rm -f debian/$(package_gtk_dev).*
        rm -f debian/$(package_gtk_py).*
        rm -f debian/$(package_doc).*
        rm -f debian/$(package_gtk_lib).*
        rm -f debian/$(package_gtk_dev).*
        rm -f debian/$(package_gtk_py).*
        rm -f debian/$(package_doc).*

+       rm -f debian/$(package_examples).*

 
 install: build
        dh_testdir
        dh_testroot
 
 install: build
        dh_testdir
        dh_testroot

+       @for f in dirs docs files postinst; do \
+               echo "generating control file $(package_wxbase_lib).$$f"; \
+               cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
+       done;
+       @for f in dirs docs files links; do \
+               echo "generating control file $(package_wxbase_dev).$$f"; \
+               cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
+       done;

        @for f in dirs docs files postinst; do \
                echo "generating control file $(package_gtk_lib).$$f"; \
                cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
        @for f in dirs docs files postinst; do \
                echo "generating control file $(package_gtk_lib).$$f"; \
                cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \


@@ -118,11 +172,18 @@ install: build
                echo "generating control file $(package_doc).$$f"; \
                cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
        done;
                echo "generating control file $(package_doc).$$f"; \
                cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
        done;

+       @for f in docs examples; do \
+               echo "generating control file $(package_examples).$$f"; \
+               cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
+       done;

        dh_clean -k
        dh_installdirs
        cd $(objdir_gtk_shared) \
                && $(MAKE) install prefix=`pwd`/../debian/tmp/usr
        cp $(objdir_gtk_static)/lib/*.a debian/tmp/usr/lib
        dh_clean -k
        dh_installdirs
        cd $(objdir_gtk_shared) \
                && $(MAKE) install prefix=`pwd`/../debian/tmp/usr
        cp $(objdir_gtk_static)/lib/*.a debian/tmp/usr/lib

+       cp -a $(objdir_wxbase_shared)/lib/* debian/tmp/usr/lib
+       cp $(objdir_wxbase_shared)/wx-config debian/tmp/usr/bin/wxbase-config
+       cp $(objdir_wxbase_static)/lib/*.a debian/tmp/usr/lib

        cd utils/wxPython/src \
                && ../distrib/build.py -i \
                        TARGETDIR=../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
        cd utils/wxPython/src \
                && ../distrib/build.py -i \
                        TARGETDIR=../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \


@@ -136,6 +197,7 @@ install: build
                && ../../distrib/build.py -i \
                        TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
                        WXDIR=../../../..
                && ../../distrib/build.py -i \
                        TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
                        WXDIR=../../../..

+       rm -rf debian/tmp/usr/lib/python1.5/site-packages/wxPython/demo

        find debian/tmp/usr/lib/python1.5/site-packages/wxPython \
                -name '*.py?' -exec rm '{}' ';'
        dh_movefiles
        find debian/tmp/usr/lib/python1.5/site-packages/wxPython \
                -name '*.py?' -exec rm '{}' ';'
        dh_movefiles


@@ -157,7 +219,9 @@ binary-arch: build install
                libpngpf.3 \
                zlib.3 \
                png.5
                libpngpf.3 \
                zlib.3 \
                png.5

-       dh_installchangelogs 
+       dh_installchangelogs
+       dh_installexamples
+       dh_link

        dh_strip
        dh_compress
        dh_fixperms
        dh_strip
        dh_compress
        dh_fixperms

diff --git a/debian/wxwin-examples.docs b/debian/wxwin-examples.docs
new file mode 100644 (file)
index 0000000..561d5c3
--- /dev/null
+++ b/debian/wxwin-examples.docs
@@ -0,0 +1 @@
+docs/licence.txt

diff --git a/debian/wxwin-examples.examples b/debian/wxwin-examples.examples
new file mode 100644 (file)
index 0000000..76daa91
--- /dev/null
+++ b/debian/wxwin-examples.examples
@@ -0,0 +1,3 @@
+docs/examples/demos
+docs/examples/samples
+docs/examples/wxPython