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

diff --git a/Makefile.in b/Makefile.in
index 8e069af587564a56393c385d1d976b562b61296e..195eddbfb371ab3fd9ea320e7eee992c70b024c0 100644 (file)
--- a/Makefile.in
+++ b/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

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 476509c6fc7337c3a61f7d8c7d2d9179f7e51f7a..1e7be34afa2cbdc8c718e0f19f9c515644e1feaf 100644 (file)
--- a/autoconf_inc.m4
+++ b/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
 

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 62b8935a1feef30696ec35de9859ad6bd59576e0..6ebfc3a7e030e1097f742ff540d1bfbf5b8f714f 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/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

diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index 1830bf33c965ba36fc6d451e94da46d0d5707a3b..d73b6f8b307eceb0dc22816b1f2041900452a64c 100644 (file)
--- a/build/msw/config.gcc
+++ b/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]

diff --git a/build/msw/config.vc b/build/msw/config.vc
index 93e41090f2627c1bdc3c299919231181f9ed3510..546861da495832a81a80cd5601dd7a40a29b8961 100644 (file)
--- a/build/msw/config.vc
+++ b/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]

diff --git a/build/msw/config.wat b/build/msw/config.wat
index 0a5d52c955c26f0b95d4f7c8854ab82fb992716b..ee99b8c22d464fffc8a9ce0aa22543e53998d7ad 100644 (file)
--- a/build/msw/config.wat
+++ b/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]

diff --git a/debian/changelog b/debian/changelog
index 1fbffa7da6109752e06e4906e4ec20d71b077781..695fddf4b615fecf6d880346c3d0c2d125323f6e 100644 (file)
--- a/debian/changelog
+++ b/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.