1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
diff -Nru python3.6-3.6.3/debian/apt_preferences python3.6-3.6.3/debian/apt_preferences
--- python3.6-3.6.3/debian/apt_preferences 1970-01-01 09:00:00.000000000 +0900
+++ python3.6-3.6.3/debian/apt_preferences 2020-05-07 11:20:37.000000000 +0900
@@ -0,0 +1,7 @@
+Package: python3-pkg-resources
+Pin: release n=jessie-backports
+Pin-Priority: 900
+
+Package: python3-setuptools
+Pin: release n=jessie-backports
+Pin-Priority: 900
diff -Nru python3.6-3.6.3/debian/changelog python3.6-3.6.3/debian/changelog
--- python3.6-3.6.3/debian/changelog 2017-12-05 19:22:15.000000000 +0900
+++ python3.6-3.6.3/debian/changelog 2020-05-07 11:20:37.000000000 +0900
@@ -1,3 +1,19 @@
+python3.6 (3.6.3-2.deb8moz1) jessie; urgency=medium
+
+ * Mozilla backport for jessie.
+ * debian/control.in: Remove libmpdec-dev dependency; Jessie has a
+ broken version.
+ * debian/rules:
+ - Remove --with-system-libmpdec because jessie doesn't have it.
+ - Disable PGO builds because they segfault.
+ * debian/rules, debian/apt_preferences: Prefer python3-pkg-resources and
+ python3-setuptools being installed from jessie-backports when this package
+ is installed.
+ * debian/control.in, debian/rules: Don't generate the -doc package, sphinx
+ is too old in jessie.
+
+ -- Mike Hommey <glandium@mozilla.com> Tue, 7 May 2020 11:20:37 +0900
+
python3.6 (3.6.3-2) unstable; urgency=medium
* Update to 20171205 from the 3.6 branch.
diff -Nru python3.6-3.6.3/debian/control.in python3.6-3.6.3/debian/control.in
--- python3.6-3.6.3/debian/control.in 2017-12-05 19:22:15.000000000 +0900
+++ python3.6-3.6.3/debian/control.in 2020-05-07 11:20:37.000000000 +0900
@@ -9,7 +9,7 @@
zlib1g-dev, libbz2-dev, liblzma-dev,
libgdbm-dev, libdb-dev,
tk-dev, blt-dev (>= 2.4z), libssl-dev,
- libexpat1-dev, libmpdec-dev (>= 2.4),
+ libexpat1-dev,
libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
locales [!armel !avr32 !hppa !ia64 !mipsel],
libsqlite3-dev, libffi-dev (>= 3.0.5) [!or1k !avr32],
@@ -27,7 +27,7 @@
Multi-Arch: allowed
Priority: @PRIO@
Depends: @PVER@-minimal (= ${binary:Version}), lib@PVER@-stdlib (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends}
-Suggests: @PVER@-venv, @PVER@-doc, binutils
+Suggests: @PVER@-venv, binutils
Description: Interactive high-level object-oriented language (version @VER@)
Python is a high-level, interactive, object-oriented language. Its @VER@ version
includes an extensive class library with lots of goodies for
@@ -53,7 +53,7 @@
Priority: @PRIO@
Pre-Depends: ${misc:Pre-Depends}
Depends: lib@PVER@-minimal (= ${binary:Version}), mime-support, ${shlibs:Depends}, ${misc:Depends}
-Breaks: libmpdec2 (<< 2.4.2), PYFPE_BREAKS
+Breaks: PYFPE_BREAKS
Replaces: lib@PVER@-testsuite (<< 3.6.2-2)
Description: Interactive high-level object-oriented language (standard library, version @VER@)
Python is a high-level, interactive, object-oriented language. Its @VER@ version
@@ -164,28 +164,6 @@
IDLE is an Integrated Development Environment for Python (v@VER@).
IDLE is written using Tkinter and therefore quite platform-independent.
-Package: @PVER@-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: libjs-jquery, libjs-underscore, ${misc:Depends}
-Suggests: @PVER@
-Description: Documentation for the high-level object-oriented language Python (v@VER@)
- These is the official set of documentation for the interactive high-level
- object-oriented language Python (v@VER@). All documents are provided
- in HTML format. The package consists of ten documents:
- .
- * What's New in Python@VER@
- * Tutorial
- * Python Library Reference
- * Macintosh Module Reference
- * Python Language Reference
- * Extending and Embedding Python
- * Python/C API Reference
- * Installing Python Modules
- * Documenting Python
- * Distributing Python Modules
-
Package: @PVER@-dbg
Section: debug
Architecture: any
diff -Nru python3.6-3.6.3/debian/rules python3.6-3.6.3/debian/rules
--- python3.6-3.6.3/debian/rules 2017-12-05 19:22:15.000000000 +0900
+++ python3.6-3.6.3/debian/rules 2020-05-07 11:20:37.000000000 +0900
@@ -180,14 +180,6 @@
DEBUG_CFLAGS += -fexceptions
endif
-ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
- ifeq ($(DEB_HOST_ARCH_OS),linux)
- ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 powerpc ppc64 ppc64el s390x))
- with_pgo := yes
- endif
- endif
-endif
-
ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 powerpc ppc64 ppc64el s390x))
with_lto := yes
endif
@@ -347,8 +339,7 @@
--with-dbmliborder=bdb:gdbm \
--with-computed-gotos \
--without-ensurepip \
- --with-system-expat \
- --with-system-libmpdec \
+ --with-system-expat
ifneq (,$(filter $(DEB_HOST_ARCH), avr32 or1k))
common_configure_args += --without-ffi
@@ -684,7 +675,6 @@
stamps/stamp-doc-html:
dh_testdir
- $(MAKE) -C Doc html
@mkdir -p stamps
touch stamps/stamp-doc-html
@@ -1310,6 +1300,8 @@
install -D -m 644 $$i debian/$$b/usr/share/lintian/overrides/$$b; \
done
+ install -D -m 644 debian/apt_preferences $(d_min)/etc/apt/preferences.d/python3.6.pref
+
touch stamps/stamp-install
# Build architecture-independent files here.
@@ -1317,26 +1309,6 @@
dh_testdir -i
dh_testroot -i
- : # $(p_doc) package
- dh_installdirs -p$(p_doc) \
- usr/share/doc/$(p_base) \
- usr/share/doc/$(p_doc)
- dh_installdocs -p$(p_doc)
- cp -a Doc/build/html $(d_doc)/usr/share/doc/$(p_base)/
- rm -f $(d_doc)/usr/share/doc/$(p_base)/html/_static/jquery.js
- dh_link -p$(p_doc) \
- /usr/share/doc/$(p_base)/html /usr/share/doc/$(p_doc)/html \
- /usr/share/javascript/jquery/jquery.js /usr/share/doc/$(p_base)/html/_static/jquery.js \
- /usr/share/javascript/underscore/underscore.js /usr/share/doc/$(p_base)/html/_static/underscore.js
-
- : # devhelp docs
- cd $(buildd_static) && ./python ../debian/pyhtml2devhelp.py \
- ../$(d_doc)/usr/share/doc/$(p_base)/html index.html $(VER) \
- > ../$(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp
- gzip -9nv $(d_doc)/usr/share/doc/$(p_base)/html/$(PVER).devhelp
- dh_link -p$(p_doc) \
- /usr/share/doc/$(p_base)/html /usr/share/devhelp/books/$(PVER)
-
for i in $(p_ltst); do \
rm -rf debian/$$i/usr/share/doc/$$i; \
ln -s $(p_base) debian/$$i/usr/share/doc/$$i; \
|
