CVS tags cleaning (with other minor cleaning).

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 859d2ff7d9ae61a9230be087d75245eb0a225113..6e30aa455462aa1fbdf902b8d82014ae377d99be 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -153,7 +153,7 @@ package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg
 
 
 
 
 
 

-package_gtk_py_lib      := python-wxgtk$(release)
+package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)

 package_gtk_py_ver       = python-wxversion
 package_gtk_py_tools     = python-wxtools
 
 package_gtk_py_ver       = python-wxversion
 package_gtk_py_tools     = python-wxtools
 


@@ -168,12 +168,12 @@ package_common           = wx-common
 common_packages        := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools)
 
 
 common_packages        := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools)
 
 

-package_gtk_dbg_py      := python-wxgtk$(release)-dbg
+package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg

 
 
 
 
 
 

-package_msw_dev         := libwxmsw$(release)-dev
-package_msw_dbg         := libwxmsw$(release)-dbg
+package_msw_dev         := libwxmsw$(release)$(unicode_suffix)-dev
+package_msw_dbg         := libwxmsw$(release)$(unicode_suffix)-dbg

 package_headers_msw     := wx$(release)-headers-msw
 
 # The packages listed here will not be built by default.
 package_headers_msw     := wx$(release)-headers-msw
 
 # The packages listed here will not be built by default.


@@ -777,10 +777,13 @@ install-common: install-gtk-shared-stamp
        dh_testroot
        dh_clean -k
 
        dh_testroot
        dh_clean -k
 

-       dh_install $(objdir_gtk_install)/share/aclocal  usr/share
+       dh_install $(objdir_gtk_install)/share/bakefile/presets usr/share/bakefile
+       dh_install $(objdir_gtk_install)/share/bakefile/presets/wx*.bkl usr/share/bakefile/presets
+
+       dh_install $(objdir_gtk_install)/share/aclocal usr/share

        dh_installman debian/wx-config.1
 
        dh_installman debian/wx-config.1
 

-       dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin
+       dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin

        dh_installman debian/wxrc-tools.1
        dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
 
        dh_installman debian/wxrc-tools.1
        dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
 


@@ -940,7 +943,7 @@ binary-common:
        fi
 
        dh_installdeb
        fi
 
        dh_installdeb

-       dh_shlibdeps -ldebian/$(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

        dh_gencontrol
        dh_md5sums
        dh_builddeb
        dh_gencontrol
        dh_md5sums
        dh_builddeb