From 8155b6405f506b0d4003131d8b40d0bc00541b82 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Thu, 19 Dec 2002 09:16:10 +0000 Subject: [PATCH] Update packaging for 2.5 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- debian/changelog | 23 ++++++++++++++++++++++- debian/control.in | 4 ++-- debian/libwxgtk-python.menu | 7 +++++++ debian/rules | 14 +++++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 debian/libwxgtk-python.menu diff --git a/debian/changelog b/debian/changelog index e966ae0a1a..238747fc7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,28 @@ -wxwindows2.3 (2.3.4) unstable; urgency=low +wxwindows2.5 (2.5.0) unstable; urgency=low + + * New beginnings. Back to development flavored chaos again. + + -- Ron Lee Thu, 19 Dec 2002 01:08:50 -0800 + +wxwindows2.4 (2.4.0) unstable; urgency=low + + * The fingers crossed release. + + -- Ron Lee Thu, 19 Dec 2002 00:50:48 -0800 + +wxwindows2.3 (2.3.4.1) unstable; urgency=low * 2.4.0pre1 I guess. * Added -ffunction-sections for broken hppa linker. Closes: #162948 + * Conflict/Replace wxPython2.2. Since its nmu these two packages + can no longer currently coexist. Closes: #171258 + * xrced.py path search fixed. Closes: #168148, #170748 + * Actually install all wxUniv headers to the header package. + Closes: #168250, #164557 + * Robin tells me this one should be fixed in 2.3 too, I can't confirm + so please reopen if it's not. Closes: #172390 + * Added menu items for pycrust/pyshell, thanks Martin. Closes: #172447 + * Broken header fixed. Closes: #168887 -- Ron Lee Mon, 18 Nov 2002 18:54:21 -0800 diff --git a/debian/control.in b/debian/control.in index 218a57954b..99dc986a21 100644 --- a/debian/control.in +++ b/debian/control.in @@ -118,8 +118,8 @@ Architecture: any Section: interpreters Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends} Suggests: wxwin=V-doc, wxwin=V-examples -Conflicts: libwxgtk=V-python-contrib, python-wxwin -Replaces: libwxgtk=V-python-contrib, python-wxwin +Conflicts: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python +Replaces: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding) wxWindows is a class library for C++ providing GUI (Graphical User Interface) and other facilities on more than one platform. Version =V diff --git a/debian/libwxgtk-python.menu b/debian/libwxgtk-python.menu new file mode 100644 index 0000000000..3d98d38f7c --- /dev/null +++ b/debian/libwxgtk-python.menu @@ -0,0 +1,7 @@ +?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ + title="pycrust" command="/usr/bin/pycrust" +?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ + title="pyshell" command="/usr/bin/pyshell" +?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ + title="xrced" command="/usr/bin/xrced" + diff --git a/debian/rules b/debian/rules index a534bbee40..dfc84b823e 100755 --- a/debian/rules +++ b/debian/rules @@ -55,6 +55,7 @@ objdir_examples=docs/examples objdir_i18n=locale objdir_gtk_univ=objs_gtk_univ +objdir_univ_install=objs_univ_install objdir_wxbase_msw_shared=objs_wxbase_msw_sh objdir_wxbase_msw_static=objs_wxbase_msw_st @@ -65,7 +66,7 @@ objdir_msw_dbg=objs_msw_d objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \ $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \ - $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ + $(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ $(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static) $(objdir_wxbase_msw_dbg) \ $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg) @@ -622,7 +623,17 @@ install-headers: install-gtk-lib dh_testroot dh_clean -k dh_installdirs + +# The only way to be really sure we get the univ headers correct is to install +# 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 + + dh_movefiles --sourcedir=$(objdir_univ_install) dh_movefiles --sourcedir=debian/$(package_gtk_lib) + dh_installmanpages \ ansi2knr.1 \ jpegtran.1 \ @@ -722,6 +733,7 @@ binary-common: dh_installdocs dh_installchangelogs dh_installexamples + dh_installmenu dh_link @# Don't strip debug libs at all, and strip cross libs elsewhere -- 2.47.2