[maemo-commits] [maemo-commits] r8740 - in projects/haf/trunk/python: . debian
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Dec 13 15:22:07 EET 2006
- Previous message: [maemo-commits] r8738 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop
- Next message: [maemo-commits] r8741 - projects/haf/trunk/python/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: osantana Date: 2006-12-13 15:22:01 +0200 (Wed, 13 Dec 2006) New Revision: 8740 Modified: projects/haf/trunk/python/debian/changelog projects/haf/trunk/python/debian/onlysdk projects/haf/trunk/python/debian/rules projects/haf/trunk/python/setup.py Log: - put the readline module in -dev package Modified: projects/haf/trunk/python/debian/changelog =================================================================== --- projects/haf/trunk/python/debian/changelog 2006-12-13 13:19:32 UTC (rev 8739) +++ projects/haf/trunk/python/debian/changelog 2006-12-13 13:22:01 UTC (rev 8740) @@ -1,3 +1,9 @@ +python2.5 (2.5.0-1osso4) unstable; urgency=low + + * put the readline module in -dev package + + -- Osvaldo Santana Neto <osvaldo.santana at indt.org.br> Wed, 13 Dec 2006 10:16:11 -0300 + python2.5 (2.5.0-1osso3) unstable; urgency=low * moving the subprocess module to runtime package Modified: projects/haf/trunk/python/debian/onlysdk =================================================================== --- projects/haf/trunk/python/debian/onlysdk 2006-12-13 13:19:32 UTC (rev 8739) +++ projects/haf/trunk/python/debian/onlysdk 2006-12-13 13:22:01 UTC (rev 8740) @@ -40,6 +40,7 @@ trace tty user +readline xdrlib LICENSE\.txt aifc Modified: projects/haf/trunk/python/debian/rules =================================================================== --- projects/haf/trunk/python/debian/rules 2006-12-13 13:19:32 UTC (rev 8739) +++ projects/haf/trunk/python/debian/rules 2006-12-13 13:22:01 UTC (rev 8740) @@ -25,9 +25,7 @@ dh_testroot rm -f stamp-* -$(MAKE) clean - rm -rf Lib/test/db_home - rm -rf build - rm -rf locales + -rm -rf config.log Lib/test/db_home build locales -find -name '*.py[co]' | xargs -n 50 rm -f dh_clean @@ -114,8 +112,13 @@ mv $(d_dev)/$(scriptdir)/sre_constants.pyo $(d_base)/$(scriptdir) mv $(d_dev)/$(scriptdir)/sre_parse.pyo $(d_base)/$(scriptdir) mv $(d_dev)/$(scriptdir)/site-packages $(d_base)/$(scriptdir) - mv $(d_dev)/$(scriptdir)/lib-dynload $(d_base)/$(scriptdir) mv $(d_dev)/$(scriptdir)/plat-linux2/*.pyo $(d_base)/$(scriptdir)/plat-linux2 + + mkdir $(d_base)/$(scriptdir)/lib-dynload + for i in `find $(d_dev)/$(scriptdir)/lib-dynload -type f | grep -v -f $(only_dev_list)`; do \ + mv $$i $(d_base)/$(scriptdir)/lib-dynload; \ + done + (cd $(d_dev)/$(scriptdir) && \ find . -name "*.pyo" -type f | \ grep -v -f $(only_dev_list) | \ @@ -156,17 +159,17 @@ find $(d_base) $(d_dev) -name .cvsignore | xargs rm -f find $(d_base) $(d_dev) -name "*.exe" | xargs rm -f - # default python TODO + # default python # ============== - ln -sf $(PYTHON).1 $(d_dev)/usr/share/man/man1/python.1 # TODO: put in postinst script - (cd $(d_base)/usr/bin && ln -sf python$(PYVER) python) # TODO: put in postinst script + ln -sf $(PYTHON).1 $(d_dev)/usr/share/man/man1/python.1 + (cd $(d_base)/usr/bin && ln -sf python$(PYVER) python) ln -sf /usr/lib/python$(PYVER)/pdb.py $(d_dev)/usr/bin/pdb$(PYVER) - ln -sf pdb$(PYVER) $(d_dev)/usr/bin/pdb # TODO: put in postinst script + ln -sf pdb$(PYVER) $(d_dev)/usr/bin/pdb ln -sf /usr/lib/python$(PYVER)/pydoc.py $(d_dev)/usr/bin/pydoc$(PYVER) - ln -sf pydoc$(PYVER) $(d_dev)/usr/bin/pydoc # TODO: put in postinst script + ln -sf pydoc$(PYVER) $(d_dev)/usr/bin/pydoc cp -p Tools/i18n/pygettext.py $(d_dev)/usr/bin/pygettext$(PYVER) - ln -sf pygettext$(PYVER) $(d_dev)/usr/bin/pygettext # TODO: put in postinst script + ln -sf pygettext$(PYVER) $(d_dev)/usr/bin/pygettext for i in `find $(d_base) $(d_dev) -type f`; do \ sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/env $(PYTHON)\1,' $$i > $$i.temp; \ Modified: projects/haf/trunk/python/setup.py =================================================================== --- projects/haf/trunk/python/setup.py 2006-12-13 13:19:32 UTC (rev 8739) +++ projects/haf/trunk/python/setup.py 2006-12-13 13:22:01 UTC (rev 8740) @@ -467,43 +467,42 @@ # Read SGI RGB image files (but coded portably) exts.append( Extension('rgbimg', ['rgbimgmodule.c']) ) -# INdT -# # readline -# do_readline = self.compiler.find_library_file(lib_dirs, 'readline') -# if platform == 'darwin': -# # MacOSX 10.4 has a broken readline. Don't try to build -# # the readline module unless the user has installed a fixed -# # readline package -# if find_file('readline/rlconf.h', inc_dirs, []) is None: -# do_readline = False -# if do_readline: -# if sys.platform == 'darwin': -# # In every directory on the search path search for a dynamic -# # library and then a static library, instead of first looking -# # for dynamic libraries on the entiry path. -# # This way a staticly linked custom readline gets picked up -# # before the (broken) dynamic library in /usr/lib. -# readline_extra_link_args = ('-Wl,-search_paths_first',) -# else: -# readline_extra_link_args = () -# -# readline_libs = ['readline'] -# if self.compiler.find_library_file(lib_dirs, -# 'ncursesw'): -# readline_libs.append('ncursesw') -# elif self.compiler.find_library_file(lib_dirs, -# 'ncurses'): -# readline_libs.append('ncurses') -# elif self.compiler.find_library_file(lib_dirs, 'curses'): -# readline_libs.append('curses') -# elif self.compiler.find_library_file(lib_dirs + -# ['/usr/lib/termcap'], -# 'termcap'): -# readline_libs.append('termcap') -# exts.append( Extension('readline', ['readline.c'], -# library_dirs=['/usr/lib/termcap'], -# extra_link_args=readline_extra_link_args, -# libraries=readline_libs) ) + # readline + do_readline = self.compiler.find_library_file(lib_dirs, 'readline') + if platform == 'darwin': + # MacOSX 10.4 has a broken readline. Don't try to build + # the readline module unless the user has installed a fixed + # readline package + if find_file('readline/rlconf.h', inc_dirs, []) is None: + do_readline = False + if do_readline: + if sys.platform == 'darwin': + # In every directory on the search path search for a dynamic + # library and then a static library, instead of first looking + # for dynamic libraries on the entiry path. + # This way a staticly linked custom readline gets picked up + # before the (broken) dynamic library in /usr/lib. + readline_extra_link_args = ('-Wl,-search_paths_first',) + else: + readline_extra_link_args = () + + readline_libs = ['readline'] + if self.compiler.find_library_file(lib_dirs, + 'ncursesw'): + readline_libs.append('ncursesw') + elif self.compiler.find_library_file(lib_dirs, + 'ncurses'): + readline_libs.append('ncurses') + elif self.compiler.find_library_file(lib_dirs, 'curses'): + readline_libs.append('curses') + elif self.compiler.find_library_file(lib_dirs + + ['/usr/lib/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], + library_dirs=['/usr/lib/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) if platform not in ['mac']: # crypt module.
- Previous message: [maemo-commits] r8738 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop
- Next message: [maemo-commits] r8741 - projects/haf/trunk/python/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]