Hello community,

here is the log from the commit of package python-distribute for 
openSUSE:Factory
checked in at Mon Sep 26 17:06:57 CEST 2011.



--------
--- python-distribute/python-distribute.changes 2011-09-20 14:38:23.000000000 
+0200
+++ /mounts/work_src_done/STABLE/python-distribute/python-distribute.changes    
2011-09-26 10:34:38.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Sep 26 08:33:25 UTC 2011 - [email protected]
+
+- Added 'Conflicts: python-setuptools'
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-distribute.spec ++++++
--- /var/tmp/diff_new_pack.j9zC1f/_old  2011-09-26 17:06:39.000000000 +0200
+++ /var/tmp/diff_new_pack.j9zC1f/_new  2011-09-26 17:06:39.000000000 +0200
@@ -19,7 +19,7 @@
 
 Name:           python-distribute
 Version:        0.6.21
-Release:        0
+Release:        2
 Url:            http://packages.python.org/distribute
 Summary:        Easily download, build, install, upgrade, and uninstall Python 
packages
 License:        PSF or ZPL
@@ -33,6 +33,7 @@
 BuildArch:      noarch
 %endif
 %endif
+Conflicts:      python-setuptools
 Obsoletes:      python-setuptools < %{version}
 Provides:       python-setuptools = %{version}
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from 
distutils.sysconfig import get_python_lib; print get_python_lib()")}

++++++ distribute-0.6.21.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/distribute-0.6.21/distribute.egg-info/SOURCES.txt 
new/distribute-0.6.21/distribute.egg-info/SOURCES.txt
--- old/distribute-0.6.21/distribute.egg-info/SOURCES.txt       2011-08-20 
11:56:41.000000000 +0200
+++ new/distribute-0.6.21/distribute.egg-info/SOURCES.txt       2011-09-22 
18:34:00.000000000 +0200
@@ -14,7 +14,7 @@
 distribute.egg-info/SOURCES.txt
 distribute.egg-info/dependency_links.txt
 distribute.egg-info/entry_points.txt
-distribute.egg-info/entry_points.txt.orig
+distribute.egg-info/entry_points2.txt
 distribute.egg-info/top_level.txt
 distribute.egg-info/zip-safe
 docs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/distribute-0.6.21/distribute.egg-info/entry_points.txt.orig 
new/distribute-0.6.21/distribute.egg-info/entry_points.txt.orig
--- old/distribute-0.6.21/distribute.egg-info/entry_points.txt.orig     
2011-05-26 12:12:27.000000000 +0200
+++ new/distribute-0.6.21/distribute.egg-info/entry_points.txt.orig     
1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/distribute-0.6.21/distribute.egg-info/entry_points2.txt 
new/distribute-0.6.21/distribute.egg-info/entry_points2.txt
--- old/distribute-0.6.21/distribute.egg-info/entry_points2.txt 1970-01-01 
01:00:00.000000000 +0100
+++ new/distribute-0.6.21/distribute.egg-info/entry_points2.txt 2010-11-29 
09:58:25.000000000 +0100
@@ -0,0 +1,61 @@
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/distribute-0.6.21/docs/build/html/_sources/python3.txt 
new/distribute-0.6.21/docs/build/html/_sources/python3.txt
--- old/distribute-0.6.21/docs/build/html/_sources/python3.txt  2011-05-16 
14:05:34.000000000 +0200
+++ new/distribute-0.6.21/docs/build/html/_sources/python3.txt  2011-09-22 
18:16:16.000000000 +0200
@@ -66,7 +66,7 @@
 
 In general, if code doesn't seem to be converted, deleting the build directory
 and trying again is a good saferguard against the build directory getting
-"out of sync" with teh source directory.
+"out of sync" with the source directory.
 
 Distributing Python 3 modules
 =============================
@@ -81,8 +81,10 @@
 =================
 
 If certain fixers are to be suppressed, this again can be overridden with the
-list ``setuptools.commands.build_py.build_py.fixers``, which then contains the
-list of all fixer class names.
+list ``setuptools.command.build_py.build_py.fixer_names``, which at some
+point contains the list of all fixer class names. For an example of how this
+can be done, see the `jaraco.util <https://bitbucket.org/jaraco/jaraco.util>`_
+project.
 
 If you don't want to run the 2to3 conversion on the doctests in Python files,
 you can turn that off by setting ``setuptools.use_2to3_on_doctests = False``.


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to