From 050207ec17f2bd354fd7db2714e03d6467fa253b Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sat, 27 Jan 2001 08:46:25 +0000 Subject: [PATCH] Began updating 2.2 Debian build scripts for 2.3 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 16 +-- debian/README.Debian | 12 +- debian/changelog | 39 +++++- debian/control.in | 40 ++++--- debian/copyright | 197 +++++++++++++++++++++++++++++-- debian/libwxbase-dbg.dirs | 1 + debian/libwxbase-dbg.docs | 2 - debian/libwxbase-dev.docs | 3 - debian/libwxbase.docs | 1 - debian/libwxgtk-contrib-dev.docs | 2 - debian/libwxgtk-contrib.docs | 2 - debian/libwxgtk-dbg.dirs | 1 + debian/libwxgtk-dbg.docs | 2 - debian/libwxgtk-dev.docs | 3 - debian/libwxgtk-python.dirs | 3 +- debian/libwxgtk-python.docs | 2 +- debian/libwxgtk-python.files | 2 +- debian/libwxgtk-python.postinst | 7 +- debian/libwxgtk-python.prerm | 8 +- debian/libwxgtk.docs | 1 - debian/lintian-override | 5 + debian/rules | 124 +++++++++++-------- debian/wxwin-doc.docs | 2 +- debian/wxwin-examples.docs | 1 - debian/wxwin-headers.docs | 2 - debian/wxwin-i18n.docs | 2 - samples/help/doc/gifs.db | 0 27 files changed, 356 insertions(+), 124 deletions(-) delete mode 100644 debian/libwxbase-dbg.docs delete mode 100644 debian/libwxbase-dev.docs delete mode 100644 debian/libwxbase.docs delete mode 100644 debian/libwxgtk-contrib-dev.docs delete mode 100644 debian/libwxgtk-contrib.docs delete mode 100644 debian/libwxgtk-dbg.docs delete mode 100644 debian/libwxgtk-dev.docs delete mode 100644 debian/libwxgtk.docs create mode 100644 debian/lintian-override delete mode 100644 debian/wxwin-examples.docs delete mode 100644 debian/wxwin-headers.docs delete mode 100644 debian/wxwin-i18n.docs delete mode 100644 samples/help/doc/gifs.db diff --git a/Makefile.in b/Makefile.in index f7b9d611b2..a67ba42231 100644 --- a/Makefile.in +++ b/Makefile.in @@ -575,8 +575,6 @@ ALL_GUI_DIST: ALL_DIST cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt - cp $(DOCDIR)/base/todo.txt $(DISTDIR)/wxBASE.todo - cp $(DOCDIR)/base/install.txt $(DISTDIR)/wxBASE.install mkdir $(DISTDIR)/include mkdir $(DISTDIR)/include/wx mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR) @@ -646,10 +644,8 @@ BASE_DIST: ALL_DIST cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@ cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR) - cp $(DOCDIR)/base/install.txt $(DISTDIR)/INSTALL.txt cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt - cp $(DOCDIR)/base/todo.txt $(DISTDIR)/TODO.txt cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common @@ -1047,11 +1043,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf - mkdir $(DISTDIR)/samples/plot - cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot - cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot - cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot - mkdir $(DISTDIR)/samples/png cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png @@ -1254,7 +1245,6 @@ PYTHON_DIST: mkdir $(DISTDIR)/wxPython/demo mkdir $(DISTDIR)/wxPython/demo/bitmaps mkdir $(DISTDIR)/wxPython/demo/data - mkdir $(DISTDIR)/wxPython/distrib mkdir $(DISTDIR)/wxPython/src mkdir $(DISTDIR)/wxPython/src/gtk mkdir $(DISTDIR)/wxPython/wxPython @@ -1263,7 +1253,9 @@ PYTHON_DIST: mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython - cp $(WXDIR)/wxPython/contrib/buildall.py $(DISTDIR)/wxPython/contrib + cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython + cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython + cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython -cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl @@ -1271,13 +1263,11 @@ PYTHON_DIST: -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data - cp $(WXDIR)/wxPython/distrib/build.py $(DISTDIR)/wxPython/distrib -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor - cp $(WXDIR)/wxPython/wxPython/lib/sizers/*.py $(DISTDIR)/wxPython/wxPython/lib/sizers distclean: $(RM) -r _dist_dir diff --git a/debian/README.Debian b/debian/README.Debian index 5e1fe433f0..a422b59678 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -5,14 +5,24 @@ The following packages are built from the wxWindows CVS source. libwxbase wxBase runtime shared libraries libwxbase-dev extra files and static libs for building wxBase apps +libwxbase-dbg wxBase libraries built with -g and __WXDEBUG__ + libwxgtk wxGTK runtime shared libraries libwxgtk-dev extra files and static libs for building wxGTK apps -libwxgtk-python Python binding to wxGTK +libwxgtk-dbg wxGTK libraries built with -g and __WXDEBUG__ + +libwxgtk-python Python binding to wxGTK (from 2.2.3 onward, this + obsoletes the libwxgtk-python-contrib package as + all python modules are build into a single monolith) + wxwin-contrib wxWin contrib runtime shared libs (built with wxGTK) wxwin-contrib-dev extra files and static contrib libs for building apps + wxwin-headers common header files for building wxWindows apps wxwin-doc HTML version of the wxWindows manual wxwin-examples wxWindows and wxPython demos and samples (source) +wxwin-i18n message catalogs for native language support -- Ron Lee , Sun, 13 Feb 2000 18:40:00 +1030 + diff --git a/debian/changelog b/debian/changelog index 7f8f2f4584..878f5a5cb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,43 @@ +wxwindows2.2 (2.3.0) unstable; urgency=low + + * Updated 2.2 build scripts for 2.3 + * initial test builds, please do not release.. + + -- Ron Lee Sat, 27 Jan 2001 01:51:24 -0800 + +wxwindows2.2 (2.2.4) unstable; urgency=low + + * Fixed parser.y for Alpha builds (#82949) + * changed mesa dependency to the virtual libgl package and + added Conflicts for the old 2.1 packages (which are now + gone from woody anyway) Closes: #80120, #70778, #70779, #70780 + * wxPython now builds as a single unit (including contrib) + so removed the libwxgtk-python-contrib package + + -- Ron Lee Wed, 24 Jan 2001 18:51:24 -0800 + +wxwindows2.2 (2.2.2) unstable; urgency=low + + * added missing dependancy for contrib-dev package. Closes: #70880 + * by popular demand, added a package with the python-contrib libs. + * more tweaks to deb/rules. autodetect the python install location, + and cache the results of configure tests for all packages. + * and of course a whole stack of minor fixes in the main codebase too. + + -- Ron Lee Tue, 5 Sep 2000 18:51:24 +0930 + wxwindows2.2 (2.2.1) unstable; urgency=low - * Repackaged to build from cvs. + * wxWin 2.2.1 stable release. + * First upload to deb.org after repackaging to build directly from + upstream cvs. + * still not quite lintian clean yet: + - wxPython lib can't be built with a proper soname yet. + - the -dbg packages need an override for the shlib symlink. + - and a couple of packages have the lib symlink 'before the + lib', but that's ugly to fix right now, they aren't critical + libs, and allegedly this will be handled by dpkg sometime soon. + * moved full licence text into copyright file. -- Ron Lee Sun, 13 Feb 2000 18:40:00 +1030 diff --git a/debian/control.in b/debian/control.in index 78203579a0..7170ada1e6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,9 +1,9 @@ Source: wxwindows=V Section: libs Priority: optional -Build-Depends: debhelper, flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev +Build-Depends: debhelper (>=1.1.17), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev Maintainer: Ron Lee -Standards-Version: 3.1.1 +Standards-Version: 3.2.1.2 Package: libwxbase=V Architecture: any @@ -15,8 +15,8 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too 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. + wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD, + Solaris, HP-UX, ...), win32, 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 @@ -36,8 +36,8 @@ Description: wxBase library (development) - non-GUI support classes of wxWindows 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. + wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD, + Solaris, HP-UX, ...), win32, and BeOS. . This package provides the files needed to compile apps using the wxBase library. @@ -45,14 +45,17 @@ Package: libwxbase=V-dbg Architecture: any Section: devel Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev +Conflicts: libwxbase-dbg +Replaces: libwxbase-dbg +Provides: libwxbase-dbg Description: wxBase library (debug) - 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. + wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD, + Solaris, HP-UX, ...) win32, and BeOS. . This package provides a debug version of the wxBase library. It is compiled both with -g for normal debugger tracing and with the __WXDEBUG__ flag which @@ -63,7 +66,8 @@ Package: libwxgtk=V Architecture: any Section: libs Depends: ${shlibs:Depends} -Suggests: mesag3 +Suggests: libgl1 +Replaces: wxgtk2.1 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime) wxWindows is a class library for C++ providing GUI (Graphical User Interface) and other facilities on more than one platform. Version =V @@ -77,9 +81,9 @@ Package: libwxgtk=V-dev Architecture: any Section: devel Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev -Suggests: wxwin=V-doc, libstdc++-dev, gettext, mesag-dev +Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev Conflicts: libwxgtk-dev -Replaces: libwxgtk-dev +Replaces: libwxgtk-dev, wxgtk2.1-dev Provides: libwxgtk-dev Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development) wxWindows is a class library for C++ providing GUI (Graphical User @@ -94,6 +98,9 @@ Package: libwxgtk=V-dbg Architecture: any Section: devel Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev +Conflicts: libwxgtk-dbg +Replaces: libwxgtk-dbg +Provides: libwxgtk-dbg Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development) wxWindows is a class library for C++ providing GUI (Graphical User Interface) and other facilities on more than one platform. Version =V @@ -107,14 +114,17 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development) Package: libwxgtk=V-python Architecture: any Section: interpreters -Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5.2), ${shlibs:Depends} +Depends: libwxgtk=V (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), python-base (>=1.5.2), ${shlibs:Depends} Suggests: wxwin=V-doc +Conflicts: libwxgtk=V-python-contrib, python-wxwin +Replaces: libwxgtk=V-python-contrib, python-wxwin Description: wxWindows Cross-platform C++ GUI toolkit (Python binding) wxWindows is a class library for C++ providing GUI (Graphical User Interface) and other facilities on more than one platform. Version =V currently supports subsets of GTK+, Motif, and MS Windows. . - This package provides a Python binding to the wxGTK library. + This package provides a Python binding to the wxGTK library and it's + contrib libs. Package: libwxgtk=V-contrib Architecture: any @@ -131,7 +141,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs) Package: libwxgtk=V-contrib-dev Architecture: any Section: devel -Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libc6-dev +Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev Conflicts: libwxgtk-contrib-dev Replaces: libwxgtk-contrib-dev Provides: libwxgtk-contrib-dev @@ -147,7 +157,7 @@ Package: wxwin=V-headers Architecture: any Section: devel Conflicts: wxwin-headers -Replaces: wxwin-headers +Replaces: wxwin-headers, wxgtk2.1-dev Provides: wxwin-headers Description: wxWindows Cross-platform C++ GUI toolkit (header files) wxWindows is a class library for C++ providing GUI (Graphical User diff --git a/debian/copyright b/debian/copyright index e46773d05d..55c8d06dfc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,18 +1,193 @@ This package was debianized by Ron Lee on Sun, 13 Feb 2000 18:40:00 +1030. -wxWindows main upstream site is www.wxwindows.org +more information about wxWindows, as well as the source these debs +are produced from can be found at www.wxwindows.org -wxWindows is licenced under the LGPL with a special exception for -binary only apps produced with it. Some parts of the library (as -compiled for Debian) might *not* include this extra exception in -their licence. If you wish to distribute binary object code under -terms other than those allowed by the (L)GPL (but allowed by the -wxWindows Licence), you must first ensure all linked in code is -subject to this exception. This package is almost certainly built -with code licenced under terms which do not include that exception. +Note for Debian users: +====================== +Most of the core wxWindows library is licenced under the wxWindows Library +Licence (included below), however some additional features of the library +may include source licenced under terms which do not include the exception +permitting you to licence binary object code versions of works based on the +Library under terms of your own choice. At any time and without warning, +newer versions of the Debian binary packages may include such code. + +In short, if you plan to licence apps built against these debs under terms +compatible with the GPL or LGPL, then you have nothing to worry about. If +you wish to release your code under a licence which does not grant all of +the same rights as the LGPL would assert but would be permitted under the +terms of the exception, then you are strongly advised to either check the +licencing terms of all components that these debs (and all future versions +that you use) are built with, or build your own binaries of wxWindows which +include only such code as is definitely covered by the exception. + +You should presume that these debs will fall under the provisions of the +unmodified LGPL unless you can prove otherwise, however this note in no way +alters the actual terms of the authorative licence detailed below, it is +intended to be purely informative of the fact that the Debian binary packages +will be built primarily with features useful to Free Software developers and +may not be suitable "as is" for compiling software for distribution that is +licenced incompatibly with the LGPL. + +Modifications and additions to the Library itself are encouraged to be +placed under the wxWindows Library Licence. We hope you find it useful. + + -- Ron + +----------------------------------------------------------------------------- + +Preamble +======== + +The licensing of the wxWindows library is intended to protect the wxWindows +library, its developers, and its users, so that the considerable investment +it represents is not abused. + +Under the terms of the wxWindows Licence, you as a user are not +obliged to distribute wxWindows source code with your products, if you +distribute these products in binary form. However, you are prevented from +restricting use of the library in source code form, or denying others the +rights to use or distribute wxWindows library source code in the way +intended. + +The wxWindows Licence establishes the copyright for the code and related +material, and it gives you legal permission to copy, distribute and/or +modify the library. It also asserts that no warranty is given by the authors +for this or derived code. + +The core distribution of the wxWindows library contains files +under two different licences: + +- Most files are distributed under the GNU Library General Public + Licence, version 2, with the special exception that you may create and + distribute object code versions built from the source code or modified + versions of it (even if these modified versions include code under a + different licence), and distribute such binaries under your own + terms. + +- Most core wxWindows manuals are made available under the "wxWindows + Free Documentation Licence", which allows you to distribute modified + versions of the manuals, such as versions documenting any modifications + made by you in your version of the library. However, you may not restrict + any third party from reincorporating your changes into the original + manuals. + + + + wxWindows Library Licence, Version 3 + ==================================== + + Copyright (c) 1998 Julian Smart, Robert Roebling et al + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version 3 of the + Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under the user's own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. + + + + wxWindows Free Documentation Licence, Version 3 + =============================================== + + Copyright (c) 1998 Julian Smart, Robert Roebling et al + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS FREE DOCUMENTATION LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 1. Permission is granted to make and distribute verbatim copies of this + manual or piece of documentation provided any copyright notice and this + permission notice are preserved on all copies. + + 2. Permission is granted to process this file or document through a + document processing system and, at your option and the option of any third + party, print the results, provided a printed document carries a copying + permission notice identical to this one. + + 3. Permission is granted to copy and distribute modified versions of this + manual or piece of documentation under the conditions for verbatim + copying, provided also that any sections describing licensing conditions + for this manual, such as, in particular, the GNU General Public Licence, + the GNU Library General Public Licence, and any wxWindows Licence are + included exactly as in the original, and provided that the entire + resulting derived work is distributed under the terms of a permission + notice identical to this one. + + 4. Permission is granted to copy and distribute translations of this + manual or piece of documentation into another language, under the above + conditions for modified versions, except that sections related to + licensing, including this paragraph, may also be included in translations + approved by the copyright holders of the respective licence documents in + addition to the original English. + + WARRANTY DISCLAIMER + + 5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE, + THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER + PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT + WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF + THE MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU. SHOULD THE MANUAL OR + PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL + NECESSARY SERVICING, REPAIR OR CORRECTION. + + 6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL + ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE MANUAL OR PIECE OF DOCUMENTATION AS PERMITTED ABOVE, BE + LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE + MANUAL OR PIECE OF DOCUMENTATION (INCLUDING BUT NOT LIMITED TO LOSS OF + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + PARTIES OR A FAILURE OF A PROGRAM BASED ON THE MANUAL OR PIECE OF + DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR + OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - See the file licence.txt for authorative details of - the wxWindows licence. diff --git a/debian/libwxbase-dbg.dirs b/debian/libwxbase-dbg.dirs index 1bb9506799..306d0d7d49 100644 --- a/debian/libwxbase-dbg.dirs +++ b/debian/libwxbase-dbg.dirs @@ -1,4 +1,5 @@ usr/bin usr/lib/wx/include/wx usr/share/man/man1 +usr/share/lintian/overrides diff --git a/debian/libwxbase-dbg.docs b/debian/libwxbase-dbg.docs deleted file mode 100644 index 4c4d01649e..0000000000 --- a/debian/libwxbase-dbg.docs +++ /dev/null @@ -1,2 +0,0 @@ -docs/licence.txt - diff --git a/debian/libwxbase-dev.docs b/debian/libwxbase-dev.docs deleted file mode 100644 index 3596b0d607..0000000000 --- a/debian/libwxbase-dev.docs +++ /dev/null @@ -1,3 +0,0 @@ -docs/preamble.txt -docs/licence.txt -docs/licendoc.txt diff --git a/debian/libwxbase.docs b/debian/libwxbase.docs deleted file mode 100644 index 561d5c39f9..0000000000 --- a/debian/libwxbase.docs +++ /dev/null @@ -1 +0,0 @@ -docs/licence.txt diff --git a/debian/libwxgtk-contrib-dev.docs b/debian/libwxgtk-contrib-dev.docs deleted file mode 100644 index 4c4d01649e..0000000000 --- a/debian/libwxgtk-contrib-dev.docs +++ /dev/null @@ -1,2 +0,0 @@ -docs/licence.txt - diff --git a/debian/libwxgtk-contrib.docs b/debian/libwxgtk-contrib.docs deleted file mode 100644 index 4c4d01649e..0000000000 --- a/debian/libwxgtk-contrib.docs +++ /dev/null @@ -1,2 +0,0 @@ -docs/licence.txt - diff --git a/debian/libwxgtk-dbg.dirs b/debian/libwxgtk-dbg.dirs index 4361f0cadd..7ec136990e 100644 --- a/debian/libwxgtk-dbg.dirs +++ b/debian/libwxgtk-dbg.dirs @@ -1,4 +1,5 @@ usr/bin usr/lib/wx/include/wx/gtkd/ usr/share/man/man1 +usr/share/lintian/overrides diff --git a/debian/libwxgtk-dbg.docs b/debian/libwxgtk-dbg.docs deleted file mode 100644 index 4c4d01649e..0000000000 --- a/debian/libwxgtk-dbg.docs +++ /dev/null @@ -1,2 +0,0 @@ -docs/licence.txt - diff --git a/debian/libwxgtk-dev.docs b/debian/libwxgtk-dev.docs deleted file mode 100644 index 3596b0d607..0000000000 --- a/debian/libwxgtk-dev.docs +++ /dev/null @@ -1,3 +0,0 @@ -docs/preamble.txt -docs/licence.txt -docs/licendoc.txt diff --git a/debian/libwxgtk-python.dirs b/debian/libwxgtk-python.dirs index cab7c0ae3d..5705e1f9f0 100644 --- a/debian/libwxgtk-python.dirs +++ b/debian/libwxgtk-python.dirs @@ -1 +1,2 @@ -usr/lib/python1.5/site-packages/wxPython/lib/sizers +usr/lib/=PY/site-packages/wxPython/lib + diff --git a/debian/libwxgtk-python.docs b/debian/libwxgtk-python.docs index 7795de7506..846f206bff 100644 --- a/debian/libwxgtk-python.docs +++ b/debian/libwxgtk-python.docs @@ -1,3 +1,3 @@ wxPython/README.txt wxPython/CHANGES.txt -docs/licence.txt + diff --git a/debian/libwxgtk-python.files b/debian/libwxgtk-python.files index 33537433ce..877efadf42 100644 --- a/debian/libwxgtk-python.files +++ b/debian/libwxgtk-python.files @@ -1,4 +1,4 @@ -usr/lib/python1.5/site-packages/wxPython +usr/lib/=PY/site-packages/wxPython usr/lib/libwxPyHelpers*.so usr/lib/libwxPyHelpers*.so.* diff --git a/debian/libwxgtk-python.postinst b/debian/libwxgtk-python.postinst index a1bebf841b..440a4ac991 100644 --- a/debian/libwxgtk-python.postinst +++ b/debian/libwxgtk-python.postinst @@ -2,12 +2,11 @@ set -e -WXPYTHONDIR="/usr/lib/python1.5/site-packages/wxPython" +WXPYTHONDIR="/usr/lib/=PY/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} - ldconfig + python /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR} + python -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR} fi #DEBHELPER# diff --git a/debian/libwxgtk-python.prerm b/debian/libwxgtk-python.prerm index 8417f23f42..03d602c2d3 100644 --- a/debian/libwxgtk-python.prerm +++ b/debian/libwxgtk-python.prerm @@ -2,8 +2,12 @@ set -e -WXPYTHONDIR="/usr/lib/python1.5/site-packages/wxPython" -find ${WXPYTHONDIR} -name "*.py?" -exec rm -f {} \; +PACKAGE="libwxgtk=V-python" + +dpkg --listfiles $PACKAGE | + awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | + xargs rm -f >&2 + #DEBHELPER# diff --git a/debian/libwxgtk.docs b/debian/libwxgtk.docs deleted file mode 100644 index 561d5c39f9..0000000000 --- a/debian/libwxgtk.docs +++ /dev/null @@ -1 +0,0 @@ -docs/licence.txt diff --git a/debian/lintian-override b/debian/lintian-override new file mode 100644 index 0000000000..9a3e920620 --- /dev/null +++ b/debian/lintian-override @@ -0,0 +1,5 @@ +libwxgtk2.2-dbg: non-dev-pkg-with-shlib-symlink +libwxgtk2.2-dbg: unused-shlib-entry-in-control-file +libwxbase2.2-dbg: non-dev-pkg-with-shlib-symlink +libwxbase2.2-dbg: unused-shlib-entry-in-control-file + diff --git a/debian/rules b/debian/rules index 38ed021b45..6e78d36f5b 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ export DH_COMPAT=2 export DH_OPTIONS release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p') +python_dir:=python$(shell python -c "import sys;print sys.version[:3]") # Packages to build: package_wxbase_lib=libwxbase$(release) @@ -42,21 +43,26 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \ $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \ $(objdir_doc) $(objdir_examples) -build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \ - build-wxbase-debug-stamp build-gtk-shared-stamp \ - build-gtk-static-stamp build-gtk-debug-stamp \ - build-contrib-shared-stamp build-contrib-static-stamp \ - build-gtk-python-stamp build-examples-stamp build-doc-stamp \ - build-i18n-stamp +# Build stamps: +build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \ + build-wxbase-debug-stamp build-gtk-shared-stamp \ + build-gtk-static-stamp build-gtk-debug-stamp \ + build-contrib-shared-stamp build-contrib-static-stamp \ + build-gtk-py-stamp -install_all=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ - install-gtk-lib install-gtk-dev install-gtk-dbg \ - install-gtk-contrib install-gtk-contrib-dev install-gtk-py \ - install-headers install-i18n install-doc install-examples +build_indep_stamps=build-examples-stamp build-doc-stamp build-i18n-stamp -wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \ - --prefix=$(shell pwd) \ - --exec-prefix=$(shell pwd)/$(objdir_gtk_shared) +build_stamps=$(build_arch_stamps) $(build_indep_stamps) + +# Install targets: +install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ + install-gtk-lib install-gtk-dev install-gtk-dbg \ + install-gtk-contrib install-gtk-contrib-dev install-gtk-py \ + install-headers + +install_all_indep=install-i18n install-doc install-examples + +install_all=$(install_all_arch) $(install_all_indep) # The Rules: @@ -69,47 +75,48 @@ debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in control-files-stamp: debian/control debian/wxwin-doc.doc-base dh_testdir - @for f in dirs docs postinst; do \ + @for f in dirs 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 postinst prerm; do \ + @for f in dirs files links postinst prerm; 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 links postinst prerm; do \ + @for f in dirs links postinst prerm; do \ echo "generating control file $(package_wxbase_dbg).$$f"; \ cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \ done; - @for f in dirs docs postinst; do \ + @for f in dirs postinst; do \ echo "generating control file $(package_gtk_lib).$$f"; \ cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \ done; - @for f in dirs docs files links postinst prerm; do \ + @for f in dirs files links postinst prerm; do \ echo "generating control file $(package_gtk_dev).$$f"; \ cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \ done; - @for f in dirs docs links postinst prerm; do \ + @for f in dirs links postinst prerm; do \ echo "generating control file $(package_gtk_dbg).$$f"; \ cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \ done; @for f in dirs docs files postinst prerm; do \ echo "generating control file $(package_gtk_py).$$f"; \ - cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \ + sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \ + > debian/$(package_gtk_py).$$f; \ done; - @for f in dirs docs postinst; do \ + @for f in dirs postinst; do \ echo "generating control file $(package_gtk_contrib).$$f"; \ cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \ done; - @for f in dirs docs files; do \ + @for f in dirs files; do \ echo "generating control file $(package_gtk_contrib_dev).$$f"; \ cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \ done; - @for f in dirs docs files; do \ + @for f in dirs files; do \ echo "generating control file $(package_headers).$$f"; \ cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \ done; - @for f in dirs docs files; do \ + @for f in dirs files; do \ echo "generating control file $(package_i18n).$$f"; \ cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \ done; @@ -117,12 +124,14 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base echo "generating control file $(package_doc).$$f"; \ cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \ done; - @for f in docs examples; do \ + @for f in examples; do \ echo "generating control file $(package_examples).$$f"; \ cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \ done; touch $@ +build_arch: control-files-stamp $(build_arch_stamps) + build: control-files-stamp $(build_stamps) build-wxbase-shared-stamp: @@ -130,6 +139,7 @@ build-wxbase-shared-stamp: mkdir $(objdir_wxbase_shared) cd $(objdir_wxbase_shared) \ && ../configure --prefix=/usr \ + --cache-file=../config_deb.cache \ --disable-gui \ --enable-burnt_name \ --with-zlib=sys \ @@ -141,6 +151,7 @@ build-wxbase-static-stamp: mkdir $(objdir_wxbase_static) cd $(objdir_wxbase_static) \ && ../configure --prefix=/usr \ + --cache-file=../config_deb.cache \ --disable-gui \ --disable-shared \ --with-zlib=sys \ @@ -152,6 +163,7 @@ build-wxbase-debug-stamp: mkdir $(objdir_wxbase_debug) cd $(objdir_wxbase_debug) \ && ../configure --prefix=/usr \ + --cache-file=../config_deb.cache \ --disable-gui \ --enable-debug \ --enable-burnt_name \ @@ -164,6 +176,7 @@ build-gtk-shared-stamp: mkdir $(objdir_gtk_shared) cd $(objdir_gtk_shared) \ && ../configure --prefix=/usr \ + --cache-file=../config_deb.cache \ --with-gtk \ --with-opengl \ --enable-burnt_name \ @@ -179,6 +192,7 @@ build-gtk-static-stamp: mkdir $(objdir_gtk_static) cd $(objdir_gtk_static) \ && ../configure --prefix=/usr \ + --cache-file=../config_deb.cache \ --with-gtk \ --with-opengl \ --disable-shared \ @@ -194,6 +208,7 @@ build-gtk-debug-stamp: mkdir $(objdir_gtk_debug) cd $(objdir_gtk_debug) \ && ../configure --prefix=/usr \ + --cache-file=../config_deb.cache \ --with-gtk \ --with-opengl \ --enable-debug \ @@ -207,19 +222,21 @@ build-gtk-debug-stamp: build-contrib-shared-stamp: build-gtk-shared-stamp dh_testdir - cd $(objdir_gtk_shared)/contrib/src && $(MAKE) + cd $(objdir_gtk_shared)/contrib/src \ + && $(MAKE) touch $@ build-contrib-static-stamp: build-gtk-static-stamp dh_testdir - cd $(objdir_gtk_static)/contrib/src && $(MAKE) + cd $(objdir_gtk_static)/contrib/src \ + && $(MAKE) touch $@ -build-gtk-python-stamp: build-gtk-shared-stamp +build-gtk-py-stamp: build-gtk-shared-stamp dh_testdir - cd wxPython/src \ - && touch gtk/*.cpp gtk/*.py \ - && ../distrib/build.py -b WXDIR=../.. WXCONFIG='$(wxconfig)' + touch docs/lgpl.txt + cd wxPython \ + && ./setup.py build IN_CVS_TREE=1 touch $@ build-doc-stamp: build-gtk-shared-stamp @@ -266,8 +283,9 @@ build-i18n-stamp: build-gtk-shared-stamp clean: debian/control dh_testdir dh_testroot - rm -rf control-files-stamp $(build_stamps) $(objdirs) - -cd wxPython/src && $(MAKE) clean + rm -rf config_deb.cache control-files-stamp $(build_stamps) $(objdirs) + rm -f docs/lgpl.txt + cd wxPython && ./setup.py clean dh_clean rm -f debian/$(package_wxbase_lib).* rm -f debian/$(package_wxbase_dev).* @@ -283,6 +301,8 @@ clean: debian/control rm -f debian/$(package_doc).* rm -f debian/$(package_examples).* +install_arch: build_arch $(install_all_arch) + install: build $(install_all) install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib) @@ -311,6 +331,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp dh_installdirs cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/ + cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg) install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib) install-gtk-lib: build-gtk-shared-stamp @@ -339,6 +360,7 @@ install-gtk-dbg: build-gtk-debug-stamp dh_installdirs cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/ + cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg) install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib) install-gtk-contrib: build-contrib-shared-stamp @@ -360,18 +382,14 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk*.a install-gtk-py: DH_OPTIONS=-p$(package_gtk_py) -install-gtk-py: build-gtk-python-stamp +install-gtk-py: build-gtk-py-stamp dh_testdir dh_testroot dh_clean -k dh_installdirs - cd wxPython/src \ - && ../distrib/build.py -i \ - TARGETDIR=../../debian/$(package_gtk_py)/usr/lib/python1.5/site-packages/wxPython \ - HELPERLIBDIR=../../debian/$(package_gtk_py)/usr/lib \ - WXDIR=../.. - rm -rf debian/$(package_gtk_py)/usr/lib/python1.5/site-packages/wxPython/demo - find debian/$(package_gtk_py)/usr/lib/python1.5/site-packages/wxPython \ + cd wxPython \ + && ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr + find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \ -name '*.py?' -exec rm '{}' ';' install-headers: DH_OPTIONS=-p$(package_headers) @@ -419,22 +437,24 @@ binary-common: dh_installchangelogs dh_installexamples dh_link - dh_strip + dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) dh_compress dh_fixperms - dh_makeshlibs + dh_makeshlibs -N$(package_gtk_py) dh_installdeb - dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_py)/usr/lib + dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib dh_gencontrol dh_md5sums dh_builddeb # Build architecture-independent files here. +# Note that you currently can't build the indep packages without first +# building the arch specific package files needed to create them. binary-indep: build install $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common -# Build architecture-dependent files here. -binary-arch: build install +# Build just the architecture-dependent files here. +binary-arch: build_arch install_arch $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common # Build all packages target. @@ -478,10 +498,10 @@ binary-doc: control-files-stamp install-doc $(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common -.PHONY: build clean binary-indep binary-arch binary binary-common binary-gtk \ - binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \ - binary-wxbase-dbg binary-doc install install-wxbase-lib \ - install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \ - install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \ - install-gtk-py install-headers install-i18n install-doc install-examples +.PHONY: build build_arch clean binary-indep binary-arch binary binary-common \ + binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \ + binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \ + install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \ + install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \ + install-gtk-py install-headers install-i18n install-doc install-examples diff --git a/debian/wxwin-doc.docs b/debian/wxwin-doc.docs index b96b3290fb..924030842d 100644 --- a/debian/wxwin-doc.docs +++ b/debian/wxwin-doc.docs @@ -1,2 +1,2 @@ -docs/licendoc.txt docs/wxWindows-manual.html + diff --git a/debian/wxwin-examples.docs b/debian/wxwin-examples.docs deleted file mode 100644 index 561d5c39f9..0000000000 --- a/debian/wxwin-examples.docs +++ /dev/null @@ -1 +0,0 @@ -docs/licence.txt diff --git a/debian/wxwin-headers.docs b/debian/wxwin-headers.docs deleted file mode 100644 index 4c4d01649e..0000000000 --- a/debian/wxwin-headers.docs +++ /dev/null @@ -1,2 +0,0 @@ -docs/licence.txt - diff --git a/debian/wxwin-i18n.docs b/debian/wxwin-i18n.docs deleted file mode 100644 index 4c4d01649e..0000000000 --- a/debian/wxwin-i18n.docs +++ /dev/null @@ -1,2 +0,0 @@ -docs/licence.txt - diff --git a/samples/help/doc/gifs.db b/samples/help/doc/gifs.db deleted file mode 100644 index e69de29bb2..0000000000 -- 2.45.2