Remove static libs from package build.

Trim configure options to reflect new defaults.
Make i18n package conflict/replace.  Not my first choice.

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

diff --git a/debian/README.Debian b/debian/README.Debian
index de079f50a8c8f39ee0deb66b68036184a5359ce2..c59e5d0623c73e6dd5a8607ecf10842fe480d62c 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,7 +5,7 @@ The following packages are built from the wxWidgets CVS source.
 
 libwxgtk               wxGTK runtime shared libraries, including selected
                        contrib libs.
 
 libwxgtk               wxGTK runtime shared libraries, including selected
                        contrib libs.

-libwxgtk-dev           extra files and static libs for building wxGTK apps
+libwxgtk-dev           extra files required for building wxGTK apps

 libwxgtk-dbg           wxGTK libraries built with -g and __WXDEBUG__
 
 libwxgtk-python                Python binding to wxGTK  (from 2.2.3 onward, this
 libwxgtk-dbg           wxGTK libraries built with -g and __WXDEBUG__
 
 libwxgtk-python                Python binding to wxGTK  (from 2.2.3 onward, this


@@ -18,6 +18,11 @@ wx-examples          wxWidgets and wxPython demos and samples (source)
 wx-i18n                        message catalogs for native language support
 
 
 wx-i18n                        message catalogs for native language support
 
 

+       Note that static libraries are no longer supplied in these
+       packages.  Please read, or have understood:
+       http://people.redhat.com/drepper/no_static_linking.html
+       among others before reporting this as a bug.
+

        The following binaries can be built from the source package
        with the mingw32 cross compiler, but are not currently
        distributed by Debian.  If you feel that should change,
        The following binaries can be built from the source package
        with the mingw32 cross compiler, but are not currently
        distributed by Debian.  If you feel that should change,

diff --git a/debian/changelog b/debian/changelog
index 46f88fd225cddf9d7f2b7c0845e629469f524344..57dab4da651a721d4332022c199752e9a2fa3e87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+wxwidgets2.5 (2.5.5.1) unstable; urgency=low
+
+  * Last chance.
+  * Conflict with wxwin2.4-i18n.  Due to inertia, it really
+    does.  Sorry if you are not a gringo and want both 2.4 and
+    2.5 apps localised on the same machine.  Maybe for 2.6.1.
+    Bitch upstream if you want it fixed.
+  * Don't package the static libs anymore for wxGTK.
+    Blame drepper for encouraging their obsolescence  If you dare.
+  * Trim the configure options to reflect the new defaults.
+
+ -- Ron Lee <ron@debian.org>  Mon, 11 Apr 2005 22:43:58 +0930
+

 wxwidgets2.5 (2.5.4.0) unstable; urgency=low
 
   * Experimental snapshot.
 wxwidgets2.5 (2.5.4.0) unstable; urgency=low
 
   * Experimental snapshot.


@@ -6,6 +19,7 @@ wxwidgets2.5 (2.5.4.0) unstable; urgency=low
   * Fixes lack of version checking in wxPython examples.
     Closes: #287772
   * Fixes FTBFS on ppc.  Closes: #285186
   * Fixes lack of version checking in wxPython examples.
     Closes: #287772
   * Fixes FTBFS on ppc.  Closes: #285186

+  * Enable gnomeprint, Closes: #284943 satisfactorily I hope.

 
  -- Ron Lee <ron@debian.org>  Sun, 13 Feb 2005 16:52:38 +1030
 
 
  -- Ron Lee <ron@debian.org>  Sun, 13 Feb 2005 16:52:38 +1030
 

diff --git a/debian/control.in b/debian/control.in
index 248304493569112e598c1d604d535abe2b57c2c7..64b349ddfdde442f16f7fdde2e0c7c44d1bdc4d3 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -123,8 +123,8 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (header files)
 Package: wx=V-i18n
 Architecture: all
 Section: libs
 Package: wx=V-i18n
 Architecture: all
 Section: libs

-Conflicts: wx-i18n, wxwin-i18n
-Replaces: wx-i18n, wxwin-i18n
+Conflicts: wx-i18n, wxwin-i18n, wx2.4-i18n
+Replaces: wx-i18n, wxwin-i18n, wx2.4-i18n

 Provides: wx-i18n
 Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
 Provides: wx-i18n
 Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing

diff --git a/debian/libwxgtk-dev.postinst b/debian/libwxgtk-dev.postinst
index 92832fef7cc33c1d4ea6649061746a1d47768899..b565424d52d376ed5794a96340bd38f70ce563c1 100644 (file)
--- a/debian/libwxgtk-dev.postinst
+++ b/debian/libwxgtk-dev.postinst
@@ -2,7 +2,6 @@
 set -e
 
 update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/gtk2-unicode-release-=V 80
 set -e
 
 update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/gtk2-unicode-release-=V 80

-update-alternatives --install /usr/bin/wx-config wx-config /usr/lib/wx/config/gtk2-unicode-release-=V-static 75

 
 #DEBHELPER#
 
 
 #DEBHELPER#
 

diff --git a/debian/libwxgtk-dev.prerm b/debian/libwxgtk-dev.prerm
index ca2e5b8cce29f8b3bbec290c9d1a5d7e639fca95..4b24d3f73d2f596b4608850e4342b150463ba3f5 100644 (file)
--- a/debian/libwxgtk-dev.prerm
+++ b/debian/libwxgtk-dev.prerm
@@ -2,7 +2,6 @@
 set -e
 
 update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-release-=V
 set -e
 
 update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-release-=V

-update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-release-=V-static

 
 #DEBHELPER#
 
 
 #DEBHELPER#
 

diff --git a/debian/rules b/debian/rules
index c51f6776c16c44efdee4fde97c42247e24b37e7c..316d17626cfd54cb552cf957887f15973d92d09f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,6 @@ package_headers_msw     = wx$(release)-headers-msw
 
 # Build directories:
 objdir_gtk_shared          = objs_gtk_sh
 
 # Build directories:
 objdir_gtk_shared          = objs_gtk_sh

-objdir_gtk_static          = objs_gtk_st

 objdir_gtk_debug           = objs_gtk_d
 objdir_gtk_install         = objs_gtk_install
 objdir_doc_cruft           = objs_doc_con
 objdir_gtk_debug           = objs_gtk_d
 objdir_gtk_install         = objs_gtk_install
 objdir_doc_cruft           = objs_doc_con


@@ -83,8 +82,7 @@ objdir_msw_static          = objs_msw_st
 objdir_msw_dbg             = objs_msw_d
 objdir_msw_install         = objs_msw_install
 
 objdir_msw_dbg             = objs_msw_d
 objdir_msw_install         = objs_msw_install
 

-objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
-         $(objdir_gtk_install)                                           \
+objdirs = $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install)  \

          $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
          $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
          $(objdir_msw_install)
          $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
          $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
          $(objdir_msw_install)


@@ -96,7 +94,6 @@ objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
 
 # Build stamps:
 build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
 
 # Build stamps:
 build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \

-                    build-gtk-static-stamp build-gtk-static-contrib-stamp \

                     build-gtk-debug-stamp build-gtk-debug-contrib-stamp   \
                     build-i18n-stamp build-gtk-py-stamp
 
                     build-gtk-debug-stamp build-gtk-debug-contrib-stamp   \
                     build-i18n-stamp build-gtk-py-stamp
 


@@ -219,15 +216,10 @@ configure-gtk-shared-stamp:
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \

-                               --enable-unicode                        \
-                               --with-opengl                           \

                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \

-                               --with-libtiff=sys                      \
-                               --with-gnomeprint                       \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
+                               --with-libtiff=sys

        touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
        touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp


@@ -235,30 +227,6 @@ build-gtk-shared-stamp: configure-gtk-shared-stamp
        cd $(objdir_gtk_shared) && $(FAST_MAKE)
        touch $@
 
        cd $(objdir_gtk_shared) && $(FAST_MAKE)
        touch $@
 

-configure-gtk-static-stamp:
-       dh_testdir
-       mkdir -p $(objdir_gtk_static)
-       cd $(objdir_gtk_static) \
-               && ../configure --prefix=/usr                           \
-                               --cache-file=$(config_cache)            \
-                               --with-flavour=$(DEBIAN_WXFLAVOUR)      \
-                               --with-gtk                              \
-                               --enable-unicode                        \
-                               --with-opengl                           \
-                               --disable-shared                        \
-                               --with-zlib=sys                         \
-                               --with-libjpeg=sys                      \
-                               --with-libpng=sys                       \
-                               --with-libtiff=sys                      \
-                               --with-gnomeprint                       \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
-       touch $@
-
-build-gtk-static-stamp: configure-gtk-static-stamp
-       dh_testdir
-       cd $(objdir_gtk_static) && $(FAST_MAKE)
-       touch $@

 
 configure-gtk-debug-stamp:
        dh_testdir
 
 configure-gtk-debug-stamp:
        dh_testdir


@@ -268,16 +236,11 @@ configure-gtk-debug-stamp:
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \

-                               --enable-unicode                        \
-                               --with-opengl                           \

                                --enable-debug                          \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --enable-debug                          \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \

-                               --with-libtiff=sys                      \
-                               --with-gnomeprint                       \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
+                               --with-libtiff=sys

        touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
        touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp


@@ -293,10 +256,6 @@ build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
        #cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
        touch $@
 
        #cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
        touch $@
 

-build-gtk-static-contrib-stamp: build-gtk-static-stamp
-       dh_testdir
-       cd $(objdir_gtk_static)/contrib/src && $(FAST_MAKE)
-       touch $@

 
 build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
        dh_testdir
 
 build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
        dh_testdir


@@ -496,7 +455,7 @@ install-gtk-lib: install-gtk-shared-stamp
        dh_install $(objdir_gtk_install)/lib/libwx_*.so.*       usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
        dh_install $(objdir_gtk_install)/lib/libwx_*.so.*       usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)

-install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-gtk-shared-stamp
+install-gtk-dev: install-gtk-shared-stamp

        dh_testdir
        dh_testroot
        dh_clean -k
        dh_testdir
        dh_testroot
        dh_clean -k


@@ -504,9 +463,6 @@ install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-g
        dh_install $(objdir_gtk_install)/lib/libwx_*.so         usr/lib
        dh_install $(objdir_gtk_install)/lib/wx/include         usr/lib/wx
        dh_install $(objdir_gtk_install)/lib/wx/config/gtk*     usr/lib/wx/config
        dh_install $(objdir_gtk_install)/lib/libwx_*.so         usr/lib
        dh_install $(objdir_gtk_install)/lib/wx/include         usr/lib/wx
        dh_install $(objdir_gtk_install)/lib/wx/config/gtk*     usr/lib/wx/config

-       dh_install $(objdir_gtk_static)/lib/libwx*.a            usr/lib
-       dh_install $(objdir_gtk_static)/lib/wx/include          usr/lib/wx
-       dh_install $(objdir_gtk_static)/lib/wx/config/gtk*      usr/lib/wx/config

 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp

diff --git a/debian/wx-config.1 b/debian/wx-config.1
index 94f6a41963b67c74f9868af31c7673dcac729047..d9be63587cbe6c96ddb3e6b0857dcbd34231c15f 100644 (file)
--- a/debian/wx-config.1
+++ b/debian/wx-config.1
@@ -116,7 +116,8 @@ into your application.  If unspecified, the system default (dynamic)
 will be preferred, but any type may match in the absence of a stricter
 specification.  Static linking is mainly useful still for cross ports
 not natively supported by Debian, and can be hazardous in conjunction
 will be preferred, but any type may match in the absence of a stricter
 specification.  Static linking is mainly useful still for cross ports
 not natively supported by Debian, and can be hazardous in conjunction

-with the gtk toolkits.
+with the gtk toolkits.  Note that static libraries are no longer supplied
+in the wxGTK packages any more.

 
 .SS Compiler options
 These options generate output required to build an application using
 
 .SS Compiler options
 These options generate output required to build an application using