Restore the no longer default, sensible defaults.

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

diff --git a/debian/control.in b/debian/control.in
index ceada4772bf7cb5642f71e5462ef6061155a4a1b..be1912fd1c672f70b83216b88088794359857e12 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -81,7 +81,7 @@ Package: wxpython=SOV
 Architecture: any
 Section: python
 Depends: libwxgtk=SOV-python, =PY, ${shlibs:Depends}
 Architecture: any
 Section: python
 Depends: libwxgtk=SOV-python, =PY, ${shlibs:Depends}

-Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
+Suggests: wx=V-doc, wx=V-examples, =PY-xml

 Conflicts: wxpython
 Replaces: wxpython, libwxgtk2.4-python
 Provides: wxpython
 Conflicts: wxpython
 Replaces: wxpython, libwxgtk2.4-python
 Provides: wxpython


@@ -148,7 +148,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
 Package: wx=V-examples
 Architecture: all
 Section: devel
 Package: wx=V-examples
 Architecture: all
 Section: devel

-Suggests: libwxgtk=V-dev (= ${Source-Version}), wxwin=V-doc
+Suggests: libwxgtk=V-dev (= ${Source-Version}), wx=V-doc

 Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some
 Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some

diff --git a/debian/rules b/debian/rules
index 316d17626cfd54cb552cf957887f15973d92d09f..7ac56caa9442ca0f94dabe7c00c38d61498764f0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -216,10 +216,12 @@ configure-gtk-shared-stamp:
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \

+                               --with-opengl                           \
+                               --with-gnomeprint                       \

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

-                               --with-libtiff=sys
+                               --with-libtiff=sys                      \

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


@@ -236,11 +238,14 @@ 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-debug                          \
+                               --with-opengl                           \
+                               --with-gnomeprint                       \

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

-                               --with-libtiff=sys
+                               --with-libtiff=sys                      \
+                               --enable-debug                          \
+                               --enable-unicode

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