Last minute changes to fix 2.5.1.1 debs for release.

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

Makefile.in

@@ -17778,15 +17778,9 @@ ALL_DIST: distrib_clean
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
-#	cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
 	cp -Rf $(EXPATDIR) $(DISTDIR)/src
 	(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
 	mkdir $(DISTDIR)/src/iodbc

autoconf_inc.m4

@@ -2,9 +2,6 @@ dnl This macro was generated by
 dnl Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
-
-dnl Conditions:
-
 dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
 AC_BAKEFILE_PRECOMP_HEADERS
 

build/bakefiles/make_dist.mk

@@ -101,15 +101,9 @@ ALL_DIST: distrib_clean
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
-#	cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
 	cp -Rf $(EXPATDIR) $(DISTDIR)/src
 	(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
 	mkdir $(DISTDIR)/src/iodbc

build/msw/config.gcc

@@ -80,14 +80,6 @@ VENDOR = custom
 # compiled .lib files and setup.h under the lib/ toplevel directory. 
 CFG = 
 
-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-CPPUNIT_CFLAGS = 
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-CPPUNIT_LIBS = 
-
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]

build/msw/config.vc

@@ -84,14 +84,6 @@ VENDOR = custom
 # compiled .lib files and setup.h under the lib/ toplevel directory. 
 CFG = 
 
-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-CPPUNIT_CFLAGS = 
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-CPPUNIT_LIBS = 
-
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]

build/msw/config.wat

@@ -77,14 +77,6 @@ VENDOR = custom
 # compiled .lib files and setup.h under the lib/ toplevel directory. 
 CFG = 
 
-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-CPPUNIT_CFLAGS = 
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-CPPUNIT_LIBS = 
-
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]

debian/changelog

@@ -1,4 +1,4 @@
-wxwidgets2.5 (2.5.1) experimental; urgency=low
+wxwidgets2.5 (2.5.1.1) experimental; urgency=low
 
   * The s/ndow/dget/g release.
   * Yes, the name has changed and the terrorists have won again.