minor packaging tweaks

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

debian/README.Debian

@@ -5,14 +5,17 @@ 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-dbg		wxGTK libraries built with -g and __WXDEBUG__
 libwxgtk-python		Python binding to wxGTK
 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 <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

debian/changelog

@@ -1,6 +1,15 @@
 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 <ron@debian.org>  Sun, 13 Feb 2000 18:40:00 +1030
 

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, flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.1.1
+Standards-Version: 3.2.0
 
 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
+ wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
+ 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
+ wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
+ 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
+ wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
+ 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
@@ -94,6 +97,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

debian/copyright

@@ -1,18 +1,193 @@
 This package was debianized by Ron Lee <ron@debian.org> 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
+Note for Debian users:
-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
+Most of the core wxWindows library is licenced under the wxWindows Library
-terms other than those allowed by the (L)GPL (but allowed by the
+Licence (included below), however some additional features of the library
-wxWindows Licence), you must first ensure all linked in code is
+may include source licenced under terms which do not include the exception
-subject to this exception.  This package is almost certainly built
+permitting you to licence binary object code versions of works based on the
-with code licenced under terms which do not include that exception.
+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.
 
 
-   See the file licence.txt for authorative details of
+
-                  the wxWindows licence.
+                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.
+
 

debian/libwxbase-dbg.docs

@@ -1,2 +0,0 @@
-docs/licence.txt
-

debian/libwxbase-dev.docs

@@ -1,3 +0,0 @@
-docs/preamble.txt
-docs/licence.txt
-docs/licendoc.txt

debian/libwxbase.docs

@@ -1 +0,0 @@
-docs/licence.txt

debian/libwxgtk-contrib-dev.docs

@@ -1,2 +0,0 @@
-docs/licence.txt
-

debian/libwxgtk-contrib.docs

@@ -1,2 +0,0 @@
-docs/licence.txt
-

debian/libwxgtk-dbg.docs

@@ -1,2 +0,0 @@
-docs/licence.txt
-

debian/libwxgtk-dev.docs

@@ -1,3 +0,0 @@
-docs/preamble.txt
-docs/licence.txt
-docs/licendoc.txt

debian/libwxgtk-python.docs

@@ -1,3 +1,3 @@
 wxPython/README.txt
 wxPython/CHANGES.txt
-docs/licence.txt
+

debian/libwxgtk.docs

@@ -1 +0,0 @@
-docs/licence.txt

debian/rules

@@ -69,27 +69,27 @@ 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;
@@ -97,19 +97,19 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 		echo "generating control file $(package_gtk_py).$$f"; \
 		cp 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,7 +117,7 @@ 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;

debian/wxwin-doc.docs

@@ -1,2 +1,2 @@
-docs/licendoc.txt
 docs/wxWindows-manual.html
+

debian/wxwin-examples.docs

@@ -1 +0,0 @@
-docs/licence.txt

debian/wxwin-headers.docs

@@ -1,2 +0,0 @@
-docs/licence.txt
-

debian/wxwin-i18n.docs

@@ -1,2 +0,0 @@
-docs/licence.txt
-