Add support for legacy 2.4 installs to wx-config.

Add /utils/wxrc to the dist target and fix some things that still
think it is in contrib.


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

debian/changelog

@@ -1,4 +1,4 @@
-wxwidgets2.5 (2.5.2.9) experimental; urgency=low
+wxwidgets2.5 (2.5.3.0) experimental; urgency=low
 
   * Experimental prerelease.
 

debian/control.in

@@ -69,7 +69,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
 Conflicts: wx-common
-Replaces: wx-common
+Replaces: wx-common, wxwin2.4-headers
 Provides: wx-common
 Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing

debian/rules

@@ -281,7 +281,7 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
 build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
-	cd $(objdir_gtk_shared)/contrib/utils/wxrc && $(FAST_MAKE)
+	cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
 	#cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
 	touch $@
 
@@ -553,7 +553,7 @@ install-common: install-gtk-shared-stamp
 	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
+	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