Skip to content

Commit e83afaf

Browse files
committed
* Add proposed patch to avoid tzdata-legacy, and drop again the
dependency on it. See python/cpython#108533.
1 parent 6bc123a commit e83afaf

File tree

5 files changed

+25
-4
lines changed

5 files changed

+25
-4
lines changed

debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
python3.11 (3.11.5-3) UNRELEASED; urgency=medium
2+
3+
* Add proposed patch to avoid tzdata-legacy, and drop again the
4+
dependency on it. See https://github.com/python/cpython/pull/108533.
5+
6+
-- Matthias Klose <[email protected]> Tue, 29 Aug 2023 14:15:20 +0200
7+
18
python3.11 (3.11.5-2) unstable; urgency=medium
29

310
* libpython3.11-stdlib: Also depend on tzdata-legacy. Closes: #1050530.

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 11), dpkg-dev (>= 1.17.11),
1515
libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32],
1616
libgpm2 [linux-any],
1717
media-types | mime-support, netbase, bzip2, time, python3:any, python3.11:any <cross>,
18-
net-tools, xvfb <!nocheck>, xauth <!nocheck>,
18+
net-tools, xvfb <!nocheck>, xauth <!nocheck>, tzdata <!nocheck>,
1919
systemtap-sdt-dev,
2020
valgrind-if-available,
2121
Build-Depends-Indep: python3-sphinx, python3-docs-theme, texinfo
@@ -65,7 +65,7 @@ Multi-Arch: same
6565
Priority: optional
6666
Pre-Depends: ${misc:Pre-Depends}
6767
Depends: libpython3.11-minimal (= ${binary:Version}),
68-
media-types | mime-support, tzdata, tzdata-legacy,
68+
media-types | mime-support, tzdata,
6969
${shlibs:Depends}, ${misc:Depends}
7070
Breaks: python3-gdbm (<< 3.9.9-1~)
7171
Replaces: python3-gdbm (<< 3.9.9-1~)

debian/control.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 11), @bd_dpkgdev@
1515
libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32],
1616
libgpm2 [linux-any],
1717
media-types | mime-support, netbase, bzip2, time, python3@bd_qual@, @PVER@@bd_qual@ <cross>,
18-
net-tools, xvfb <!nocheck>, xauth <!nocheck>,
18+
net-tools, xvfb <!nocheck>, xauth <!nocheck>, tzdata <!nocheck>,
1919
systemtap-sdt-dev,
2020
valgrind-if-available,
2121
Build-Depends-Indep: python3-sphinx, python3-docs-theme, texinfo
@@ -65,7 +65,7 @@ Multi-Arch: same
6565
Priority: @PRIO@
6666
Pre-Depends: ${misc:Pre-Depends}
6767
Depends: lib@PVER@-minimal (= ${binary:Version}),
68-
media-types | mime-support, tzdata, tzdata-legacy,
68+
media-types | mime-support, tzdata,
6969
${shlibs:Depends}, ${misc:Depends}
7070
Breaks: python3-gdbm (<< 3.9.9-1~)
7171
Replaces: python3-gdbm (<< 3.9.9-1~)

debian/patches/108533.diff

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# DP: https://github.com/python/cpython/pull/108533
2+
3+
--- a/Lib/test/test_email/test_utils.py
4+
+++ b/Lib/test/test_email/test_utils.py
5+
@@ -148,7 +148,7 @@ def test_localtime_epoch_notz_daylight_false(self):
6+
@unittest.skipUnless(os.path.exists('/usr/share/zoneinfo') or
7+
os.path.exists('/usr/lib/zoneinfo'),
8+
"Can't find the Olson's TZ database")
9+
- @test.support.run_with_tz('Europe/Kiev')
10+
+ @test.support.run_with_tz('Europe/Kyiv')
11+
def test_variable_tzname(self):
12+
t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc)
13+
t1 = utils.localtime(t0)

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ destshared-location.diff
3939
fix-py_compile.diff
4040
ntpath-import.diff
4141
add-loongarch-support.diff
42+
108533.diff

0 commit comments

Comments
 (0)