From fdec35499dae7e29ac2f4cc4337ee4356f7d6123 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Tue, 21 Sep 2004 21:54:57 +0000 Subject: [PATCH] Add xrc to the dist target. Bump subrelease to 2.5.2.9. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 4 ++++ build/bakefiles/make_dist.mk | 4 ++++ configure | 2 +- configure.in | 2 +- debian/changelog | 6 ++++++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 26bc098ac0..21c06e5555 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20945,6 +20945,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/xml + mkdir $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx @@ -20952,6 +20953,7 @@ ALL_GUI_DIST: ALL_DIST cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml + cp $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/art mkdir $(DISTDIR)/art/gtk @@ -20966,6 +20968,8 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/unix + mkdir $(DISTDIR)/src/xrc + cp $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common cp $(COMMDIR)/*.inc $(DISTDIR)/src/common diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index b43289ab00..13f129a055 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -139,6 +139,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/xml + mkdir $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx @@ -146,6 +147,7 @@ ALL_GUI_DIST: ALL_DIST cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml + cp $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/art mkdir $(DISTDIR)/art/gtk @@ -160,6 +162,8 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/unix + mkdir $(DISTDIR)/src/xrc + cp $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common cp $(COMMDIR)/*.inc $(DISTDIR)/src/common diff --git a/configure b/configure index 795aee17e3..d517cc3be3 100755 --- a/configure +++ b/configure @@ -1654,7 +1654,7 @@ test -n "$target_alias" && wx_major_version_number=2 wx_minor_version_number=5 wx_release_number=2 -wx_subrelease_number=3 +wx_subrelease_number=9 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number diff --git a/configure.in b/configure.in index df2a710cb0..7185a176a9 100644 --- a/configure.in +++ b/configure.in @@ -56,7 +56,7 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE) wx_major_version_number=2 wx_minor_version_number=5 wx_release_number=2 -wx_subrelease_number=3 +wx_subrelease_number=9 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number diff --git a/debian/changelog b/debian/changelog index 8e211aedcb..f9dc6f1fe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wxwidgets2.5 (2.5.2.9) experimental; urgency=low + + * Experimental prerelease. + + -- Ron Lee Wed, 22 Sep 2004 03:29:56 +0930 + wxwidgets2.5 (2.5.2.3) experimental; urgency=low * Greatly improved concurrent installs. We can now install -- 2.45.2