diff --git a/debian/changelog b/debian/changelog
index ff4d269ef18d0d14a5aede1197d3efbdd8d6300c..2d3f3c7ec842f2c8f21027bdb7b82939209160e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ python-defaults (2.7.14-2) UNRELEASED; urgency=medium
* pycompile, pyclean, pyversions: Use python2 as the shebang to guard
against people fiddling around with the python symlink or having a
python3 installed as python in /usr/local. LP: #1715062.
+ * Rename the idle package to idle2. idle is now built for python3.
- -- Matthias Klose <doko@debian.org> Fri, 22 Sep 2017 12:13:42 +0200
+ -- Matthias Klose <doko@debian.org> Sat, 23 Sep 2017 09:54:08 +0200
python-defaults (2.7.14-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d4c43ed20c6c4ee0e0470cc9194346fab7a44cf9..1ef89cdb3893fb3261f23e01cc7ee885aa1918de 100644
--- a/debian/control
+++ b/debian/control
@@ -98,18 +98,18 @@ Description: interactive high-level object-oriented language (default python ver
This package is a dependency package, which depends on Debian's default
Python version (currently v2.7).
-Package: idle
+Package: idle2
Architecture: all
Depends: ${misc:Depends}, python (>= ${binary:Version}), python-tk, idle-python2.7
Enhances: python
-Replaces: python (<< 2.7.3-1~)
-Breaks: python (<< 2.7.3-1~)
-Description: IDE for Python using Tkinter (default version)
+Replaces: python (<< 2.7.3-1~), idle (<< 2.7.14-2~)
+Breaks: python (<< 2.7.3-1~), idle (<< 2.7.14-2~)
+Description: IDE for Python2 using Tkinter (default version)
IDLE is an Integrated Development Environment for Python.
IDLE is written using Tkinter and therefore quite platform-independent.
.
This package is a dependency package, which depends on Debian's default
- Python version (currently v2.7) of IDLE.
+ Python2 version (currently v2.7) of IDLE.
Package: python-doc
Section: doc
diff --git a/debian/control.in b/debian/control.in
index 964e0b27aa0904e5b29a694af4a479aee4fc98be..75238db9a0430f904b4680cd06cadaa3a052c199 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -98,18 +98,18 @@ Description: interactive high-level object-oriented language (default python ver
This package is a dependency package, which depends on Debian's default
Python version (currently v@VER@).
-Package: idle
+Package: idle2
Architecture: all
Depends: ${misc:Depends}, python (>= ${binary:Version}), python-tk, idle-@PVER@
Enhances: python
-Replaces: python (<< 2.7.3-1~)
-Breaks: python (<< 2.7.3-1~)
-Description: IDE for Python using Tkinter (default version)
+Replaces: python (<< 2.7.3-1~), idle (<< 2.7.14-2~)
+Breaks: python (<< 2.7.3-1~), idle (<< 2.7.14-2~)
+Description: IDE for Python2 using Tkinter (default version)
IDLE is an Integrated Development Environment for Python.
IDLE is written using Tkinter and therefore quite platform-independent.
.
This package is a dependency package, which depends on Debian's default
- Python version (currently v@VER@) of IDLE.
+ Python2 version (currently v@VER@) of IDLE.
Package: python-doc
Section: doc
diff --git a/debian/idle.desktop b/debian/idle2.desktop
similarity index 100%
rename from debian/idle.desktop
rename to debian/idle2.desktop
diff --git a/debian/idle.lintian-overrides b/debian/idle2.lintian-overrides
similarity index 58%
rename from debian/idle.lintian-overrides
rename to debian/idle2.lintian-overrides
index 39614faff2db859aaf6e4a1edb5a205b5cdf58d7..643bbd02f8e05e81d7bec471dfa22695cf251528 100644
--- a/debian/idle.lintian-overrides
+++ b/debian/idle2.lintian-overrides
@@ -1,2 +1,2 @@
# icon file available in a dependent package.
-idle binary: menu-icon-missing
+idle2 binary: menu-icon-missing
diff --git a/debian/rules b/debian/rules
index 785f30be0430e208ed55c56d987e14bf00c6b84c..83c8ff75b39405bf08dfb7ed0e228c5163931da3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,25 +207,25 @@ ifeq ($(with_doc),yes)
endif
: # provide the idle and idle.1 defaults
- mkdir -p debian/idle/usr/bin
- install -m 755 debian/idle.py debian/idle/usr/bin/idle
+ mkdir -p debian/idle2/usr/bin
+ install -m 755 debian/idle.py debian/idle2/usr/bin/idle2
- mkdir -p debian/idle/usr/share/man/man1
- install -m 644 debian/idle.1 debian/idle/usr/share/man/man1/idle.1
+ mkdir -p debian/idle2/usr/share/man/man1
+ install -m 644 debian/idle.1 debian/idle2/usr/share/man/man1/idle2.1
- mkdir -p debian/idle/usr/share/pixmaps
- ln -sf python.xpm debian/idle/usr/share/pixmaps/idle.xpm
+ mkdir -p debian/idle2/usr/share/pixmaps
+ ln -sf python.xpm debian/idle2/usr/share/pixmaps/idle2.xpm
- mkdir -p debian/idle/usr/share/applications
- cp -p debian/idle.desktop debian/idle/usr/share/applications/
+ mkdir -p debian/idle2/usr/share/applications
+ cp -p debian/idle2.desktop debian/idle2/usr/share/applications/
# dh_installdebconf -i $(NOPKGS)
dh_lintian -i
dh_installdocs -i $(NOPKGS) --all debian/README.Debian
dh_installchangelogs -i $(NOPKGS)
- for p in examples idle; do \
- [ $$p = idle ] || p=python-$$p; \
+ for p in examples idle2; do \
+ [ $$p = idle2 ] || p=python-$$p; \
rm -rf debian/$$p/usr/share/doc/$$p; \
ln -sf python debian/$$p/usr/share/doc/$$p; \
done
@@ -384,7 +384,7 @@ endif
dh_installchangelogs -a $(NOPKGS)
for p in all all-dev all-dbg dbg dev; do \
- [ $$p = idle ] || p=python-$$p; \
+ [ $$p = idle2 ] || p=python-$$p; \
rm -rf debian/$$p/usr/share/doc/$$p; \
ln -sf python debian/$$p/usr/share/doc/$$p; \
done