fixed paper size calculation (convert from 10ths of mm to mm correctly)

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index ae5606b716d843e9ac39250d47b25c04bc5dff0d..bc44d142a2fbe6a02ac84ed9d886e31141a59970 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -482,6 +482,7 @@ clean: debian/control
                && ./setup.py clean \
                && rm -rf licence \
                && rm -rf build \
                && ./setup.py clean \
                && rm -rf licence \
                && rm -rf build \

+               && rm -rf contrib/gizmos/contrib \

                && rm -rf contrib/ogl/contrib \
                && rm -rf contrib/stc/contrib \
                && rm -rf contrib/xrc/contrib \
                && rm -rf contrib/ogl/contrib \
                && rm -rf contrib/stc/contrib \
                && rm -rf contrib/xrc/contrib \


@@ -577,6 +578,7 @@ install-gtk-univ: build-gtk-univ-stamp
        dh_installdirs
        cp -a $(objdir_gtk_univ)/lib/* debian/$(package_gtk_univ)/usr/lib
        cp $(objdir_gtk_univ)/wxgtkuniv-$(release)-config debian/$(package_gtk_univ)/usr/bin/
        dh_installdirs
        cp -a $(objdir_gtk_univ)/lib/* debian/$(package_gtk_univ)/usr/lib
        cp $(objdir_gtk_univ)/wxgtkuniv-$(release)-config debian/$(package_gtk_univ)/usr/bin/

+       cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)

 
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
 install-gtk-contrib: build-contrib-shared-stamp
 
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
 install-gtk-contrib: build-contrib-shared-stamp


@@ -718,7 +720,9 @@ binary-common:
 
        @# Don't strip debug libs at all, and strip cross libs elsewhere
        @# with the cross host tools until dh_strip gets smarter.
 
        @# Don't strip debug libs at all, and strip cross libs elsewhere
        @# with the cross host tools until dh_strip gets smarter.

-       dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) -N$(package_wxbase_msw_dbg) -N$(package_msw_dbg)
+       dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
+                -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) \
+                -N$(package_msw_dev) -N$(package_msw_dbg)

 
        dh_compress
        dh_fixperms
 
        dh_compress
        dh_fixperms


@@ -796,6 +800,9 @@ binary-univ: control-files-stamp install-gtk-univ
 binary-doc: control-files-stamp install-doc
        $(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
 
 binary-doc: control-files-stamp install-doc
        $(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
 

+binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers install-headers-msw
+       $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common
+

 
 .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
 
 .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \