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

diff --git a/Makefile.in b/Makefile.in
index 26bc098ac0d169d1a15e9d37789a33c49afaecf7..21c06e555570819371dcfedbc179f1d360472530 100644 (file)
--- 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/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
        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/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
        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/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
        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 b43289ab0049813e50717b7f683a1958f5d605a4..13f129a05502b36be60ade83a0f4a596908006f9 100644 (file)
--- 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/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
        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/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
        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/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
        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 795aee17e3056d7089264d5137cc2c6d5439db03..d517cc3be3fad5fd2e675228d66099f6f9f4ef86 100755 (executable)
--- 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_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
 
 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 df2a710cb059c4b85817d79f5ecf83a69a8ce7f4..7185a176a9cb7579a7c4d316ea35be0a263612ae 100644 (file)
--- 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_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
 
 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 8e211aedcb97e199a6e1b82acfbc65d264a4d804..f9dc6f1fe72322d2f1c114dd4c8e5044c6954b30 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wxwidgets2.5 (2.5.2.9) experimental; urgency=low
+
+  * Experimental prerelease.
+
+ -- Ron Lee <ron@debian.org>  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
 wxwidgets2.5 (2.5.2.3) experimental; urgency=low
 
   * Greatly improved concurrent installs.  We can now install