Remove demos from the Debian -examples package.

Replace html lib in tex2rtf build, it is needed for any platform
where wxHelpController == wxHtmlHelpController.


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

debian/README.examples

@@ -9,6 +9,14 @@ 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 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
+/demos directories of the wxWidgets cvs repository (which is browsable
+via http://cvs.wxwidgets.org), or of course you can always apt-get the
+source of any wx using package for some less contrived examples of
+real world wx applications.
+
   Ron
 
 

debian/rules

@@ -286,19 +286,16 @@ build-examples-stamp: build-gtk-shared-stamp
 	rm -f $(objdir_examples)/samples/Makefile
 	cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
 
-	cp -a demos $(objdir_examples)
+	cd $(objdir_examples)/samples					\
+		&& find -name 'Makefile.in' -exec rm -f '{}' ';'	\
+		&& for d in $$(find -type d); do			\
+			if [ -f $$d/makefile.unx ]; then		\
+				mv $$d/makefile.unx $$d/Makefile;	\
+			fi;						\
+		done							\
+
 	cp -a 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 $@
 
 build-i18n-stamp: build-gtk-shared-stamp
@@ -379,6 +376,9 @@ clean: debian/control
 		&& rm -rf contrib/xrc/contrib \
 		&& rm -rf *.pyc
 
+	cd wxPython/include/wx						\
+		&& for f in $(contrib_libs); do $(RM) $$f; done
+
 # We do the equivalent of this above by removing build, unfortunately
 # its not enough by itself to get the tree properly clean again.
 #		&& ./setup.py clean

debian/wx-examples.examples

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