diff --git a/debian/changelog b/debian/changelog
index ddaa36c4252b9c162f9417927975e10865668edf..ee3b1538dbe2452f4288a860b270527265c05a60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-defaults (2.4.3-7) experimental; urgency=low
+
+ * Update pyversions.py from 2.3.5-11.
+ * Fix pyversions(1), -r takes exactly one parameter.
+ * idle: Remove the dependency on idle-pythonX.Y, add start script
+ and man page.
+
+ -- Matthias Klose <doko@debian.org> Sat, 5 Aug 2006 17:34:43 +0000
+
python-defaults (2.4.3-6) experimental; urgency=low
* Remove python's dependency on python-central. Closes: #372658.
diff --git a/debian/control b/debian/control
index aaccf944080115987cbd56b98a6088bad49db048..8c13e74410bd9a43a1465696f2b59ea77a90bf5c 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Description: Header files and a static library for Python (default)
Package: idle
Architecture: all
-Depends: python (= ${Source-Version}), idle-python2.4 (>= 2.4.3-7)
+Depends: python (= ${Source-Version})
Enhances: python
Description: An IDE for Python using Tkinter (default version)
IDLE is an Integrated Development Environment for Python.
diff --git a/debian/control.in b/debian/control.in
index 6c44a67ba17704c1ef5fbd7955b591d352391cbb..ffa135fb2637eeac5ddd411aa4d61f8e5e72fb5e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -60,7 +60,7 @@ Description: Header files and a static library for Python (default)
Package: idle
Architecture: all
-Depends: python (= ${Source-Version}), idle-@PVER@ (>= @PREVVER@)
+Depends: python (= ${Source-Version})
Enhances: python
Description: An IDE for Python using Tkinter (default version)
IDLE is an Integrated Development Environment for Python.
diff --git a/debian/idle.1 b/debian/idle.1
new file mode 100644
index 0000000000000000000000000000000000000000..42c0b95b85a87198c52a4f321501842b955be957
--- /dev/null
+++ b/debian/idle.1
@@ -0,0 +1,104 @@
+.TH IDLE 1 "21 September 2004"
+.SH NAME
+\fBIDLE\fP \- An Integrated DeveLopment Environment for Python
+.SH SYNTAX
+.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] [ \fIfile\fP ...]
+.PP
+.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] ( \fI-c cmd\fP | \fI-r file\fP ) [ \fIarg\fP ...]
+.PP
+.B idle [ \fI-dins\fP ] [ \fI-t title\fP ] - [ \fIarg\fP ...]
+.SH DESCRIPTION
+This manual page documents briefly the
+.BR idle
+command.
+This manual page was written for Debian
+because the original program does not have a manual page.
+For more information, refer to IDLE's help menu.
+.PP
+.B IDLE
+is an Integrated DeveLopment Environment for Python. IDLE is based on
+Tkinter, Python's bindings to the Tk widget set. Features are 100% pure
+Python, multi-windows with multiple undo and Python colorizing, a Python
+shell window subclass, a debugger. IDLE is cross-platform, i.e. it works
+on all platforms where Tk is installed.
+.LP
+.SH OPTIONS
+.TP
+.B \-h
+.PD
+Print this help message and exit.
+.TP
+.B \-n
+.PD
+Run IDLE without a subprocess (see Help/IDLE Help for details).
+.PP
+The following options will override the IDLE 'settings' configuration:
+.TP
+.B \-e
+.PD
+Open an edit window.
+.TP
+.B \-i
+.PD
+Open a shell window.
+.PP
+The following options imply -i and will open a shell:
+.TP
+.B \-c cmd
+.PD
+Run the command in a shell, or
+.TP
+.B \-r file
+.PD
+Run script from file.
+.PP
+.TP
+.B \-d
+.PD
+Enable the debugger.
+.TP
+.B \-s
+.PD
+Run $IDLESTARTUP or $PYTHONSTARTUP before anything else.
+.TP
+.B \-t title
+.PD
+Set title of shell window.
+.PP
+A default edit window will be bypassed when -c, -r, or - are used.
+.PP
+[arg]* and [file]* are passed to the command (-c) or script (-r) in sys.argv[1:].
+.SH EXAMPLES
+.TP
+idle
+.PD
+Open an edit window or shell depending on IDLE's configuration.
+.TP
+idle foo.py foobar.py
+.PD
+Edit the files, also open a shell if configured to start with shell.
+.TP
+idle -est "Baz" foo.py
+.PD
+Run $IDLESTARTUP or $PYTHONSTARTUP, edit foo.py, and open a shell
+window with the title "Baz".
+.TP
+idle -c "import sys; print sys.argv" "foo"
+.PD
+Open a shell window and run the command, passing "-c" in sys.argv[0]
+and "foo" in sys.argv[1].
+.TP
+idle -d -s -r foo.py "Hello World"
+.PD
+Open a shell window, run a startup script, enable the debugger, and
+run foo.py, passing "foo.py" in sys.argv[0] and "Hello World" in
+sys.argv[1].
+.TP
+echo "import sys; print sys.argv" | idle - "foobar"
+.PD
+Open a shell window, run the script piped in, passing '' in sys.argv[0]
+and "foobar" in sys.argv[1].
+.SH SEE ALSO
+python(1).
+.SH AUTHORS
+Various.
diff --git a/debian/idle.desktop b/debian/idle.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..d486dfc9c82e75c63880a099b4df504bafee2133
--- /dev/null
+++ b/debian/idle.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=IDLE
+Comment=Integrated DeveLopment Environment for Python
+Exec=/usr/bin/idle -n
+Icon=/usr/share/pixmaps/idle.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Development;
+StartupNotify=true
diff --git a/debian/idle.menu b/debian/idle.menu
new file mode 100644
index 0000000000000000000000000000000000000000..1eec7c70d199d9565e0f3f9b473678ec6df1c03b
--- /dev/null
+++ b/debian/idle.menu
@@ -0,0 +1,5 @@
+?package(idle):needs="X11" section="Apps/Programming"\
+ title="IDLE (Python IDE)"\
+ icon="/usr/share/pixmaps/idle.xpm"\
+ command="/usr/bin/idle -n" \
+ hints="Environments"
diff --git a/debian/idle.py b/debian/idle.py
new file mode 100755
index 0000000000000000000000000000000000000000..3cb57499bd0be44869fe56415cfd93e15fa9bb8c
--- /dev/null
+++ b/debian/idle.py
@@ -0,0 +1,5 @@
+#! /usr/bin/python
+
+from idlelib.PyShell import main
+if __name__ == '__main__':
+ main()
diff --git a/debian/idle.sh b/debian/idle.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f910052cfc0367dc2c84055e97c254a889469bf2
--- /dev/null
+++ b/debian/idle.sh
@@ -0,0 +1,4 @@
+#! /usr/bin/python
+
+from idlelib.PyShell import main
+main()
diff --git a/debian/pylogo.xpm b/debian/pylogo.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..10a1cbe955ce2fedf46d251738386e64dda0c813
--- /dev/null
+++ b/debian/pylogo.xpm
@@ -0,0 +1,149 @@
+/* XPM */
+static char * pylogo_xpm[] = {
+"39 39 107 2",
+" c None",
+". c #C2D1DE",
+"+ c #7EA5C6",
+"@ c #6495BD",
+"# c #4985B6",
+"$ c #4383B6",
+"% c #437FB2",
+"& c #5085B0",
+"* c #6491B5",
+"= c #7DA1BF",
+"- c #D7DEE3",
+"; c #9DBAD1",
+"> c #4385BB",
+", c #3882BE",
+"' c #387CB5",
+") c #3779AF",
+"! c #3776AB",
+"~ c #648EB2",
+"{ c #387FBA",
+"] c #3773A5",
+"^ c #4273A5",
+"/ c #4988BB",
+"( c #4489C0",
+"_ c #CDDFEE",
+": c #F7F7FF",
+"< c #82ADD1",
+"[ c #7096B5",
+"} c #9BBFDD",
+"| c #FFFFFF",
+"1 c #F6F5F5",
+"2 c #3C729E",
+"3 c #82AFD4",
+"4 c #366D9C",
+"5 c #9BBDDA",
+"6 c #376A94",
+"7 c #5A91BF",
+"8 c #EFEFEF",
+"9 c #FFED60",
+"0 c #FFE659",
+"a c #F8E16E",
+"b c #7FA8CA",
+"c c #FFEB5E",
+"d c #FFE354",
+"e c #F9D65B",
+"f c #3885C3",
+"g c #FFDB4C",
+"h c #F5DA82",
+"i c #FBCE47",
+"j c #B0C7D9",
+"k c #FFD544",
+"l c #F1E5C3",
+"m c #72A0C5",
+"n c #507CA1",
+"o c #F5E8C6",
+"p c #FFE052",
+"q c #FFD040",
+"r c #F5D98D",
+"s c #528DBD",
+"t c #F8D568",
+"u c #F8CD57",
+"v c #7F9EB8",
+"w c #F1ECDA",
+"x c #FFCC3B",
+"y c #FBC840",
+"z c #FBD54F",
+"A c #FCC539",
+"B c #80A3C0",
+"C c #C6D4E0",
+"D c #FFD849",
+"E c #FFC532",
+"F c #4379A7",
+"G c #DCE1E7",
+"H c #F5E398",
+"I c #FAE262",
+"J c #FBC037",
+"K c #F5E6A6",
+"L c #FFBC29",
+"M c #F9C244",
+"N c #80A6C6",
+"O c #F7CD74",
+"P c #F3F2F2",
+"Q c #427DAE",
+"R c #FABE40",
+"S c #90AFC9",
+"T c #FFB521",
+"U c #F6D897",
+"V c #F9C049",
+"W c #A1BACF",
+"X c #497FAC",
+"Y c #FFCD57",
+"Z c #FFE097",
+"` c #FFD67B",
+" . c #FFF7E5",
+".. c #FFD376",
+"+. c #FDBE2E",
+"@. c #FFFBF2",
+"#. c #FFD683",
+"$. c #F7DE92",
+"%. c #FFCF6A",
+"&. c #FFEDC8",
+"*. c #FFE4AC",
+"=. c #FFB82D",
+"-. c #F7D284",
+";. c #F8C762",
+">. c #F6DFA0",
+",. c #FFB531",
+"'. c #F7D47B",
+" . + @ # $ % % % % & * = - ",
+" ; > , , , ' ' ' ) ) ) ! ! ! ! ~ ",
+" ; , , { { { ' ' ' ' ) ! ! ! ] ] ] ^ ",
+" / , ( _ : < ' ' ) ) ) ) ) ] ] ] ] ] [ ",
+" > , } | | 1 ' ) ) ) ! ! ! ] ] ] ] ] 2 ",
+" , , 3 | | _ ' ) ) ! ! ! ] ] ] ] 4 4 4 ",
+" , , , < 5 $ ) ) ) ) ) ] ] ] ] 4 4 4 4 ",
+" { { ' ' ' ) ) ) ) ) ] ] ] ] 4 4 4 4 4 ",
+" { ' ' ' ) ) ) ! ! ! ] ] ] 4 4 4 4 4 4 ",
+" * ] ] ] 4 4 4 4 4 6 ",
+" . 7 > , , , , ' ' ' ) ) ) ) ) ] ] ] ] 4 4 4 4 6 6 6 8 9 9 0 0 0 a ",
+" b , , , , , , ' ' ' ) ) ) ) ) ] ] ] ] 4 4 4 4 6 6 6 6 8 c c 0 d d d e ",
+" ; f f f , { { { { ' ) ) ) ! ! ! ] ] ] ] 4 4 4 4 6 6 6 6 8 0 0 d d d g g h ",
+" ( f f , { { { ' ' ' ' ) ! ! ! ] ] ] ] 4 4 4 4 6 6 6 6 6 8 d d d d g g g i ",
+"j f , , , , , ' ' ' ) ) ) ) ) ] ] ] ] 4 4 4 4 6 6 6 6 6 6 8 d d g g g g k k l ",
+"m f f , , , ' ' ' ) ) ) ! ! ! ] ] ] 4 4 4 4 4 6 6 6 6 6 n o p p g g k k k q r ",
+"s , , { { { ' ' ' ' ) ! ! ! ] ] ] ] 4 4 4 4 6 6 6 6 6 6 . t g g g k k k q q u ",
+"> , , , , ' ' ' ) ) ) ) ) ] ] ] ] 4 4 4 4 6 6 6 6 6 6 v w g g g k k k q x x y ",
+"{ { { { ' ' ' ) ) ) ) ) ] ] ] ] 4 4 4 4 6 6 6 6 6 n . w z g g k k q x x x x A ",
+", , , ' ' ' ) ) ) ) ) ] B C 8 8 8 8 8 8 8 8 8 8 8 o t D D D k k q x x x E E E ",
+"{ { { ' ' ' ' ) ) ) F G H I 9 9 9 9 9 9 9 0 0 d d g g g g k k q x x x E E E E ",
+"$ { ' ' ' ) ) ) ) ) G a 9 9 9 9 9 9 9 0 0 0 p p p g g k k k q x x x E E E E J ",
+"7 ' ' ' ) ) ) ) ) B K 9 9 9 9 9 9 9 0 0 0 p p p g g k k k q q x x E E E E L M ",
+"N ' ' ) ) ) ! ! ! G I 9 9 9 9 9 9 0 0 d d d g g g k k k q x x E E E E E L L O ",
+"C ' ' ' ) ! ! ! ! P 0 9 9 9 9 9 0 0 d d d g g g k k q x x x E E E E E L L L w ",
+" Q ) ) ) ) ) ] ] P 9 9 9 9 9 0 0 d d d g g g k k q x x x E E E E L L L L R ",
+" S ) ) ! ! ! ! ] P 9 9 9 9 0 0 d d g g g g k k q x x x E E E E L L L L T U ",
+" * ! ! ! ] ] ] P 9 9 0 0 0 p p p g g k k k q x x x E E E E L L L L T V ",
+" W X F F F F c c 0 0 p p p g g k i i i y y y y y y J J J J J J O ",
+" 0 0 d d d g g g k t ",
+" d d d d g g g k k q x x x E E E E E J ",
+" d d g g g g k k q x x x E E E E L L J ",
+" p p g g g k k q x x x x E Y Z ` L L L ",
+" g g g k k k q x x x E E E .| | ..T +. ",
+" z D D k k q q x x E E E E @.| | #.T J ",
+" $.k k k q x x E E E E E L %.&.*.=.T -. ",
+" e q x x x E E E E E L L T T T T ;. ",
+" >.i x E E E E L L L T T T ,.U ",
+" o '.V J +.L L L R O l "};
diff --git a/debian/pyversions.1 b/debian/pyversions.1
index 9d911eebda69f9c383c3e6f6faba18d00ee34ff5..8515331fceaa8d8cecd2c424899db2223c603c57 100644
--- a/debian/pyversions.1
+++ b/debian/pyversions.1
@@ -19,7 +19,7 @@ Show the default python version.
.I -s, --supported
Show the supported python versions.
.TP
-.I -r, --requested [<version string> | <control file>]
+.I -r, --requested <version string>|<control file>
Reads the value of the
.B XS-Python-Version
field in the source section of a control file and shows all matching
diff --git a/debian/pyversions.py b/debian/pyversions.py
old mode 100644
new mode 100755
diff --git a/debian/rules b/debian/rules
index f5c6fce81282cde139b7c543cd8583df72d032ba..685286a0ad626630b355d6b0a04d198b08cb55da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -170,6 +170,9 @@ binary-indep: build install stamp-doc
cp -a debian/python-policy.{html,sgml,txt} \
debian/python/usr/share/doc/python/
+ mkdir -p debian/python/usr/share/pixmaps
+ cp -p debian/pylogo.xpm debian/python/usr/share/pixmaps/python.xpm
+
: # add symlinks to policy files
mkdir -p debian/python/usr/share/doc/python$(VER)
for ext in html sgml.gz txt.gz; do \
@@ -199,15 +202,21 @@ endif
: # provide the idle and idle.1 defaults
mkdir -p debian/idle/usr/bin
- ln -sf idle-python$(VER) debian/idle/usr/bin/idle
+ install -m 755 debian/idle.py debian/idle/usr/bin/idle
mkdir -p debian/idle/usr/share/man/man1
- ln -sf idle-python$(VER).1.gz \
- debian/idle/usr/share/man/man1/idle.1.gz
+ install -m 644 debian/idle.1 debian/idle/usr/share/man/man1/idle.1
+
+ mkdir -p debian/idle/usr/share/pixmaps
+ cp -p debian/pylogo.xpm debian/idle/usr/share/pixmaps/idle.xpm
+
+ mkdir -p debian/idle/usr/share/applications
+ cp -p debian/idle.desktop debian/idle/usr/share/applications/
# dh_installdebconf -i $(NOPKGS)
dh_installdocs -i $(NOPKGS) --all debian/README.Debian
dh_installmenu -i $(NOPKGS)
+ dh_desktop -i $(NOPKGS)
dh_installchangelogs -i $(NOPKGS)
for p in all all-dev dbg dev examples idle; do \