diff --git a/debian/copyright b/debian/copyright index d3c1527569..4000ca932d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -29,7 +29,7 @@ alters the actual terms of the authorative licence detailed below, it is intended to be purely informative of the fact that the Debian binary packages will be built primarily with features useful to Free Software developers and may not be suitable "as is" for compiling software for distribution that is -licenced incompatibly with the LGPL. See /usr/share/common-licences for +licenced incompatibly with the LGPL. See /usr/share/common-licenses for the full text of the LGPL. Modifications and additions to the Library itself are encouraged to be diff --git a/debian/rules b/debian/rules index 84122bc11c..b2e0c69e6d 100755 --- a/debian/rules +++ b/debian/rules @@ -78,10 +78,12 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \ build-wxbase-debug-stamp build-gtk-shared-stamp \ build-gtk-static-stamp build-gtk-debug-stamp \ - build-gtk-univ-stamp \ build-contrib-shared-stamp build-contrib-static-stamp \ build-gtk-py-stamp build-i18n-stamp +# disable gtk-univ build, we'll replace it with x11-univ later. +# build-gtk-univ-stamp + build_indep_stamps=build-examples-stamp build-doc-stamp build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \ @@ -95,10 +97,12 @@ build_stamps=$(build_stamps_native) $(build_cross_stamps) # Install targets: install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ install-gtk-lib install-gtk-dev install-gtk-dbg \ - install-gtk-univ \ install-gtk-contrib install-gtk-contrib-dev install-gtk-py \ install-headers install-i18n +# disable gtk-univ build, we'll replace it with x11-univ later. +# install-gtk-univ + install_all_indep=install-examples install-doc install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw @@ -631,10 +635,10 @@ install-headers: install-gtk-lib # them. Do that in a scratch dirs, and move the gtk ones last, so at least # they win in the result of any uncaught conflict. - cd $(objdir_gtk_univ) \ - && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr +# cd $(objdir_gtk_univ) \ +# && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr - dh_movefiles --sourcedir=$(objdir_univ_install) +# dh_movefiles --sourcedir=$(objdir_univ_install) dh_movefiles --sourcedir=debian/$(package_gtk_lib) dh_installmanpages \ @@ -759,13 +763,13 @@ binary-common: # building the arch specific package files needed to create them. binary-indep: build_all install $(MAKE) -f debian/rules \ - DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ + DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \ binary-common # Build just the architecture-dependent files here. binary-arch: build_arch install_arch $(MAKE) -f debian/rules \ - DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \ + DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \ binary-common # Build all packages target.