From 616d1b3cb0baf1c2eb643113724336b11d43a8a4 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sun, 14 Mar 2004 14:02:04 +0000 Subject: [PATCH] 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 | 6 ------ autoconf_inc.m4 | 3 --- build/bakefiles/make_dist.mk | 6 ------ build/msw/config.gcc | 8 -------- build/msw/config.vc | 8 -------- build/msw/config.wat | 8 -------- debian/changelog | 2 +- 7 files changed, 1 insertion(+), 40 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8e069af587..195eddbfb3 100644 --- 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 476509c6fc..1e7be34afa 100644 --- 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 62b8935a1f..6ebfc3a7e0 100644 --- 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 1830bf33c9..d73b6f8b30 100644 --- 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 93e41090f2..546861da49 100644 --- 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 0a5d52c955..ee99b8c22d 100644 --- 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 1fbffa7da6..695fddf4b6 100644 --- 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.