Le Mercredi 22 Février 2006 16:05, Matthias Klose a écrit :
will do it tonight or tomorrow for python2.3. I don't think we need
uploads for 2.1 and 2.2 anymore, as these packages are on it's way out
of the archive.
Matthias
Almost two weeks later, I still don't see any upload in unstable or incoming,
so I went ahead and prepared an NMU using the attached patch. I'll wait
another day to see if you have any objections, and then upload it if not (or
earlier if you write back to say it's all right).
--
Daniel Schepler
diff -urN python2.3-2.3.5.old/debian/changelog python2.3-2.3.5/debian/changelog
--- python2.3-2.3.5.old/debian/changelog 2006-03-06 10:59:10.0 +0100
+++ python2.3-2.3.5/debian/changelog 2006-03-06 10:52:27.0 +0100
@@ -1,3 +1,15 @@
+python2.3 (2.3.5-9.1) unstable; urgency=low
+
+ * NMU.
+ * Replace tix8.1-dev with tix-dev in the Build-Depends; also update
+the python2.3-tk package's Suggests from tix8.1 to tix.
+Closes: #340791.
+ * debian/patches/zip-64bit-fix.dpatch: Fix a 32-bit-ism which was
+causing the zip import module to crash on amd64 (at least).
+Closes: #339998.
+
+ -- Daniel Schepler [EMAIL PROTECTED] Mon, 6 Mar 2006 10:52:27 +0100
+
python2.3 (2.3.5-9) unstable; urgency=low
* Rebuild (openssl 0.9.8).
diff -urN python2.3-2.3.5.old/debian/control python2.3-2.3.5/debian/control
--- python2.3-2.3.5.old/debian/control 2006-03-06 10:59:10.0 +0100
+++ python2.3-2.3.5/debian/control 2006-03-05 14:55:53.0 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Matthias Klose [EMAIL PROTECTED]
Uploaders: Gregor Hoffleit [EMAIL PROTECTED]
-Build-Depends: debhelper (= 3), autoconf, libreadline5-dev, libncurses5-dev (= 5.3), tk8.4-dev, libdb4.3-dev, zlib1g-dev, libgmp3-dev, libgdbm-dev, blt-dev (= 2.4z), tix8.1-dev (= 8.1.3.93), libssl-dev, libbz2-dev, sharutils
+Build-Depends: debhelper (= 3), autoconf, libreadline5-dev, libncurses5-dev (= 5.3), tk8.4-dev, libdb4.3-dev, zlib1g-dev, libgmp3-dev, libgdbm-dev, blt-dev (= 2.4z), tix-dev (= 8.4.0), libssl-dev, libbz2-dev, sharutils
Build-Depends-Indep: libhtml-tree-perl, tetex-bin, tetex-extra, texinfo, emacs21, tar, gzip, bzip2, debiandoc-sgml, sharutils
Build-Conflicts: tcl8.0-dev, tk8.0-dev, tcl8.2-dev, tk8.2-dev, tcl8.3-dev, tk8.3-dev
Standards-Version: 3.6.2
@@ -25,7 +25,7 @@
Package: python2.3-tk
Architecture: any
Depends: python2.3 (= ${Source-Version}), ${shlibs:Depends}
-Suggests: tix8.1
+Suggests: tix
Description: Tkinter - Writing Tk applications with Python (v2.3)
A module for writing portable GUI applications with Python (v2.3) using Tk.
Also known as Tkinter.
diff -urN python2.3-2.3.5.old/debian/patches/zip-64bit-fix.dpatch python2.3-2.3.5/debian/patches/zip-64bit-fix.dpatch
--- python2.3-2.3.5.old/debian/patches/zip-64bit-fix.dpatch 1970-01-01 01:00:00.0 +0100
+++ python2.3-2.3.5/debian/patches/zip-64bit-fix.dpatch 2006-03-05 15:57:39.0 +0100
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+# DP: fix a 32-bit-ism in the zipimport module.
+
+dir=
+if [ $# -eq 3 -a $2 = '-d' ]; then
+pdir=-d $3
+dir=$3/
+elif [ $# -ne 1 ]; then
+echo 2 usage: `basename $0`: -patch|-unpatch [-d srcdir]
+exit 1
+fi
+case $1 in
+-patch)
+patch $pdir -f --no-backup-if-mismatch -p1 $0
+;;
+-unpatch)
+patch $pdir -f --no-backup-if-mismatch -R -p1 $0
+;;
+*)
+echo 2 usage: `basename $0`: -patch|-unpatch [-d srcdir]
+exit 1
+esac
+exit 0
+
+diff -urNad python2.3-2.3.5~/Modules/zipimport.c python2.3-2.3.5/Modules/zipimport.c
+--- python2.3-2.3.5~/Modules/zipimport.c 2003-07-22 20:10:15.0 +0200
python2.3-2.3.5/Modules/zipimport.c 2006-03-05 15:40:08.0 +0100
+@@ -875,7 +875,7 @@
+ zlib not available);
+ goto error;
+ }
+- data = PyObject_CallFunction(decompress, Ol, raw_data, -15);
++ data = PyObject_CallFunction(decompress, Oi, raw_data, -15);
+ error:
+ Py_DECREF(raw_data);
+ return data;
diff -urN python2.3-2.3.5.old/debian/rules python2.3-2.3.5/debian/rules
--- python2.3-2.3.5.old/debian/rules 2006-03-06 10:59:10.0 +0100
+++ python2.3-2.3.5/debian/rules 2006-03-05 15:51:59.0 +0100
@@ -621,6 +621,7 @@
tetex-3.0 \
locale-strcoll \
pcre-security_CAN-2005-2491 \
+ zip-64bit-fix \
# patchlevel \
# cvs-updates \
