Include the unpack_examples script with 2.4 releases too.

Fix the location of the installed wx.pth.
Add the index.html link.


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

debian/README.Debian

@@ -52,18 +52,12 @@ wx-i18n			message catalogs for native language support
 
 
 	The following binaries can be built from the source package
-	with the mingw32 cross compiler, but are not currently
+	with the mingw32 cross compiler, but are not distributed
-	distributed by Debian.  If you feel that should change,
+	as a part of the main Debian distribution.
-	please file a bug against the wxwindows2.4 package, or
-	append your views to a report already there if you're not
-	the first to do so.
 
-	[ you can check the current state of affairs at:
+	Please do *not* file bug reports for these packages to the
-	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.4 ]
+	Debian bts.  But do feel free to email me personally if you
-
+	find problems and/or have patches to fix them.
-	Oh and, please do *not* file bug reports for these packages
-	to the Debian bts.  But do feel free to email me personally
-	if you find problems and/or have patches to fix them.
 
 libwxmsw-dev		mingw32-cross wxMSW libs.
 libwxmsw-dbg		mingw32-cross wxMSW (debug) libs.
@@ -93,6 +87,13 @@ wx-headers-msw		extra headers needed for wxMSW.
 	you have listed in DISTCC_HOSTS.  This will work for both native
 	and cross builds of the c++ libraries, if you have the relevant
 	compilers on all your build hosts.
+	You may override that heuristic by setting the CONCURRENCY_LEVEL
+	environment variable to the number of jobs you wish make to fork.
+	That variable is also supported by the kernel-package scripts and
+	is respected for consistency here.
+
+	wxPython builds cannot be parallelised at this stage and will run
+	serially regardless of your configuration.
 
 
  -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

debian/README.examples

@@ -9,6 +9,8 @@ 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.
 
+The unpack_examples.sh script is provided to assist with that.
+
 The examples provided here typically show a minimal implementation of
 the feature(s) they are demonstrating.  There are examples of more
 complete (mini) applications, available in the /wxPython/samples and

debian/changelog

@@ -25,6 +25,8 @@ wxwindows2.4 (2.4.5) unstable; urgency=low
   * Fix strange and invalid cast-assignment construct in sndesd.cpp
     and sndoss.cpp
   * Update FSF address in copyright file.
+  * Add an index.html link to the doc contents page.
+  * Include the unpack_examples script here too.
 
  -- Ron Lee <ron@debian.org>  Sat,  13 Apr 2006 03:06:11 +1030
 

debian/rules

@@ -457,6 +457,11 @@ build-examples-stamp: build-gtk-shared-stamp
 
 	cp -a wxPython/demo $(objdir_examples)/wxPython
 
+	echo "generating install_examples.sh script";
+	sed -e 's/=V/$(release)/g' < debian/unpack_examples.sh.in	\
+				   > debian/unpack_examples.sh
+	chmod 755 debian/unpack_examples.sh
+
 	touch $@
 
 build-i18n-stamp: build-gtk-shared-stamp
@@ -629,6 +634,7 @@ clean: debian/control clean-py
 	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/$(package_headers_msw).*
 	rm -f debian/lintian-override
+	rm -f debian/unpack_examples.sh
 
 install_arch: build_arch $(install_all_arch)
 
@@ -733,7 +739,7 @@ install-gtk-py-lib: build-gtk-py-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs usr/lib/wx/config
+	dh_installdirs usr/lib/wx/python
 	cd wxPython 								 \
 		&& $(python_ver) ./setup.py install 				 \
 			      --prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr \
@@ -743,7 +749,7 @@ install-gtk-py-lib: build-gtk-py-stamp
 	rm debian/$(package_gtk_py_lib)/$(wxpydir).pth
 
 	mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth 			\
-	   debian/$(package_gtk_py_lib)/usr/lib/wx/config/wx$(release).pth
+	   debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release).pth
 
 	find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';'
 
@@ -801,7 +807,7 @@ install-common: install-gtk-shared-stamp
 	dh_testroot
 	dh_clean -k
 
-	dh_install $(objdir_gtk_install)/share/aclocal 		usr/share
+	dh_install $(objdir_gtk_install)/share/aclocal 	usr/share
 	dh_installman debian/wx-config.1
 
 	dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc	usr/bin
@@ -832,6 +838,11 @@ install-doc: build-doc-stamp
 	dh_testroot
 	dh_clean -k
 
+	@# Link this monstrosity with an overly obfuscated name
+	@# to something that both people and browsers can expect to find.
+	dh_link usr/share/doc/$(package_doc)/wx-manual.html/wx-$(release)-manual_contents.html \
+		usr/share/doc/$(package_doc)/wx-manual.html/index.html
+
 install-examples: DH_OPTIONS=-p$(package_examples)
 install-examples: build-examples-stamp
 	dh_testdir
@@ -852,7 +863,7 @@ install-gtk-dbg-py: build-gtk-dbg-py-stamp
 	rm debian/$(package_gtk_py_lib)/$(wxpydir).pth
 
 	mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth 			\
-	   debian/$(package_gtk_py_lib)/usr/lib/wx/config/wx$(release)-dbg.pth
+	   debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release)-dbg.pth
 
 	find debian/$(package_gtk_dbg_py)/$(pydir) -name '*.py?' -exec rm '{}' ';'
 

debian/unpack_examples.sh.in

@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Unpack compressed examples from the packaged documentation
+# into a directory where the user can compile and/or run them.
+
+WX_EXAMPLES_DIR="/usr/share/doc/wx=V-examples/examples"
+
+usage() {
+    echo "$0 [subdir [subdir] ...] dest_dir"
+    echo "    subdir   - a subdir of $WX_EXAMPLES_DIR to unpack."
+    echo "    dest_dir - location for the unpacked examples."
+    echo
+    echo "If no subdirs are supplied explicitly, all examples will be unpacked."
+    exit 1
+}
+
+if [ $# -lt 1 ]; then
+    usage
+fi 
+
+while [ $# -gt 1 ]; do
+    SUBDIRS="$SUBDIRS $1"
+    shift
+done
+
+DESTDIR="$1"
+
+if [ -e $DESTDIR ]; then
+    echo "Destination $DESTDIR already exists. Cowardly exiting."
+    exit 2
+fi
+
+if [ -z "$SUBDIRS" ]; then
+    for d in $(cd $WX_EXAMPLES_DIR 2> /dev/null && ls -d * 2> /dev/null); do
+        [ -d "$WX_EXAMPLES_DIR/$d" ] && SUBDIRS="$SUBDIRS $d"
+    done
+else
+    for d in $SUBDIRS; do
+    	if [ -d "$WX_EXAMPLES_DIR/$d" ]; then
+	    _SUBDIRS="$d"
+	else
+	    echo "Subdir $WX_EXAMPLES_DIR/$d does not exist.  Skipping."
+	fi
+    done
+    SUBDIRS="$_SUBDIRS"
+fi
+
+if [ -z "$SUBDIRS" ]; then
+    echo "Nothing to copy from $WX_EXAMPLES_DIR.  Aborting."
+    exit 1
+fi
+
+mkdir -p $DESTDIR
+for d in $SUBDIRS; do
+    echo "Copying $WX_EXAMPLES_DIR/$d to $DESTDIR"
+    cp -pr "$WX_EXAMPLES_DIR/$d" "$DESTDIR"
+done
+
+echo -n "Unpacking... "
+find $DESTDIR -name "*.gz" -exec gunzip {} \;
+echo "done."
+