More updates to the Debian packaging for wxPython, unicode and

the project name change.

Applied patch from ABX to make tex2rtf unicode compatible, then
removed wxSprintf lameness from it so it might actually work.
Also modified it to return true from tex2rtf OnInit in console
builds so the app will exit with a successful return code rather
than always returning failure even when it succeeds.

Implemented unicode capable wxCtime for glibc systems also needed
by tex2rtf.

Wrapped dde include in tex2rtf in a guard and assert that dde is
MSW only in its forwarding header.

Lowered the limit of maxlen in wxSprintf so it actually has a
chance to segfault on people instead of failing silently and
mysteriously with glibc.

Silenced some other 'potentially uninitialised variable' warnings
from gcc3, most of which were bogus, one potentially not so.

Added missing newline at the end of fontdlg.cpp.


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

debian/README.examples

@@ -0,0 +1,14 @@
+
+These examples are provided as extended documentation for the wxWidgets
+package.  If you wish to actually run them rather than just browse them
+as documents you should copy them into a working directory elsewhere
+first.  Note that some of them will attempt to write to the current
+working directory, or to the home directory of the user they are run as.
+
+Some of the files have been compressed in accordance with Debian policy
+regarding documentation, you will need to uncompress such files before
+building or executing them.
+
+  Ron
+
+

debian/changelog

@@ -7,7 +7,7 @@ wxwidgets2.5 (2.5.1) experimental; urgency=low
     in court.  Eleven or so years of unbroken, unquestioned usage
     was not nearly so interesting to these people as the fact we
     were a soft target and easy to deprive of due process.
-  * wxGTK is now built with gtk2.
+  * wxGTK is now built with gtk2 and unicode support.
   * wxBase is no longer a separate package, it is built with the
     GUI libs which now depend on it.  We might split it out again
     one day if there is a need for that.
@@ -19,6 +19,8 @@ wxwidgets2.5 (2.5.1) experimental; urgency=low
     improve either, but the logical separation may be beneficial.
   * Removed many elements of the build scripts that are no longer
     required due to improvements and changes elsewhere.
+  * Added README.examples for people who think these are packaged
+    as demos instead of as extended documentation.
 
  -- Ron Lee <ron@debian.org>  Fri, 27 Feb 2004 17:00:29 +1030
 

debian/libwxgtk-dbg.links

@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2d-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2ud-=V-config.1.gz
 

debian/libwxgtk-dbg.postinst

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2d-=V-config 50
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2ud-=V-config 50
 
 #DEBHELPER#
 

debian/libwxgtk-dbg.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxgtk2d-=V-config
+update-alternatives --remove wx-config /usr/bin/wxgtk2ud-=V-config
 
 #DEBHELPER#
 

debian/libwxgtk-dev.links

@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2u-=V-config.1.gz
 

debian/libwxgtk-dev.postinst

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2-=V-config 70
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2u-=V-config 70
 
 #DEBHELPER#
 

debian/libwxgtk-dev.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxgtk2-=V-config
+update-alternatives --remove wx-config /usr/bin/wxgtk2u-=V-config
 
 #DEBHELPER#
 

debian/libwxgtk-python.docs

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

debian/libwxgtk-python.menu

@@ -1,7 +1,7 @@
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
   title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
   title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
   title="xrced" command="/usr/bin/xrced"
 

debian/rules

@@ -93,6 +93,8 @@ wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config          \
                 --prefix=$(shell pwd)                            \
                 --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
 
+contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
+
 
 # The Rules:
 
@@ -119,12 +121,12 @@ control-files-stamp: debian/control
 	done;
 	@for f in docs doc-base; do                                          \
 		echo "generating control file $(package_doc).$$f";           \
-		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f            \
+		sed -e 's/=V/$(release)/g' < debian/wx-doc.$$f               \
 			> debian/$(package_doc).$$f;                         \
 	done;
 	@for f in examples; do                                               \
 		echo "generating control file $(package_examples).$$f";      \
-		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
+		cp debian/wx-examples.$$f debian/$(package_examples).$$f;    \
 	done;
 	@for f in dirs links postinst prerm; do                              \
 		echo "generating control file $(package_msw_dev).$$f";       \
@@ -138,7 +140,7 @@ control-files-stamp: debian/control
 	done;
 	@for f in dirs; do                                                   \
 		echo "generating control file $(package_headers_msw).$$f";   \
-		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
+		sed -e 's/=H/$(cross_host)/g' < debian/wx-headers-msw.$$f    \
 			> debian/$(package_headers_msw).$$f;                 \
 	done;
 	touch $@
@@ -163,6 +165,7 @@ configure-gtk-shared-stamp:
 				--cache-file=$(config_cache)	\
 				--with-gtk			\
 				--enable-gtk2			\
+				--enable-unicode		\
 				--with-opengl			\
 				--enable-soname			\
 				--with-zlib=sys			\
@@ -186,6 +189,7 @@ configure-gtk-static-stamp:
 				--cache-file=$(config_cache)	\
 				--with-gtk			\
 				--enable-gtk2			\
+				--enable-unicode		\
 				--with-opengl			\
 				--disable-shared		\
 				--with-zlib=sys			\
@@ -209,6 +213,7 @@ configure-gtk-debug-stamp:
 				--cache-file=$(config_cache)	\
 				--with-gtk			\
 				--enable-gtk2			\
+				--enable-unicode		\
 				--with-opengl			\
 				--enable-debug			\
 				--enable-soname			\
@@ -228,21 +233,30 @@ build-gtk-debug-stamp: configure-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-py-stamp: build-gtk-shared-stamp
 	dh_testdir
 	touch docs/lgpl.txt
+	cd wxPython/include/wx						\
+		&& for f in $(contrib_libs); do				\
+			$(RM) $$f;					\
+			ln -s ../../../contrib/include/wx/$$f .;	\
+		done
 	cd wxPython \
-		&& $(python_ver) ./setup.py build WX_CONFIG='$(wxconfig)'
+		&& $(python_ver) ./setup.py 	build			\
+						WX_CONFIG='$(wxconfig)'	\
+						WXPORT=gtk2		\
+						UNICODE=1
+	cd wxPython/include/wx						\
+		&& for f in $(contrib_libs); do $(RM) $$f; done
+
 	touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
@@ -250,6 +264,7 @@ build-doc-stamp: build-gtk-shared-stamp
 	cd $(objdir_gtk_shared)/utils/tex2rtf/src \
 		&& $(MAKE)
 	rm -rf $(objdir_doc)
+	rm -rf $(objdir_doc_cruft)
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
@@ -409,9 +424,9 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_install)/bin/wxgtk2-$(release)-config 	usr/bin
+	dh_install $(objdir_gtk_install)/bin/wxgtk2u-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_install)/lib/{wx,*.so} 			usr/lib
-	dh_install $(objdir_gtk_static)/lib/libwx_gtk2{-,_gl}*.a 	usr/lib
+	dh_install $(objdir_gtk_static)/lib/libwx_gtk2u{-,_gl}*.a 	usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -419,7 +434,7 @@ install-gtk-dbg: build-gtk-debug-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs usr/share/lintian/overrides
-	dh_install $(objdir_gtk_debug)/wxgtk2d-$(release)-config 	usr/bin
+	dh_install $(objdir_gtk_debug)/wxgtk2ud-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_debug)/lib 				usr
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
@@ -447,7 +462,7 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
 	dh_installdirs
 	dh_install $(objdir_gtk_contrib_install)/include 	usr
 	dh_install $(objdir_gtk_contrib_install)/lib/*.so 	usr/lib
-	dh_install -Xlibwx_gtk2- -Xlibwx_gtk2_gl- \
+	dh_install -Xlibwx_gtk2u- -Xlibwx_gtk2u_gl- \
 		   $(objdir_gtk_static)/lib/*.a 		usr/lib
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
@@ -459,7 +474,9 @@ install-gtk-py: build-gtk-py-stamp
 	cd wxPython 								\
 		&& $(python_ver) ./setup.py install 				\
 			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr 	\
-			      WX_CONFIG='$(wxconfig)'
+			      WX_CONFIG='$(wxconfig)'				\
+			      WXPORT=gtk2					\
+			      UNICODE=1
 
 	find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython \
 		-name '*.py?' -exec rm '{}' ';'
@@ -477,7 +494,7 @@ install-gtk-py: build-gtk-py-stamp
 		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
 
 	# This is rather bogus, its included in the main copyright file now though.
-	rm -f debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython/tools/XRCed/license.txt
+	rm -f debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wx/tools/XRCed/license.txt
 
 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: install-gtk-shared-stamp
@@ -580,7 +597,7 @@ binary-common:
 	dh_fixperms
 	dh_makeshlibs -N$(package_gtk_py) -V
 	dh_installdeb
-	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib
+	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib:debian/$(package_gtk_contrib)/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

debian/wx-config.1

@@ -1,6 +1,6 @@
-.TH wx\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows"
+.TH wx\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWidgets"
 .SH NAME
-wx-config \- generate compile time info for wxWindows
+wx-config \- generate compile time requirements for wxWidgets applications
 .SH SYNOPSIS
 .nh
 .B wxbase\-config
@@ -8,11 +8,11 @@ wx-config \- generate compile time info for wxWindows
 .B wxgtk\-config
 .HP
 .B wx\-config
-[\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
-[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
+[\-\-version] [\-\-libs\fI[=LIBS]\fP] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
+[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-release] [\-\-basename]
 .SH DESCRIPTION
 \fIwx\-config\fP is a tool to determine the compiler and linker
-flags required for applications using the \fIwxWindows\fP toolkit(s).
+flags required for applications using the \fIwxWidgets\fP toolkit(s).
 .PP
 \fIwx\-config\fP is normally a symlink to one of the port\-specific
 versions like \fIwxbase\-config\fP or \fIwxgtk\-config\fP which
@@ -26,31 +26,32 @@ mechanism.
 .SH OPTIONS
 .l
 \fIwx\-config\fP accepts the following options:
-.TP 8
+.TP 15
 .B  \-\-version
 What to
 .B ALWAYS
 include in a bug report.
-.br
-( But of course you already knew that ... )
-.TP 8
-.B  \-\-libs
-Generate linker flags for a \fIwxWindows\fP program.
-.TP 8
+.TP 15
+.B  \-\-libs[=LIBS]
+Generate linker flags for a \fIwxWidgets\fP program.
+The optional argument is a comma separated list of the wxWidgets libraries
+to link with.  You may include contrib libs here too.  If no argument is
+given it will assume you wish to link all 'core' libraries.
+.TP 15
 .B  \-\-cflags
 Generate compiler flags for the same.
-.TP 8
+.TP 15
 .B  \-\-cc
 Output the name of the C compiler \fB$(CC)\fP.
-.TP 8
+.TP 15
 .B  \-\-cxx
 Output the name of the C++ compiler \fB$(CXX)\fP.
-.TP 8
+.TP 15
 .B  \-\-ld
 Output the Linker command \fB$(LD)\fP.
-.TP 8
+.TP 15
 .B  \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that \fIwxWindows\fP
+If specified, use PREFIX instead of the installation prefix that \fIwxWidgets\fP
 was built with when computing the output for the \-\-cflags and
 \-\-libs options. This option is also used for the exec prefix
 if \-\-exec\-prefix was not specified. This option must be specified
@@ -58,27 +59,33 @@ before any \-\-libs or \-\-cflags options.
 .br
 .nh
 .HP
-(Translation:  this is the root path to the \fIwxWindows\fP headers \-\- [Ron])
+(Translation:  this is the root path to the \fIwxWidgets\fP headers \-\- [Ron])
 .hy
-.TP 8
+.TP 15
 .B  \-\-exec\-prefix=PREFIX
 If specified, use PREFIX instead of the installation exec prefix that
-\fIwxWindows\fP was built with when computing the output for the \-\-cflags
+\fIwxWidgets\fP was built with when computing the output for the \-\-cflags
 and \-\-libs options.  This option must be specified before any
 \-\-libs or \-\-cflags options.
 .br
 .nh
 .HP
-(Translation:  this is the root path to the \fIwxWindows\fP library \-\- [Ron])
+(Translation:  this is the root path to the \fIwxWidgets\fP library \-\- [Ron])
 .hy
+.TP 15
+.B  \-\-release
+Output the wxWidgets release number.
+.TP 15
+.B  \-\-basename
+Output the base name of the wxWidgets libraries.
 .SH SEE ALSO
 .BR gtk\-config (1),
 .BR update\-alternatives (8)
 .SH COPYRIGHT
 This manpage was copied whole\-heartedly from the \fBgtk\-config\fP(1) manpage
 by Brian Bassett <brianb@debian.org> for the Debian GNU/Linux distribution of
-wxGTK.  It was then updated to include new options and otherwise bastardised
-generally by Ron Lee <ron@debian.org>
+wxGTK.  It was subsequently updated to include new options and otherwise
+bastardised generally by Ron Lee <ron@debian.org>
 
 The original gtk\-config manpage copyright:
 

debian/wx-examples.examples

@@ -1,3 +1,5 @@
+debian/README.examples
 docs/examples/demos
 docs/examples/samples
 docs/examples/wxPython
+

debian/wxPython-tools.1

@@ -1,4 +1,4 @@
-.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWindows"
+.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWidgets"
 .SH NAME
 img2py \- wxPython tools.
 .br
@@ -22,6 +22,6 @@ The real documentation for these tools is available in pydoc format.
 
 .SH COPYRIGHT
 This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux
-distribution of wxWindows.  It may be freely distributed by anyone insane enough
+distribution of wxWidgets.  It may be freely distributed by anyone insane enough
 to find it useful.