r13722 - in /packages/unstable/hotwire/debian: changelog control control.in patches/ patches/python2.5_exec.patch pyversions rules watch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Dec 3 20:20:45 UTC 2007
Author: joss
Date: Mon Dec 3 20:20:45 2007
New Revision: 13722
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13722
Log:
* New upstream release.
* Depend on python-gtksourceview2.
* Suggest python-psyco.
* Require python 2.5 at runtime for the sqlite3 module.
* python2.5_exec.patch: support python 2.4 by re-exec'ing python2.5 in
this case. This will allow a smooth transition to python2.5.
* Fix dependencies accordingly.
* Integrate changes from Colin Walters:
+ Build-depend on intltool.
+ Don't depend on python-paramiko.
+ Fix watch file.
+ Call dh_desktop and dh_icons.
* Require debhelper 5.0.51.
* Improve long description.
Added:
packages/unstable/hotwire/debian/patches/
packages/unstable/hotwire/debian/patches/python2.5_exec.patch
Modified:
packages/unstable/hotwire/debian/changelog
packages/unstable/hotwire/debian/control
packages/unstable/hotwire/debian/control.in
packages/unstable/hotwire/debian/pyversions
packages/unstable/hotwire/debian/rules
packages/unstable/hotwire/debian/watch
Modified: packages/unstable/hotwire/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/changelog?rev=13722&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/changelog (original)
+++ packages/unstable/hotwire/debian/changelog Mon Dec 3 20:20:45 2007
@@ -1,3 +1,22 @@
+hotwire (0.620-2) unstable; urgency=low
+
+ * New upstream release.
+ * Depend on python-gtksourceview2.
+ * Suggest python-psyco.
+ * Require python 2.5 at runtime for the sqlite3 module.
+ * python2.5_exec.patch: support python 2.4 by re-exec'ing python2.5 in
+ this case. This will allow a smooth transition to python2.5.
+ * Fix dependencies accordingly.
+ * Integrate changes from Colin Walters:
+ + Build-depend on intltool.
+ + Don't depend on python-paramiko.
+ + Fix watch file.
+ + Call dh_desktop and dh_icons.
+ * Require debhelper 5.0.51.
+ * Improve long description.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 10 Nov 2007 14:43:34 +0100
+
hotwire (0.595-1) unstable; urgency=low
[ Kilian Krause ]
Modified: packages/unstable/hotwire/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/control?rev=13722&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/control (original)
+++ packages/unstable/hotwire/debian/control Mon Dec 3 20:20:45 2007
@@ -7,21 +7,23 @@
Build-Depends: cdbs (>= 0.4.45),
python-support,
gnome-pkg-tools (>= 0.10),
- python (>= 2.4),
- debhelper (>= 5),
- imagemagick
+ python (>= 2.4),
+ debhelper (>= 5.0.51),
+ intltool,
+ imagemagick
Package: hotwire
Architecture: all
Depends: ${python:Depends},
- python-gnome2,
- python-gtk2,
- python-gobject,
- python-dbus,
- python-vte,
- python-xml,
- python-cairo,
- python-paramiko
+ python-gnome2, python2.5-gnome2 | python (>= 2.5),
+ python-gtk2, python2.5-gtk2 | python (>= 2.5),
+ python-gobject, python2.5-gobject | python (>= 2.5),
+ python-dbus, python2.5-dbus | python (>= 2.5),
+ python-vte, python2.5-vte | python (>= 2.5),
+ python-xml, python2.5-xml | python (>= 2.5),
+ python-cairo, python2.5-cairo | python (>= 2.5),
+ python-gtksourceview2, python2.5-gtksourceview2 | python (>= 2.5)
+Suggests: python-psyco
Description: Graphical, terminal-oriented shell for GNOME
Hotwire is a primary replacement for gnome-terminal/xterm and for the
/bin/sh shell. Its innovative graphical user interface is oriented
Modified: packages/unstable/hotwire/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/control.in?rev=13722&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/control.in (original)
+++ packages/unstable/hotwire/debian/control.in Mon Dec 3 20:20:45 2007
@@ -7,28 +7,28 @@
Build-Depends: cdbs (>= 0.4.45),
python-support,
gnome-pkg-tools (>= 0.10),
- python (>= 2.4),
- debhelper (>= 5),
- imagemagick
+ python (>= 2.4),
+ debhelper (>= 5.0.51),
+ intltool,
+ imagemagick
Package: hotwire
Architecture: all
Depends: ${python:Depends},
- python-gnome2,
- python-gtk2,
- python-gobject,
- python-dbus,
- python-vte,
- python-xml,
- python-cairo,
- python-paramiko
-Description: Graphical, terminal-oriented shell for GNOME
- Hotwire is a primary replacement for gnome-terminal/xterm and for the
- /bin/sh shell. Its innovative graphical user interface is oriented
- towards developers and system administrators.
+ python-gnome2, python2.5-gnome2 | python (>= 2.5),
+ python-gtk2, python2.5-gtk2 | python (>= 2.5),
+ python-gobject, python2.5-gobject | python (>= 2.5),
+ python-dbus, python2.5-dbus | python (>= 2.5),
+ python-vte, python2.5-vte | python (>= 2.5),
+ python-xml, python2.5-xml | python (>= 2.5),
+ python-cairo, python2.5-cairo | python (>= 2.5),
+ python-gtksourceview2, python2.5-gtksourceview2 | python (>= 2.5)
+Suggests: python-psyco
+Description: Extensible graphical command execution shell
+ Hotwire is a primary replacement for a terminal emulator, with an
+ innovative graphical user interface, oriented towards developers and
+ system administrators. It can natively do about 80-90% of what one
+ would normally do in a terminal with a shell, and can also embed a
+ terminal by itself.
.
- The interface is somewhere between Windows PowerShell and MacOS X
- Automator, and integrates with the GNOME desktop (e.g. with the
- trash). It also supports SSH natively.
- .
- URL: http://code.google.com/p/hotwire-shell/
+Homepage: http://code.google.com/p/hotwire-shell/
Added: packages/unstable/hotwire/debian/patches/python2.5_exec.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/patches/python2.5_exec.patch?rev=13722&op=file
==============================================================================
--- packages/unstable/hotwire/debian/patches/python2.5_exec.patch (added)
+++ packages/unstable/hotwire/debian/patches/python2.5_exec.patch Mon Dec 3 20:20:45 2007
@@ -1,0 +1,32 @@
+diff -pruN ui.orig/hotwire ui/hotwire
+--- ui.orig/hotwire 2007-11-06 23:27:06.000000000 +0100
++++ ui/hotwire 2007-11-10 14:42:16.316768063 +0100
+@@ -1,7 +1,11 @@
+ #!/usr/bin/python
+ # -*- tab-width: 4; indent-tabs-mode: nil -*-
+
+-import sys, os, getopt, logging, re, string, Queue, locale
++import sys, os
++if sys.version[:3] == '2.4':
++ os.execv('/usr/bin/python2.5', ['/usr/bin/python2.5'] + sys.argv)
++
++import getopt, logging, re, string, Queue, locale
+
+ import gtk, gobject, pango
+
+diff -pruN ui.orig/hotwire-editor ui/hotwire-editor
+--- ui.orig/hotwire-editor 2007-10-24 19:48:26.000000000 +0200
++++ ui/hotwire-editor 2007-11-10 14:42:42.530261885 +0100
+@@ -1,7 +1,11 @@
+ #!/usr/bin/python
+ # -*- tab-width: 4; indent-tabs-mode: nil -*-
+
+-import sys, os, getopt, logging, re, string, Queue
++import sys, os
++if sys.version[:3] == '2.4':
++ os.execv('/usr/bin/python2.5', ['/usr/bin/python2.5'] + sys.argv)
++
++import getopt, logging, re, string, Queue
+
+ import gtk, gobject, pango
+
Modified: packages/unstable/hotwire/debian/pyversions
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/pyversions?rev=13722&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/pyversions (original)
+++ packages/unstable/hotwire/debian/pyversions Mon Dec 3 20:20:45 2007
@@ -1,1 +1,1 @@
-2.4-
+2.5-
Modified: packages/unstable/hotwire/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/rules?rev=13722&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/rules (original)
+++ packages/unstable/hotwire/debian/rules Mon Dec 3 20:20:45 2007
@@ -6,8 +6,14 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+# We need to refactor gnome.mk into gnome-autotools.mk and gnome.mk.
+binary-install/hotwire::
+ dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)
+ dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONS_ARGS)
+
binary-post-install/hotwire::
convert -crop 22x22+1+1 debian/hotwire/usr/share/icons/hicolor/24x24/apps/hotwire.png debian/hotwire/usr/share/icons/hicolor/22x22/apps/hotwire.png
Modified: packages/unstable/hotwire/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/watch?rev=13722&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/watch (original)
+++ packages/unstable/hotwire/debian/watch Mon Dec 3 20:20:45 2007
@@ -1,2 +1,2 @@
version=3
-http://submind.verbum.org/download/hotwire-([\d\.]+).zip
+http://hotwire-shell.googlecode.com/files/hotwire-([\d\.]+).zip
More information about the pkg-gnome-commits
mailing list