diff -Nru wxwidgets3.0-3.0.0/debian/changelog wxwidgets3.0-3.0.0/debian/changelog --- wxwidgets3.0-3.0.0/debian/changelog 2014-05-21 05:47:15.000000000 +0200 +++ wxwidgets3.0-3.0.0/debian/changelog 2014-05-24 18:04:28.000000000 +0200 @@ -1,3 +1,11 @@ +wxwidgets3.0 (3.0.0-4) unstable; urgency=medium + + * Fixing webview wrongly exported with wx-config --libs + * Add autoconf as b-d, regenerating control file + * optional-webview.patch, make webview optional lib + + -- Gianfranco Costamagna Sat, 24 May 2014 18:04:10 +0200 + wxwidgets3.0 (3.0.0-3) unstable; urgency=medium [ Gianfranco Costamagna ] diff -Nru wxwidgets3.0-3.0.0/debian/control wxwidgets3.0-3.0.0/debian/control --- wxwidgets3.0-3.0.0/debian/control 2014-05-21 06:10:38.000000000 +0200 +++ wxwidgets3.0-3.0.0/debian/control 2014-05-24 19:34:01.000000000 +0200 @@ -1,7 +1,7 @@ Source: wxwidgets3.0 Section: libs Priority: optional -Build-Depends: debhelper (>= 9), gettext, libgtk2.0-dev, +Build-Depends: debhelper (>= 9), autoconf, gettext, libgtk2.0-dev, zlib1g-dev, libjpeg-dev, libpng-dev, libtiff5-dev, libsm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, autotools-dev, libexpat1-dev, dpkg-dev (>= 1.16.1~), diff -Nru wxwidgets3.0-3.0.0/debian/control.in wxwidgets3.0-3.0.0/debian/control.in --- wxwidgets3.0-3.0.0/debian/control.in 2014-05-21 06:09:41.000000000 +0200 +++ wxwidgets3.0-3.0.0/debian/control.in 2014-05-24 19:33:48.000000000 +0200 @@ -1,7 +1,7 @@ Source: wxwidgets=V Section: libs Priority: optional -Build-Depends: debhelper (>= 9), gettext, libgtk2.0-dev, +Build-Depends: debhelper (>= 9), autoconf, gettext, libgtk2.0-dev, zlib1g-dev, libjpeg-dev, libpng-dev, libtiff5-dev, libsm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, autotools-dev, libexpat1-dev, dpkg-dev (>= 1.16.1~), diff -Nru wxwidgets3.0-3.0.0/debian/patches/optional-webview.patch wxwidgets3.0-3.0.0/debian/patches/optional-webview.patch --- wxwidgets3.0-3.0.0/debian/patches/optional-webview.patch 1970-01-01 01:00:00.000000000 +0100 +++ wxwidgets3.0-3.0.0/debian/patches/optional-webview.patch 2014-05-24 18:04:06.000000000 +0200 @@ -0,0 +1,19 @@ +--- wxwidgets3.0-3.0.0.orig/configure.in ++++ wxwidgets3.0-3.0.0/configure.in +@@ -7615,7 +7615,7 @@ dnl ------------------------------------ + STD_BASE_LIBS="base" + STD_GUI_LIBS="" + BUILT_WX_LIBS="base" +-ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base" ++ALL_WX_LIBS="xrc stc gl webview media qa html adv core xml net base" + + if test "$wxUSE_SOCKETS" = "yes" ; then + STD_BASE_LIBS="net $STD_BASE_LIBS" +@@ -7660,7 +7660,6 @@ if test "$wxUSE_GUI" = "yes"; then + BUILT_WX_LIBS="stc $BUILT_WX_LIBS" + fi + if test "$wxUSE_WEBVIEW" = "yes" ; then +- STD_GUI_LIBS="webview $STD_GUI_LIBS" + BUILT_WX_LIBS="webview $BUILT_WX_LIBS" + fi + if test "$wxUSE_XRC" = "yes" ; then diff -Nru wxwidgets3.0-3.0.0/debian/patches/series wxwidgets3.0-3.0.0/debian/patches/series --- wxwidgets3.0-3.0.0/debian/patches/series 2014-05-21 05:36:12.000000000 +0200 +++ wxwidgets3.0-3.0.0/debian/patches/series 2014-05-24 18:04:00.000000000 +0200 @@ -3,3 +3,4 @@ fix-wxvector-overallocation.patch fix-bug-736374.patch propgrid-assertion-fixes.patch +optional-webview.patch diff -Nru wxwidgets3.0-3.0.0/debian/rules wxwidgets3.0-3.0.0/debian/rules --- wxwidgets3.0-3.0.0/debian/rules 2014-05-21 06:08:05.000000000 +0200 +++ wxwidgets3.0-3.0.0/debian/rules 2014-05-24 19:26:58.000000000 +0200 @@ -164,7 +164,7 @@ # Build stamps: -build_arch_stamps = build-wxbase-shared-stamp \ +build_arch_stamps = configure build-wxbase-shared-stamp \ build-gtk-shared-stamp build-gtk-shared-contrib-stamp \ build-i18n-stamp @@ -255,7 +255,10 @@ # the config files for wxbase, so we configure a wxbase tree to get # these (but we don't need to actually build it). -configure-wxbase-shared-stamp: config.guess +configure: + autoconf + +configure-wxbase-shared-stamp: config.guess dh_testdir mkdir -p $(objdir_wxbase_shared) cd $(objdir_wxbase_shared) \ @@ -359,7 +362,7 @@ dh_testdir dh_testroot - rm -rf config_deb.cache config_deb_cross.cache $(objdirs) + rm -rf configure config_deb.cache config_deb_cross.cache $(objdirs) dh_clean rm -f debian/$(package_wxbase_lib).* \