No more printing/*.xbm, fix make dist to suit.

Restore the old description of how to manage library revisions,
whatever was wrong with it previously, it at least covers what
to do in all cases.
Remove more cruft from the debian scripts.


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

Makefile.in

@@ -1182,7 +1182,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
 
 	mkdir $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
@@ -1580,8 +1579,6 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
-# This is to keep non-gnu make's happy.
-@IF_NOT_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
 
 @IF_GNU_MAKE@debian-native-dist: $(filter-out DEMOS_DIST,@GUIDIST@) MANUAL_DIST PYTHON_DIST
 	cp $(SRCDIR)/files.lst $(DISTDIR)/src
@@ -1591,6 +1588,11 @@ debian-msw-dirs:
 	mkdir $(DISTDIR)/src/msw
 
 
+# This is to keep non-gnu make's happy.
+# ... but is of course stupid and useless here, so make it a noop at least.
+@IF_NOT_GNU_MAKE@debian-native-dist: 
+
+
 clean:
 	$(RM) *.o
 	$(RM) *.d

configure.in

@@ -25,15 +25,23 @@ dnl When making releases do:
 dnl
 dnl WX_RELEASE_NUMBER += 1
 dnl
-dnl In case of backwards incompatible change (shouldn't happen
+dnl ..and update WX_CURRENT, WX_RELEASE and WX_AGE according to the
-dnl but if it does, do change the soname here to avoid run-time
+dnl following (libtool derived) rules:
-dnl problems!), do WX_CURRENT++; WX_REVISION = WX_AGE = 0. Otherwise
+dnl
-dnl (i.e. normal case), WX_CURRENT should be left unchanged, but you
+dnl    If any changes have been made to the public interface -- ie. if any
-dnl should do WX_REVISION++ and, if any public methods were added to
+dnl    exported class, method, global or global type has been added (to),
-dnl the library, also WX_AGE++.
+dnl    removed (from) or changed in any way -- then do:  WX_CURRENT += 1
+dnl
+dnl    If WX_CURRENT was incremented (as above) do:  WX_REVISION = 0
+dnl    Otherwise (if source changes have been made that do not _alter_ the
+dnl    existing public interfaces) do:  WX_REVISION += 1
+dnl
+dnl    If any public interface was added, do:  WX_AGE += 1
+dnl    If any public interface was removed (or altered in a way effectively
+dnl    removing the previous definition), instead do:  WX_AGE = 0
 dnl
 dnl When the major or minor version numbers are incremented, all the above
-dnl variables should be reset to 0.
+dnl variables should be reset to 0 once again.
 dnl
 dnl The resulting library name will be of the form:
 dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)

debian/rules

@@ -583,7 +583,6 @@ install-gtk-lib: build-gtk-shared-stamp install-gtk-shared-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs 
-	dh_install $(objdir_gtk_install)/share/wx 	usr/share
 	dh_install $(objdir_gtk_install)/lib/*.so.* 	usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
@@ -664,27 +663,6 @@ install-gtk-py: build-gtk-py-stamp
 		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1
 
 
-install-common: DH_OPTIONS=-p$(package_common)
-install-common: install-gtk-shared-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-#	We don't need the afm metrics for gtk2, but we might need them to support
-#	the 2.4 release for a while still and any other ports we might build.
-	dh_install $(objdir_gtk_install)/share/wx	usr/share
-	dh_install $(objdir_gtk_install)/share/aclocal 	usr/share
-	dh_installman debian/wx-config.1
-
-	dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc	usr/bin
-#	dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit	usr/bin
-
-	dh_installman debian/wxrc-tools.1
-	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
-#	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
-
-
 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: install-gtk-shared-stamp
 	dh_testdir