diff -u wxwidgets2.8-2.8.12.1/debian/control wxwidgets2.8-2.8.12.1/debian/control --- wxwidgets2.8-2.8.12.1/debian/control +++ wxwidgets2.8-2.8.12.1/debian/control @@ -6,7 +6,8 @@ zlib1g-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, libsm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev, quilt, autotools-dev, libexpat1-dev, - binutils (>= 2.19.51.20090827) | binutils (<= 2.18.1~cvs20080103-7) + binutils (>= 2.19.51.20090827) | binutils (<= 2.18.1~cvs20080103-7), + libxt-dev, libgstreamer-plugins-base0.10-dev, libgconf2-dev Maintainer: wxWidgets Maintainers Uploaders: Ryan Niebur , Ron Lee , Olly Betts Standards-Version: 3.9.2 @@ -120,6 +121,36 @@ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which provides many internal checks by wxWidgets itself that are not performed on apps compiled with the 'release version' libs in the -dev package. + +Package: libwxgtk-media2.8-0 +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the media shared libraries needed to run programs linked + against libwx_gtk2u_media. + +Package: libwxgtk-media2.8-dbg +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Section: debug +Priority: extra +Multi-Arch: same +Depends: ${shlibs:Depends}, wx2.8-headers (= ${binary:Version}), libwxgtk2.8-dbg (= ${binary:Version}), ${misc:Depends} +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ debug) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). + . + This package provides a debug version of the gtk-media library. It is compiled + both with -g for normal debugger tracing and with the __WXDEBUG__ flag which + provides many internal checks by wxWidgets itself that are not performed on + apps compiled with the 'release version' libs in the -dev package. Package: python-wxgtk2.8 Architecture: any diff -u wxwidgets2.8-2.8.12.1/debian/lintian-override.in wxwidgets2.8-2.8.12.1/debian/lintian-override.in --- wxwidgets2.8-2.8.12.1/debian/lintian-override.in +++ wxwidgets2.8-2.8.12.1/debian/lintian-override.in @@ -6,0 +7,3 @@ +libwxgtk-media=V=U-dbg: non-dev-pkg-with-shlib-symlink +libwxgtk-media=V=U-dbg: package-name-doesnt-match-sonames +libwxgtk-media=SOV=U: package-name-doesnt-match-sonames diff -u wxwidgets2.8-2.8.12.1/debian/control.in wxwidgets2.8-2.8.12.1/debian/control.in --- wxwidgets2.8-2.8.12.1/debian/control.in +++ wxwidgets2.8-2.8.12.1/debian/control.in @@ -6,7 +6,8 @@ zlib1g-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, libsm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev, quilt, autotools-dev, libexpat1-dev, - binutils (>= 2.19.51.20090827) | binutils (<= 2.18.1~cvs20080103-7) + binutils (>= 2.19.51.20090827) | binutils (<= 2.18.1~cvs20080103-7), + libxt-dev, libgstreamer-plugins-base0.10-dev, libgconf2-dev Maintainer: wxWidgets Maintainers Uploaders: Ryan Niebur , Ron Lee , Olly Betts Standards-Version: 3.9.2 @@ -88,6 +89,19 @@ against wxWidgets. To use the (optional) glcanvas library you will need to have Mesa or OpenGL installed. +Package: libwxgtk-media=SOV=U +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime) + wxWidgets (formerly known as wxWindows) is a class library for C++ providing + GUI components and other facilities on several popular platforms (and some + unpopular ones as well). For more information see http://wxwidgets.org + . + This package provides the media shared libraries needed to run programs linked + against libwx_gtk2u_media. + Package: libwxgtk=V=U-dev Architecture: any Section: libdevel diff -u wxwidgets2.8-2.8.12.1/debian/rules wxwidgets2.8-2.8.12.1/debian/rules --- wxwidgets2.8-2.8.12.1/debian/rules +++ wxwidgets2.8-2.8.12.1/debian/rules @@ -8,7 +8,7 @@ SHELL = /bin/bash -#export DH_VERBOSE=1 +export DH_VERBOSE=1 include /usr/share/python/python.mk include /usr/share/quilt/quilt.make @@ -130,8 +130,8 @@ --with-libjpeg=sys \ --with-libpng=sys \ --with-libtiff=sys \ + --enable-mediactrl \ --libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) -# --enable-mediactrl \ MSW_CONFIGURE_OPTIONS = \ --with-msw \ @@ -175,8 +175,8 @@ package_gtk_dev := libwxgtk$(release)$(unicode_suffix)-dev package_gtk_dbg := libwxgtk$(release)$(unicode_suffix)-dbg - - +package_gtkmedia_lib := libwxgtk-media$(sorelease)$(unicode_suffix) +package_gtkmedia_dbg := libwxgtk-media$(release)$(unicode_suffix)-dbg package_gtk_py_lib := python-wxgtk$(release)$(unicode_suffix) package_gtk_py_ver = python-wxversion @@ -260,6 +260,7 @@ # Install targets: install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ install-gtk-lib install-gtk-dev install-gtk-dbg \ + install-gtkmedia-lib install-gtkmedia-dbg \ install-headers install-i18n \ install-gtk-py install-gtk-dbg-py @@ -710,7 +711,7 @@ dh_testdir dh_testroot dh_prep - dh_install $(objdir_gtk_install)/lib/$(DEB_HOST_MULTIARCH)/libwx_gtk*.so.* usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -X_media $(objdir_gtk_install)/lib/$(DEB_HOST_MULTIARCH)/libwx_gtk*.so.* usr/lib/$(DEB_HOST_MULTIARCH) dh_installdirs usr/share/lintian/overrides grep ^$(package_gtk_lib): debian/lintian-override > debian/$(package_gtk_lib)/usr/share/lintian/overrides/$(package_gtk_lib) @@ -719,7 +720,7 @@ dh_testdir dh_testroot dh_prep - dh_install $(objdir_gtk_install)/lib/$(DEB_HOST_MULTIARCH)/libwx_gtk*.so usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -X_media $(objdir_gtk_install)/lib/$(DEB_HOST_MULTIARCH)/libwx_gtk*.so usr/lib/$(DEB_HOST_MULTIARCH) dh_install $(objdir_gtk_install)/lib/$(DEB_HOST_MULTIARCH)/wx/include usr/lib/$(DEB_HOST_MULTIARCH)/wx dh_install $(objdir_gtk_install)/lib/$(DEB_HOST_MULTIARCH)/wx/config/gtk* usr/lib/$(DEB_HOST_MULTIARCH)/wx/config @@ -728,12 +729,29 @@ dh_testdir dh_testroot dh_prep - dh_install $(objdir_gtk_debug)/lib/libwx_gtk* usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -X_media $(objdir_gtk_debug)/lib/libwx_gtk* usr/lib/$(DEB_HOST_MULTIARCH) dh_install $(objdir_gtk_debug)/lib/wx/include usr/lib/$(DEB_HOST_MULTIARCH)/wx dh_install $(objdir_gtk_debug)/lib/wx/config/gtk* usr/lib/$(DEB_HOST_MULTIARCH)/wx/config dh_installdirs usr/share/lintian/overrides grep ^$(package_gtk_dbg): debian/lintian-override > debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg) +install-gtkmedia-lib: DH_OPTIONS=-p$(package_gtkmedia_lib) +install-gtkmedia-lib: install-gtk-shared-stamp + dh_testdir + dh_testroot + dh_prep + dh_install $(objdir_gtk_install)/lib/$(DEB_HOST_MULTIARCH)/libwx_gtk*media*.so.* usr/lib/$(DEB_HOST_MULTIARCH) + dh_installdirs usr/share/lintian/overrides + grep ^$(package_gtkmedia_lib): debian/lintian-override > debian/$(package_gtkmedia_lib)/usr/share/lintian/overrides/$(package_gtkmedia_lib) + +install-gtkmedia-dbg: DH_OPTIONS=-p$(package_gtkmedia_dbg) +install-gtkmedia-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp + dh_testdir + dh_testroot + dh_prep + dh_install $(objdir_gtk_debug)/lib/libwx_gtk*media* usr/lib/$(DEB_HOST_MULTIARCH) + dh_installdirs usr/share/lintian/overrides + grep ^$(package_gtkmedia_dbg): debian/lintian-override > debian/$(package_gtkmedia_dbg)/usr/share/lintian/overrides/$(package_gtkmedia_dbg) install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib) install-gtk-py-lib: install-gtk-py-lib-pre $(PYVERS:%=install-gtk-pylib%) @@ -1012,7 +1030,7 @@ endif dh_installdeb - dh_shlibdeps -ldebian/$(package_wxbase_lib)/usr/lib:debian/$(package_wxbase_dbg)/usr/lib:debian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib + dh_shlibdeps -ldebian/$(package_wxbase_lib)/usr/lib:debian/$(package_wxbase_dbg)/usr/lib:debian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib:debian/$(package_gtkmedia_lib):debian/$(package_gtkmedia_dbg) dh_gencontrol dh_md5sums dh_builddeb @@ -1065,7 +1083,7 @@ DH_OPTIONS_GTK := -p$(package_wxbase_lib) -p$(package_gtk_lib) -p$(package_headers) # libwxgtk shared lib package -binary-gtk: control-files-stamp install-gtk-lib install-wxbase-lib install-headers +binary-gtk: control-files-stamp install-gtk-lib install-wxbase-lib install-headers install-gtkmedia-lib $(MAKE) -f debian/rules DH_OPTIONS="$(DH_OPTIONS_GTK)" binary-common binary-gtk-dev: control-files-stamp install-gtk-dev install-wxbase-dev install-headers @@ -1073,7 +1091,7 @@ DH_OPTIONS="-p$(package_wxbase_dev) -p$(package_gtk_dev) $(DH_OPTIONS_GTK)" \ binary-common -binary-gtk-dbg: control-files-stamp install-gtk-dbg install-wxbase-dbg install-headers +binary-gtk-dbg: control-files-stamp install-gtk-dbg install-wxbase-dbg install-headers install-gtkmedia-dbg $(MAKE) -f debian/rules \ DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_gtk_dbg) -p$(package_headers)" \ binary-common @@ -1092,7 +1110,7 @@ binary-wxbase binary-wxbase-dev binary-wxbase-dbg \ binary-doc binary-cross binary-dbg-py \ install install_arch install-gtk-lib install-gtk-dev \ - install-gtk-dbg \ + install-gtk-dbg install-gtkmedia-lib install-gtkmedia-dbg \ install-gtk-py install-gtk-py-tools install-gtk-py-ver \ install-gtk-py-lib install-gtk-dbg-py \ install-common install-headers install-i18n install-doc \ diff -u wxwidgets2.8-2.8.12.1/debian/changelog wxwidgets2.8-2.8.12.1/debian/changelog --- wxwidgets2.8-2.8.12.1/debian/changelog +++ wxwidgets2.8-2.8.12.1/debian/changelog @@ -1,3 +1,24 @@ +wxwidgets2.8 (2.8.12.1-7.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules: + - enable mediactrl to build libwx_gtk2u_media-2.8 (closes: #588104) + - add install-gtkmedia-lib and install-gtkmedia-dbg targets + - modify install-gtk-lib and install-gtk-dbg to exclude libwx_gtk2u_media + libs + - add the 2 new libwgtk-media packages to dh_shlibdeps call so that + dependencies are calculated correctly + - also add them to binary-gtk and binary-gtk-dbg targets + * debian/control, debian/control.in: + - add b-d on libxt-dev, libgstreamer-plugins-base0.10-dev and + libgconf2-dev to build libwx_gtk2u_media + - create libwxgtk-media2.8 and libwxgtk-media2.8-dbg packages for + libwx_gtk2u_media and avoid dependency on gconf in libwxgtk2.8 package + * lintian-override.in: added lines for the 2 new packages and avoid lintian + errors/warnings + + -- Fabrice Coutadeur Sat, 18 Feb 2012 17:23:17 +0000 + wxwidgets2.8 (2.8.12.1-7) unstable; urgency=low * Fix path to one of the bogus executable files in wx2.8-examples so it gets