[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst python/makefile.mk python/python-2.7.3-mingw.patch python/python-2.7.4-nohardlink.patch python/python-2.7.4-pcbuild.patch python/python-2.7.4-sysbase.patch python/python-2.7.5-mingw.patch python/python-2.7.5-nohardlink.patch python/python-2.7.5-pcbuild.patch python/python-2.7.5-sysbase.patch python/python-freebsd.patch python/python-md5.patch python/python-solaris.patch python/python-ssl.patch python/pyversion.mk sysui/desktop
Jürgen Schmidt
jsc at apache.org
Mon Jun 3 03:07:41 PDT 2013
external_deps.lst | 6
python/makefile.mk | 2
python/python-2.7.3-mingw.patch | 7316 -----------------------------------
python/python-2.7.4-nohardlink.patch | 11
python/python-2.7.4-pcbuild.patch | 1778 --------
python/python-2.7.4-sysbase.patch | 13
python/python-2.7.5-mingw.patch | 7316 +++++++++++++++++++++++++++++++++++
python/python-2.7.5-nohardlink.patch | 11
python/python-2.7.5-pcbuild.patch | 1778 ++++++++
python/python-2.7.5-sysbase.patch | 13
python/python-freebsd.patch | 36
python/python-md5.patch | 6
python/python-solaris.patch | 4
python/python-ssl.patch | 12
python/pyversion.mk | 2
sysui/desktop/debian/control | 4
16 files changed, 9154 insertions(+), 9154 deletions(-)
New commits:
commit 163130698094a0824a4d82dbbb2cdfa9c59fed29
Author: Jürgen Schmidt <jsc at apache.org>
Date: Mon Jun 3 08:15:43 2013 +0000
#122010# update Python to 2.7.5
diff --git a/external_deps.lst b/external_deps.lst
index 9924501..5e02b96 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = 62704ea0f125923208d84ff0568f7d50
- name = Python-2.7.4.tar.bz2
- URL1 = http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.bz2
+ MD5 = 6334b666b7ff2038c761d7b27ba699c1
+ name = Python-2.7.5.tar.bz2
+ URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
diff --git a/python/makefile.mk b/python/makefile.mk
index 5c22086..593b10f 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=62704ea0f125923208d84ff0568f7d50
+TARFILE_MD5=6334b666b7ff2038c761d7b27ba699c1
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
diff --git a/python/python-2.7.3-mingw.patch b/python/python-2.7.5-mingw.patch
similarity index 98%
rename from python/python-2.7.3-mingw.patch
rename to python/python-2.7.5-mingw.patch
index d668d2b..255aad7 100644
--- a/python/python-2.7.3-mingw.patch
+++ b/python/python-2.7.5-mingw.patch
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pyport.h
---- misc/Python-2.7.3/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Include/pyport.h 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Include/pyport.h misc/build/Python-2.7.5/Include/pyport.h
+--- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.5/Include/pyport.h 2012-07-25 15:33:16.000000000 -0500
@@ -9,6 +9,30 @@
#include <inttypes.h>
#endif
@@ -32,9 +32,9 @@ diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pypo
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
-diff -ru misc/Python-2.7.3/Lib/distutils/ccompiler.py misc/build/Python-2.7.3/Lib/distutils/ccompiler.py
---- misc/Python-2.7.3/Lib/distutils/ccompiler.py 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/ccompiler.py 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/ccompiler.py misc/build/Python-2.7.5/Lib/distutils/ccompiler.py
+--- misc/Python-2.7.5/Lib/distutils/ccompiler.py 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/distutils/ccompiler.py 2012-07-25 15:33:16.000000000 -0500
@@ -893,6 +893,7 @@
# on a cygwin built python we can use gcc like an ordinary UNIXish
# compiler
@@ -43,9 +43,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/ccompiler.py misc/build/Python-2.7.3/Li
('os2emx', 'emx'),
# OS name mappings
-diff -ru misc/Python-2.7.3/Lib/distutils/command/build_ext.py misc/build/Python-2.7.3/Lib/distutils/command/build_ext.py
---- misc/Python-2.7.3/Lib/distutils/command/build_ext.py 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/command/build_ext.py 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/command/build_ext.py misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py
+--- misc/Python-2.7.5/Lib/distutils/command/build_ext.py 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py 2012-07-25 15:33:16.000000000 -0500
@@ -221,7 +221,7 @@
# for extensions under Cygwin and AtheOS Python's library directory must be
@@ -64,9 +64,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/command/build_ext.py misc/build/Python-
template = "python%d.%d"
pythonlib = (template %
(sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-diff -ru misc/Python-2.7.3/Lib/distutils/command/install.py misc/build/Python-2.7.3/Lib/distutils/command/install.py
---- misc/Python-2.7.3/Lib/distutils/command/install.py 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/command/install.py 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/command/install.py misc/build/Python-2.7.5/Lib/distutils/command/install.py
+--- misc/Python-2.7.5/Lib/distutils/command/install.py 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/distutils/command/install.py 2012-07-25 15:33:16.000000000 -0500
@@ -348,9 +348,10 @@
# Convert directories from Unix /-separated syntax to the local
@@ -102,9 +102,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/command/install.py misc/build/Python-2.
def handle_extra_path (self):
-diff -ru misc/Python-2.7.3/Lib/distutils/spawn.py misc/build/Python-2.7.3/Lib/distutils/spawn.py
---- misc/Python-2.7.3/Lib/distutils/spawn.py 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/spawn.py 2012-07-25 15:39:23.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/spawn.py misc/build/Python-2.7.5/Lib/distutils/spawn.py
+--- misc/Python-2.7.5/Lib/distutils/spawn.py 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/distutils/spawn.py 2012-07-25 15:39:23.000000000 -0500
@@ -185,7 +185,7 @@
paths = path.split(os.pathsep)
base, ext = os.path.splitext(executable)
@@ -114,9 +114,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/spawn.py misc/build/Python-2.7.3/Lib/di
executable = executable + '.exe'
if not os.path.isfile(executable):
-diff -ru misc/Python-2.7.3/Lib/distutils/sysconfig.py misc/build/Python-2.7.3/Lib/distutils/sysconfig.py
---- misc/Python-2.7.3/Lib/distutils/sysconfig.py 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/sysconfig.py 2012-07-25 15:44:24.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/sysconfig.py misc/build/Python-2.7.5/Lib/distutils/sysconfig.py
+--- misc/Python-2.7.5/Lib/distutils/sysconfig.py 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/distutils/sysconfig.py 2012-07-25 15:44:24.000000000 -0500
@@ -419,6 +419,9 @@
raise DistutilsPlatformError(my_msg)
@@ -137,9 +137,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/sysconfig.py misc/build/Python-2.7.3/Li
if func:
func()
else:
-diff -ru misc/Python-2.7.3/Lib/distutils/unixccompiler.py misc/build/Python-2.7.3/Lib/distutils/unixccompiler.py
---- misc/Python-2.7.3/Lib/distutils/unixccompiler.py 2012-04-09 18:07:30.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/distutils/unixccompiler.py 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/distutils/unixccompiler.py misc/build/Python-2.7.5/Lib/distutils/unixccompiler.py
+--- misc/Python-2.7.5/Lib/distutils/unixccompiler.py 2012-04-09 18:07:30.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/distutils/unixccompiler.py 2012-07-25 15:33:16.000000000 -0500
@@ -139,7 +139,7 @@
shared_lib_extension = ".so"
dylib_lib_extension = ".dylib"
@@ -149,9 +149,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/unixccompiler.py misc/build/Python-2.7.
exe_extension = ".exe"
def preprocess(self, source,
-diff -ru misc/Python-2.7.3/Lib/os.py misc/build/Python-2.7.3/Lib/os.py
---- misc/Python-2.7.3/Lib/os.py 2012-04-09 18:07:30.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/os.py 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/os.py misc/build/Python-2.7.5/Lib/os.py
+--- misc/Python-2.7.5/Lib/os.py 2012-04-09 18:07:30.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/os.py 2012-07-25 15:33:16.000000000 -0500
@@ -38,7 +38,21 @@
except AttributeError:
return [n for n in dir(module) if n[0] != '_']
@@ -175,9 +175,9 @@ diff -ru misc/Python-2.7.3/Lib/os.py misc/build/Python-2.7.3/Lib/os.py
name = 'posix'
linesep = '\n'
from posix import *
-diff -ru misc/Python-2.7.3/Lib/socket.py misc/build/Python-2.7.3/Lib/socket.py
---- misc/Python-2.7.3/Lib/socket.py 2012-04-09 18:07:31.000000000 -0500
-+++ misc/build/Python-2.7.3/Lib/socket.py 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Lib/socket.py misc/build/Python-2.7.5/Lib/socket.py
+--- misc/Python-2.7.5/Lib/socket.py 2012-04-09 18:07:31.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/socket.py 2012-07-25 15:33:16.000000000 -0500
@@ -153,7 +153,7 @@
'sendall', 'setblocking',
'settimeout', 'gettimeout', 'shutdown')
@@ -187,9 +187,9 @@ diff -ru misc/Python-2.7.3/Lib/socket.py misc/build/Python-2.7.3/Lib/socket.py
_socketmethods = _socketmethods + ('ioctl',)
if sys.platform == "riscos":
-diff -ru misc/Python-2.7.3/Makefile.pre.in misc/build/Python-2.7.3/Makefile.pre.in
---- misc/Python-2.7.3/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Makefile.pre.in 2012-07-25 16:01:28.000000000 -0500
+diff -ru misc/Python-2.7.5/Makefile.pre.in misc/build/Python-2.7.5/Makefile.pre.in
+--- misc/Python-2.7.5/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Makefile.pre.in 2012-07-25 16:01:28.000000000 -0500
@@ -112,6 +112,16 @@
BLDSHARED= @BLDSHARED@ $(LDFLAGS)
LDCXXSHARED= @LDCXXSHARED@
@@ -347,9 +347,9 @@ diff -ru misc/Python-2.7.3/Makefile.pre.in misc/build/Python-2.7.3/Makefile.pre.
# Here are a couple of targets for MacOSX again, to install a full
# framework-based Python. frameworkinstall installs everything, the
# subtargets install specific parts. Much of the actual work is offloaded to
-diff -ru misc/Python-2.7.3/Modules/Setup.config.in misc/build/Python-2.7.3/Modules/Setup.config.in
---- misc/Python-2.7.3/Modules/Setup.config.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/Setup.config.in 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/Setup.config.in misc/build/Python-2.7.5/Modules/Setup.config.in
+--- misc/Python-2.7.5/Modules/Setup.config.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/Setup.config.in 2012-07-25 15:33:16.000000000 -0500
@@ -9,5 +9,9 @@
# The signal module
@USE_SIGNAL_MODULE at signal signalmodule.c
@@ -360,9 +360,9 @@ diff -ru misc/Python-2.7.3/Modules/Setup.config.in misc/build/Python-2.7.3/Modul
+
# The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1 and later.
-diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Setup.dist
---- misc/Python-2.7.3/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/Setup.dist 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/Setup.dist misc/build/Python-2.7.5/Modules/Setup.dist
+--- misc/Python-2.7.5/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/Setup.dist 2012-07-25 15:33:16.000000000 -0500
@@ -114,7 +114,7 @@
posix posixmodule.c # posix (UNIX) system calls
@@ -372,9 +372,9 @@ diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Se
# if $HOME is not set
_sre _sre.c # Fredrik Lundh's new regular expressions
_codecs _codecsmodule.c # access to the builtin codecs and codec registry
-diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure
---- misc/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-07-25 16:12:30.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/configure misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure
+--- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-07-25 16:12:30.000000000 -0500
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -3572,9 +3572,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2.
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure.ac
---- misc/Python-2.7.3/Modules/_ctypes/libffi/configure.ac 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure.ac 2012-07-25 16:10:32.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure.ac
+--- misc/Python-2.7.5/Modules/_ctypes/libffi/configure.ac 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure.ac 2012-07-25 16:10:32.000000000 -0500
@@ -401,6 +401,12 @@
multilib_arg=
fi
@@ -3588,9 +3588,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure.ac misc/build/Python
AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
AC_CONFIG_COMMANDS(src, [
test -d src || mkdir src
-diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in
---- misc/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in
+--- misc/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in 2012-07-25 15:33:16.000000000 -0500
@@ -359,7 +359,11 @@
ffi_type *rtype,
ffi_type **atypes);
@@ -3603,9 +3603,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Py
void (*fn)(void),
void *rvalue,
void **avalue);
-diff -ru misc/Python-2.7.3/Modules/config.c.in misc/build/Python-2.7.3/Modules/config.c.in
---- misc/Python-2.7.3/Modules/config.c.in 2012-04-09 18:07:34.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/config.c.in 2012-07-25 16:19:28.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/config.c.in misc/build/Python-2.7.5/Modules/config.c.in
+--- misc/Python-2.7.5/Modules/config.c.in 2012-04-09 18:07:34.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/config.c.in 2012-07-25 16:19:28.000000000 -0500
@@ -48,6 +48,9 @@
{"__builtin__", NULL},
{"sys", NULL},
@@ -3616,9 +3616,9 @@ diff -ru misc/Python-2.7.3/Modules/config.c.in misc/build/Python-2.7.3/Modules/c
/* This lives in gcmodule.c */
{"gc", initgc},
-diff -ru misc/Python-2.7.3/Modules/posixmodule.c misc/build/Python-2.7.3/Modules/posixmodule.c
---- misc/Python-2.7.3/Modules/posixmodule.c 2012-04-09 18:07:34.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/posixmodule.c 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/posixmodule.c misc/build/Python-2.7.5/Modules/posixmodule.c
+--- misc/Python-2.7.5/Modules/posixmodule.c 2012-04-09 18:07:34.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/posixmodule.c 2012-07-25 15:33:16.000000000 -0500
@@ -129,6 +129,15 @@
#define HAVE_FSYNC 1
#define fsync _commit
@@ -3685,9 +3685,9 @@ diff -ru misc/Python-2.7.3/Modules/posixmodule.c misc/build/Python-2.7.3/Modules
/* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\,
where / can be used in place of \ and the trailing slash is optional.
-diff -ru misc/Python-2.7.3/Modules/socketmodule.c misc/build/Python-2.7.3/Modules/socketmodule.c
---- misc/Python-2.7.3/Modules/socketmodule.c 2012-04-09 18:07:34.000000000 -0500
-+++ misc/build/Python-2.7.3/Modules/socketmodule.c 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/socketmodule.c misc/build/Python-2.7.5/Modules/socketmodule.c
+--- misc/Python-2.7.5/Modules/socketmodule.c 2012-04-09 18:07:34.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/socketmodule.c 2012-07-25 15:33:16.000000000 -0500
@@ -312,7 +312,7 @@
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
* EAI_* constants are defined in (the already included) ws2tcpip.h.
@@ -3697,9 +3697,9 @@ diff -ru misc/Python-2.7.3/Modules/socketmodule.c misc/build/Python-2.7.3/Module
# include "addrinfo.h"
#endif
-diff -ru misc/Python-2.7.3/PC/_winreg.c misc/build/Python-2.7.3/PC/_winreg.c
---- misc/Python-2.7.3/PC/_winreg.c 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/PC/_winreg.c 2012-07-25 15:33:16.000000000 -0500
+diff -ru misc/Python-2.7.5/PC/_winreg.c misc/build/Python-2.7.5/PC/_winreg.c
+--- misc/Python-2.7.5/PC/_winreg.c 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PC/_winreg.c 2012-07-25 15:33:16.000000000 -0500
@@ -1784,6 +1784,9 @@
}
@@ -3710,9 +3710,9 @@ diff -ru misc/Python-2.7.3/PC/_winreg.c misc/build/Python-2.7.3/PC/_winreg.c
PyMODINIT_FUNC init_winreg(void)
{
-diff -ru misc/Python-2.7.3/Python/dynload_win.c misc/build/Python-2.7.3/Python/dynload_win.c
---- misc/Python-2.7.3/Python/dynload_win.c 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/Python/dynload_win.c 2012-07-25 16:25:30.000000000 -0500
+diff -ru misc/Python-2.7.5/Python/dynload_win.c misc/build/Python-2.7.5/Python/dynload_win.c
+--- misc/Python-2.7.5/Python/dynload_win.c 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/Python/dynload_win.c 2012-07-25 16:25:30.000000000 -0500
@@ -28,6 +28,7 @@
/* Case insensitive string compare, to avoid any dependencies on particular
C RTL implementations */
@@ -3729,9 +3729,9 @@ diff -ru misc/Python-2.7.3/Python/dynload_win.c misc/build/Python-2.7.3/Python/d
/* Function to return the name of the "python" DLL that the supplied module
-diff -ru misc/Python-2.7.3/Python/frozenmain.c misc/build/Python-2.7.3/Python/frozenmain.c
---- misc/Python-2.7.3/Python/frozenmain.c 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.3/Python/frozenmain.c 2012-07-25 16:28:20.000000000 -0500
+diff -ru misc/Python-2.7.5/Python/frozenmain.c misc/build/Python-2.7.5/Python/frozenmain.c
+--- misc/Python-2.7.5/Python/frozenmain.c 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/Python/frozenmain.c 2012-07-25 16:28:20.000000000 -0500
@@ -3,7 +3,7 @@
#include "Python.h"
@@ -3765,9 +3765,9 @@ diff -ru misc/Python-2.7.3/Python/frozenmain.c misc/build/Python-2.7.3/Python/fr
PyWinFreeze_ExeTerm();
#endif
Py_Finalize();
-diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
---- misc/Python-2.7.3/configure 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/configure 2012-07-25 16:40:08.000000000 -0500
+diff -ru misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure
+--- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.5/configure 2012-07-25 16:40:08.000000000 -0500
@@ -1,14 +1,12 @@
#! /bin/sh
# From configure.in Revision.
@@ -7020,9 +7020,9 @@ diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
;;
-diff -ru misc/Python-2.7.3/configure.in misc/build/Python-2.7.3/configure.in
---- misc/Python-2.7.3/configure.in 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/configure.in 2012-07-25 16:31:28.000000000 -0500
+diff -ru misc/Python-2.7.5/configure.in misc/build/Python-2.7.5/configure.in
+--- misc/Python-2.7.5/configure.in 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.5/configure.in 2012-07-25 16:31:28.000000000 -0500
@@ -417,6 +417,13 @@
LDFLAGS="$SGI_ABI $LDFLAGS"
MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'`
@@ -7192,9 +7192,9 @@ diff -ru misc/Python-2.7.3/configure.in misc/build/Python-2.7.3/configure.in
AC_SUBST(UNICODE_OBJS)
if test "$enable_unicode" = "no"
then
-diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
---- misc/Python-2.7.3/setup.py 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.3/setup.py 2012-07-25 16:38:25.000000000 -0500
+diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
+--- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.5/setup.py 2012-07-25 16:38:25.000000000 -0500
@@ -271,6 +271,18 @@
if not self.configure_ctypes(ext):
return
diff --git a/python/python-2.7.4-nohardlink.patch b/python/python-2.7.5-nohardlink.patch
similarity index 76%
rename from python/python-2.7.4-nohardlink.patch
rename to python/python-2.7.5-nohardlink.patch
index 3fd56b9..94a9e06 100644
--- a/python/python-2.7.4-nohardlink.patch
+++ b/python/python-2.7.5-nohardlink.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.4/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.4/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
+--- misc/Python-2.7.5/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
@@ -427,7 +427,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
diff --git a/python/python-2.7.4-pcbuild.patch b/python/python-2.7.5-pcbuild.patch
similarity index 86%
rename from python/python-2.7.4-pcbuild.patch
rename to python/python-2.7.5-pcbuild.patch
index 22c7d9e..82b16dd 100644
--- a/python/python-2.7.4-pcbuild.patch
+++ b/python/python-2.7.5-pcbuild.patch
@@ -1,6 +1,6 @@
-diff -u misc/Python-2.7.4/PCbuild/_bsddb.vcproj misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj
---- misc/Python-2.7.4/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj
+--- misc/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -u misc/Python-2.7.4/PCbuild/_bsddb.vcproj misc/build/Python-2.7.4/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -u misc/Python-2.7.4/PCbuild/_ctypes.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj
---- misc/Python-2.7.4/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj
+--- misc/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ctypes.vcproj misc/build/Python-2.7.4/PCbuild
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -u misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj
---- misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj
+--- misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.4/PC
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_elementtree.vcproj misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj
---- misc/Python-2.7.4/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj
+--- misc/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -256,9 +256,9 @@ diff -u misc/Python-2.7.4/PCbuild/_elementtree.vcproj misc/build/Python-2.7.4/PC
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_hashlib.vcproj misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj
---- misc/Python-2.7.4/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj
+--- misc/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -58,6 +58,7 @@
<Tool
Name="VCLinkerTool"
@@ -323,9 +323,9 @@ diff -u misc/Python-2.7.4/PCbuild/_hashlib.vcproj misc/build/Python-2.7.4/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_msi.vcproj misc/build/Python-2.7.4/PCbuild/_msi.vcproj
---- misc/Python-2.7.4/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_msi.vcproj
+--- misc/Python-2.7.5/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
@@ -390,9 +390,9 @@ diff -u misc/Python-2.7.4/PCbuild/_msi.vcproj misc/build/Python-2.7.4/PCbuild/_m
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj
---- misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj
+--- misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -457,9 +457,9 @@ diff -u misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_socket.vcproj misc/build/Python-2.7.4/PCbuild/_socket.vcproj
---- misc/Python-2.7.4/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild/_socket.vcproj
+--- misc/Python-2.7.5/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -524,9 +524,9 @@ diff -u misc/Python-2.7.4/PCbuild/_socket.vcproj misc/build/Python-2.7.4/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj
---- misc/Python-2.7.4/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj
+--- misc/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,9 +591,9 @@ diff -u misc/Python-2.7.4/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.4/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_ssl.vcproj misc/build/Python-2.7.4/PCbuild/_ssl.vcproj
---- misc/Python-2.7.4/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_ssl.vcproj
+--- misc/Python-2.7.5/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -43,7 +43,7 @@
/>
<Tool
@@ -746,9 +746,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ssl.vcproj misc/build/Python-2.7.4/PCbuild/_s
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.4/PCbuild/_testcapi.vcproj misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj
---- misc/Python-2.7.4/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj
+--- misc/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -813,9 +813,9 @@ diff -u misc/Python-2.7.4/PCbuild/_testcapi.vcproj misc/build/Python-2.7.4/PCbui
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/_tkinter.vcproj misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj
---- misc/Python-2.7.4/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj
+--- misc/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -880,9 +880,9 @@ diff -u misc/Python-2.7.4/PCbuild/_tkinter.vcproj misc/build/Python-2.7.4/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj
---- misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj
+--- misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
@@ -903,9 +903,9 @@ diff -u misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.4/P
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.4/PCbuild/bz2.vcproj misc/build/Python-2.7.4/PCbuild/bz2.vcproj
---- misc/Python-2.7.4/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2.vcproj
+--- misc/Python-2.7.5/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -970,9 +970,9 @@ diff -u misc/Python-2.7.4/PCbuild/bz2.vcproj misc/build/Python-2.7.4/PCbuild/bz2
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/kill_python.vcproj misc/build/Python-2.7.4/PCbuild/kill_python.vcproj
---- misc/Python-2.7.4/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCbuild/kill_python.vcproj
+--- misc/Python-2.7.5/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
@@ -1005,9 +1005,9 @@ diff -u misc/Python-2.7.4/PCbuild/kill_python.vcproj misc/build/Python-2.7.4/PCb
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj
---- misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj
+--- misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
@@ -1024,9 +1024,9 @@ diff -u misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.4/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj
---- misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj
+--- misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1059,9 +1059,9 @@ diff -u misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/pcbuild.sln misc/build/Python-2.7.4/PCbuild/pcbuild.sln
---- misc/Python-2.7.4/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pcbuild.sln
+--- misc/Python-2.7.5/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
@@ -38,17 +38,17 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
@@ -1166,9 +1166,9 @@ diff -u misc/Python-2.7.4/PCbuild/pcbuild.sln misc/build/Python-2.7.4/PCbuild/pc
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff -u misc/Python-2.7.4/PCbuild/pyexpat.vcproj misc/build/Python-2.7.4/PCbuild/pyexpat.vcproj
---- misc/Python-2.7.4/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj
+--- misc/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -1233,9 +1233,9 @@ diff -u misc/Python-2.7.4/PCbuild/pyexpat.vcproj misc/build/Python-2.7.4/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/python.vcproj misc/build/Python-2.7.4/PCbuild/python.vcproj
---- misc/Python-2.7.4/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/python.vcproj
+--- misc/Python-2.7.5/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -66,6 +66,7 @@
SubSystem="1"
StackReserveSize="2000000"
@@ -1300,9 +1300,9 @@ diff -u misc/Python-2.7.4/PCbuild/python.vcproj misc/build/Python-2.7.4/PCbuild/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/pythoncore.vcproj misc/build/Python-2.7.4/PCbuild/pythoncore.vcproj
---- misc/Python-2.7.4/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj
+--- misc/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1374,9 +1374,9 @@ diff -u misc/Python-2.7.4/PCbuild/pythoncore.vcproj misc/build/Python-2.7.4/PCbu
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>
-diff -u misc/Python-2.7.4/PCbuild/pythonw.vcproj misc/build/Python-2.7.4/PCbuild/pythonw.vcproj
---- misc/Python-2.7.4/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild/pythonw.vcproj
+--- misc/Python-2.7.5/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1441,9 +1441,9 @@ diff -u misc/Python-2.7.4/PCbuild/pythonw.vcproj misc/build/Python-2.7.4/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/select.vcproj misc/build/Python-2.7.4/PCbuild/select.vcproj
---- misc/Python-2.7.4/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/select.vcproj
+--- misc/Python-2.7.5/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1508,9 +1508,9 @@ diff -u misc/Python-2.7.4/PCbuild/select.vcproj misc/build/Python-2.7.4/PCbuild/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/sqlite3.vcproj misc/build/Python-2.7.4/PCbuild/sqlite3.vcproj
---- misc/Python-2.7.4/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj
+--- misc/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
@@ -1575,9 +1575,9 @@ diff -u misc/Python-2.7.4/PCbuild/sqlite3.vcproj misc/build/Python-2.7.4/PCbuild
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/unicodedata.vcproj misc/build/Python-2.7.4/PCbuild/unicodedata.vcproj
---- misc/Python-2.7.4/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj
+--- misc/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -1642,9 +1642,9 @@ diff -u misc/Python-2.7.4/PCbuild/unicodedata.vcproj misc/build/Python-2.7.4/PCb
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.4/PCbuild/w9xpopen.vcproj
---- misc/Python-2.7.4/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj
+--- misc/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
@@ -1709,9 +1709,9 @@ diff -u misc/Python-2.7.4/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.4/PCbuil
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.4/PCbuild/winsound.vcproj misc/build/Python-2.7.4/PCbuild/winsound.vcproj
---- misc/Python-2.7.4/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuild/winsound.vcproj
+--- misc/Python-2.7.5/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
diff --git a/python/python-2.7.4-sysbase.patch b/python/python-2.7.5-sysbase.patch
similarity index 74%
rename from python/python-2.7.4-sysbase.patch
rename to python/python-2.7.5-sysbase.patch
index 2b0c3ea..03c47f0 100644
--- a/python/python-2.7.4-sysbase.patch
+++ b/python/python-2.7.5-sysbase.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.4/configure 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.4/configure 2012-07-22 15:01:20.000000000 -0500
+--- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.5/configure 2012-07-22 15:01:20.000000000 -0500
@@ -2982,7 +2982,9 @@
if test -z "$MACHDEP"
then
diff --git a/python/python-freebsd.patch b/python/python-freebsd.patch
index b4764b8..63efa11 100644
--- a/python/python-freebsd.patch
+++ b/python/python-freebsd.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.4/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.4/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
+--- misc/Python-2.7.5/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
@@ -0,0 +1,612 @@
+# Generated by h2py from /usr/include/netinet/in.h
+
@@ -613,14 +613,14 @@
+IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51
---- misc/Python-2.7.4/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.4/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
+--- misc/Python-2.7.5/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
@@ -0,0 +1,3 @@
+#! /bin/sh
+set -v
+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
---- misc/Python-2.7.4/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
-+++ misc/build/Python-2.7.4/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.5/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
++++ misc/build/Python-2.7.5/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
@@ -421,7 +421,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
@@ -630,8 +630,8 @@
'os2emx')
def _run_and_join(self, script):
---- misc/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
+--- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
@@ -6289,7 +6289,7 @@
rm -rf conftest*
;;
@@ -651,8 +651,8 @@
powerpc*-*-rtems*)
TARGET=POWERPC; TARGETDIR=powerpc
;;
---- misc/Python-2.7.4/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
-+++ misc/build/Python-2.7.4/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.5/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
@@ -97,20 +97,15 @@
{
#define IOCTL_BUFSZ 1024
@@ -704,8 +704,8 @@
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
---- misc/Python-2.7.4/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
+--- misc/Python-2.7.5/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
@@ -38,13 +38,18 @@
#endif
#endif
@@ -759,9 +759,9 @@
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure
---- misc/Python-2.7.4/configure 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.4/configure 2012-08-01 18:44:40.000000000 -0500
+diff -ruN misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure
+--- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.5/configure 2012-08-01 18:44:40.000000000 -0500
@@ -4916,7 +4916,7 @@
;;
SunOS*)
@@ -783,9 +783,9 @@ diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-diff -ruN misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py
---- misc/Python-2.7.4/setup.py 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.4/setup.py 2012-08-01 18:44:40.000000000 -0500
+diff -ruN misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
+--- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.5/setup.py 2012-08-01 18:44:40.000000000 -0500
@@ -1555,7 +1540,7 @@
macros = dict()
libraries = []
diff --git a/python/python-md5.patch b/python/python-md5.patch
index 1b45678..c1c284c 100644
--- a/python/python-md5.patch
+++ b/python/python-md5.patch
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.4/Modules/Setup.dist misc/build/Python-2.7.4/Modules/Setup.dist
---- misc/Python-2.7.4/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.4/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
+diff -ru misc/Python-2.7.5/Modules/Setup.dist misc/build/Python-2.7.5/Modules/Setup.dist
+--- misc/Python-2.7.5/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.5/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
@@ -248,14 +248,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
diff --git a/python/python-solaris.patch b/python/python-solaris.patch
index 9e15b0d..583a1d7 100644
--- a/python/python-solaris.patch
+++ b/python/python-solaris.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.4/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.4/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
+--- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.5/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
@@ -603,11 +603,6 @@
in platform-specific #ifdefs.
**************************************************************************/
diff --git a/python/python-ssl.patch b/python/python-ssl.patch
index 7601742..02923e9 100644
--- a/python/python-ssl.patch
+++ b/python/python-ssl.patch
@@ -1,15 +1,15 @@
-diff -ru misc/Python-2.7.4/PCbuild/build_ssl.py misc/build/Python-2.7.4/PCbuild/build_ssl.py
---- misc/Python-2.7.4/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.4/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
+diff -ru misc/Python-2.7.5/PCbuild/build_ssl.py misc/build/Python-2.7.5/PCbuild/build_ssl.py
+--- misc/Python-2.7.5/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.5/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
@@ -253,4 +253,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
-diff -ru misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py
---- misc/Python-2.7.4/setup.py 2012-04-09 18:07:36.000000000 -0500
-+++ misc/build/Python-2.7.4/setup.py 2012-07-25 14:37:37.000000000 -0500
+diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
+--- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.5/setup.py 2012-07-25 14:37:37.000000000 -0500
@@ -702,7 +702,15 @@
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
diff --git a/python/pyversion.mk b/python/pyversion.mk
index a1e424b..2cc62b9 100644
--- a/python/pyversion.mk
+++ b/python/pyversion.mk
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=4
+PYMICRO=5
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
commit b60db34365cab29e148a686c28c7a36994f389f4
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Mon Jun 3 08:09:23 2013 +0000
121968: adjust package description for debian system integration package
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index f80e0fa..a1db639 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -2,5 +2,5 @@ Description: %productname desktop integration
Maintainer: Apache Software Foundation
Architecture: all
Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openofficeorg-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openoffice.org-debian-menus, openoffice.org-bundled
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
More information about the Libreoffice-commits
mailing list