~ubuntu-branches/ubuntu/oneiric/python2.6/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/distutils-install-layout.diff

Committer: Bazaar Package Importer
Author(s): Matthias Klose
Date: 2010-08-07 20:03:08 UTC
mfrom: (10.1.27 sid)
Revision ID: james.westby@ubuntu.com-20100807200308-bwsyymoc4donr9a9

Tags: 2.6.6~rc1-1ubuntu1

* Merge with Debian; remaining changes:
- Regenerate the control file.

files removed:
Lib/locale.py~

files modified:
Doc/Makefile

Doc/c-api/unicode.rst

Doc/c-api/weakref.rst

Doc/distutils/apiref.rst

Doc/distutils/builtdist.rst

Doc/distutils/extending.rst

Doc/distutils/setupscript.rst

Doc/distutils/sourcedist.rst

Doc/documenting/markup.rst

Doc/extending/extending.rst

Doc/faq/extending.rst

Doc/glossary.rst

Doc/install/index.rst

Doc/library/cgi.rst

Doc/library/cmd.rst

Doc/library/collections.rst

Doc/library/configparser.rst

Doc/library/constants.rst

Doc/library/cookielib.rst

Doc/library/csv.rst

Doc/library/datetime.rst

Doc/library/difflib.rst

Doc/library/dis.rst

Doc/library/ftplib.rst

Doc/library/functions.rst

Doc/library/htmlparser.rst

Doc/library/itertools.rst

Doc/library/locale.rst

Doc/library/logging.rst

Doc/library/optparse.rst

Doc/library/os.path.rst

Doc/library/os.rst

Doc/library/re.rst

Doc/library/select.rst

Doc/library/stdtypes.rst

Doc/library/subprocess.rst

Doc/library/sys.rst

Doc/library/test.rst

Doc/library/threading.rst

Doc/library/trace.rst

Doc/library/urllib2.rst

Doc/library/zipfile.rst

Doc/reference/lexical_analysis.rst

Doc/tools/sphinxext/indexsidebar.html

Doc/tutorial/classes.rst

Doc/using/cmdline.rst

Doc/whatsnew/2.0.rst

Doc/whatsnew/2.5.rst

Include/Python.h

Include/patchlevel.h

Lib/ConfigParser.py

Lib/Cookie.py

Lib/StringIO.py

Lib/_MozillaCookieJar.py

Lib/aifc.py

Lib/asyncore.py

Lib/bdb.py

Lib/binhex.py

Lib/bsddb/__init__.py

Lib/bsddb/dbobj.py

Lib/bsddb/dbshelve.py

Lib/bsddb/dbtables.py

Lib/bsddb/dbutils.py

Lib/bsddb/test/test_all.py

Lib/bsddb/test/test_basics.py

Lib/bsddb/test/test_compare.py

Lib/bsddb/test/test_dbobj.py

Lib/bsddb/test/test_dbshelve.py

Lib/bsddb/test/test_dbtables.py

Lib/bsddb/test/test_join.py

Lib/bsddb/test/test_recno.py

Lib/bsddb/test/test_replication.py

Lib/bsddb/test/test_thread.py

Lib/calendar.py

Lib/cgi.py

Lib/cgitb.py

Lib/cmd.py

Lib/compiler/ast.py

Lib/compiler/pycodegen.py

Lib/cookielib.py

Lib/ctypes/test/test_callbacks.py

Lib/ctypes/test/test_pep3118.py

Lib/ctypes/test/test_structures.py

Lib/curses/wrapper.py

Lib/dbhash.py

Lib/decimal.py

Lib/distutils/__init__.py

Lib/distutils/archive_util.py

Lib/distutils/command/bdist_msi.py

Lib/distutils/command/bdist_wininst.py

Lib/distutils/command/build_ext.py

Lib/distutils/command/build_py.py

Lib/distutils/dir_util.py

Lib/distutils/filelist.py

Lib/distutils/sysconfig.py

Lib/distutils/tests/test_build_ext.py

Lib/distutils/util.py

Lib/doctest.py

Lib/email/feedparser.py

Lib/email/test/test_email.py

Lib/email/test/test_email_renamed.py

Lib/encodings/utf_16.py

Lib/encodings/utf_8_sig.py

Lib/fnmatch.py

Lib/formatter.py

Lib/getopt.py

Lib/hotshot/log.py

Lib/httplib.py

Lib/idlelib/AutoComplete.py

Lib/idlelib/AutoCompleteWindow.py

Lib/idlelib/Bindings.py

Lib/idlelib/CallTips.py

Lib/idlelib/ClassBrowser.py

Lib/idlelib/CodeContext.py

Lib/idlelib/ColorDelegator.py

Lib/idlelib/Debugger.py

Lib/idlelib/EditorWindow.py

Lib/idlelib/FileList.py

Lib/idlelib/FormatParagraph.py

Lib/idlelib/GrepDialog.py

Lib/idlelib/HyperParser.py

Lib/idlelib/IOBinding.py

Lib/idlelib/IdleHistory.py

Lib/idlelib/MultiCall.py

Lib/idlelib/ObjectBrowser.py

Lib/idlelib/OutputWindow.py

Lib/idlelib/ParenMatch.py

Lib/idlelib/PathBrowser.py

Lib/idlelib/Percolator.py

Lib/idlelib/PyShell.py

Lib/idlelib/RemoteDebugger.py

Lib/idlelib/RemoteObjectBrowser.py

Lib/idlelib/ReplaceDialog.py

Lib/idlelib/ScriptBinding.py

Lib/idlelib/SearchDialog.py

Lib/idlelib/StackViewer.py

Lib/idlelib/TreeWidget.py

Lib/idlelib/UndoDelegator.py

Lib/idlelib/ZoomHeight.py

Lib/idlelib/aboutDialog.py

Lib/idlelib/configDialog.py

Lib/idlelib/configHandler.py

Lib/idlelib/idlever.py

Lib/idlelib/keybindingDialog.py

Lib/idlelib/macosxSupport.py

Lib/idlelib/run.py

Lib/imaplib.py

Lib/imputil.py

Lib/io.py

Lib/logging/config.py

Lib/mailbox.py *

Lib/ntpath.py

Lib/pdb.py

Lib/platform.py

Lib/posixpath.py

Lib/pprint.py

Lib/pydoc.py

Lib/pydoc_topics.py

Lib/robotparser.py

Lib/sets.py

Lib/sndhdr.py

Lib/socket.py

Lib/sqlite3/test/types.py

Lib/sqlite3/test/userfunctions.py

Lib/subprocess.py

Lib/sunau.py

Lib/tarfile.py

Lib/test/decimaltestdata/extra.decTest

Lib/test/infinite_reload.py

Lib/test/inspect_fodder.py

Lib/test/list_tests.py

Lib/test/mapping_tests.py

Lib/test/regrtest.py

Lib/test/string_tests.py

Lib/test/test_MimeWriter.py

Lib/test/test_StringIO.py

Lib/test/test_anydbm.py

Lib/test/test_array.py

Lib/test/test_ast.py

Lib/test/test_asyncore.py

Lib/test/test_atexit.py

Lib/test/test_augassign.py

Lib/test/test_bigmem.py

Lib/test/test_binascii.py

Lib/test/test_binop.py

Lib/test/test_bool.py

Lib/test/test_bsddb.py

Lib/test/test_bsddb3.py

Lib/test/test_buffer.py

Lib/test/test_builtin.py

Lib/test/test_bz2.py

Lib/test/test_call.py

Lib/test/test_cgi.py

Lib/test/test_class.py

Lib/test/test_cmd.py

Lib/test/test_coercion.py

Lib/test/test_commands.py

Lib/test/test_compile.py

Lib/test/test_compiler.py

Lib/test/test_complex.py

Lib/test/test_complex_args.py

Lib/test/test_contextlib.py

Lib/test/test_cookie.py

Lib/test/test_cookielib.py

Lib/test/test_ctypes.py

Lib/test/test_decimal.py

Lib/test/test_descr.py

Lib/test/test_descrtut.py

Lib/test/test_dict.py

Lib/test/test_distutils.py

Lib/test/test_doctest.py

Lib/test/test_exceptions.py

Lib/test/test_file.py

Lib/test/test_fileio.py

Lib/test/test_fnmatch.py

Lib/test/test_ftplib.py

Lib/test/test_functools.py

Lib/test/test_getopt.py

Lib/test/test_global.py

Lib/test/test_grammar.py

Lib/test/test_heapq.py

Lib/test/test_hotshot.py

Lib/test/test_import.py

Lib/test/test_importhooks.py

Lib/test/test_index.py

Lib/test/test_inspect.py

Lib/test/test_int_literal.py

Lib/test/test_io.py

Lib/test/test_iter.py

Lib/test/test_itertools.py

Lib/test/test_linuxaudiodev.py

Lib/test/test_logging.py

Lib/test/test_long.py

Lib/test/test_long_future.py

Lib/test/test_macostools.py

Lib/test/test_mailbox.py

Lib/test/test_marshal.py

Lib/test/test_multifile.py

Lib/test/test_multiprocessing.py

Lib/test/test_mutants.py

Lib/test/test_ntpath.py

Lib/test/test_opcodes.py

Lib/test/test_operator.py

Lib/test/test_optparse.py

Lib/test/test_os.py

Lib/test/test_ossaudiodev.py

Lib/test/test_peepholer.py

Lib/test/test_pep352.py

Lib/test/test_pkgimport.py

Lib/test/test_platform.py

Lib/test/test_posix.py

Lib/test/test_profilehooks.py

Lib/test/test_pstats.py

Lib/test/test_py3kwarn.py

Lib/test/test_pyclbr.py

Lib/test/test_pyexpat.py

Lib/test/test_queue.py

Lib/test/test_random.py

Lib/test/test_re.py

Lib/test/test_repr.py

Lib/test/test_rfc822.py

Lib/test/test_richcmp.py

Lib/test/test_robotparser.py

Lib/test/test_scope.py

Lib/test/test_set.py

Lib/test/test_sets.py

Lib/test/test_shelve.py

Lib/test/test_site.py

Lib/test/test_slice.py

Lib/test/test_socket.py

Lib/test/test_sort.py

Lib/test/test_ssl.py

Lib/test/test_struct.py

Lib/test/test_subprocess.py

Lib/test/test_sundry.py

Lib/test/test_support.py

Lib/test/test_symtable.py

Lib/test/test_syntax.py

Lib/test/test_sys.py

Lib/test/test_threadsignals.py

Lib/test/test_trace.py

Lib/test/test_traceback.py

Lib/test/test_transformer.py

Lib/test/test_types.py

Lib/test/test_undocumented_details.py

Lib/test/test_unicode.py

Lib/test/test_univnewlines.py

Lib/test/test_urllib2.py

Lib/test/test_urllib2_localnet.py

Lib/test/test_urllibnet.py

Lib/test/test_urlparse.py

Lib/test/test_userdict.py

Lib/test/test_userlist.py

Lib/test/test_userstring.py

Lib/test/test_warnings.py

Lib/test/test_weakref.py

Lib/test/test_whichdb.py

Lib/test/test_with.py

Lib/test/test_wsgiref.py

Lib/test/test_xml_etree.py

Lib/test/test_xml_etree_c.py

Lib/test/test_xmllib.py

Lib/test/test_xmlrpc.py

Lib/test/test_zipimport_support.py

Lib/timeit.py

Lib/trace.py

Lib/urllib.py

Lib/urllib2.py

Lib/urlparse.py

Lib/uuid.py

Lib/warnings.py

Lib/wave.py

Lib/webbrowser.py

Makefile.pre.in

Misc/ACKS

Misc/NEWS

Misc/RPM/python-2.6.spec

Misc/developers.txt

Misc/python.man

Modules/_ssl.c

Modules/_struct.c

Modules/arraymodule.c

Modules/bz2module.c

Modules/getpath.c

Modules/posixmodule.c

Modules/selectmodule.c

Modules/zipimport.c

Objects/stringobject.c

Objects/unicodeobject.c

PCbuild/readme.txt

Python/getversion.c

Python/sysmodule.c

README

Tools/compiler/astgen.py

debian/changelog

debian/control

debian/control.in

debian/patches/deb-setup.diff

debian/patches/distutils-install-layout.diff

debian/patches/site-locations.diff

debian/patches/svn-updates.diff

debian/pymindeps.py

debian/rules

setup.py

Show diffs side-by-side

added added

removed removed

debian/patches/distutils-install-layout.diff

227

if ENABLE_USER_SITE and os.path.isdir(USER_SITE):

228

addsitedir(USER_SITE, known_paths)

229

+ if ENABLE_USER_SITE:

230

+ for dist_libdir in ("lib", "local/lib"):

230

+ for dist_libdir in ("local/lib", "lib"):

231

+ user_site = os.path.join(USER_BASE, dist_libdir,

232

+ "python" + sys.version[:3],

233

+ "dist-packages")

Older »