[Python-apps-commits] r3365 - in packages/vboxgtk/trunk/debian (4 files)
dktrkranz-guest at users.alioth.debian.org
dktrkranz-guest at users.alioth.debian.org
Fri Jul 31 22:00:26 UTC 2009
Date: Friday, July 31, 2009 @ 22:00:22
Author: dktrkranz-guest
Revision: 3365
Compatibility with Python 2.5
Added:
packages/vboxgtk/trunk/debian/patches/02-Python2.5_compatibility.diff
Modified:
packages/vboxgtk/trunk/debian/changelog
packages/vboxgtk/trunk/debian/patches/series
packages/vboxgtk/trunk/debian/rules
Modified: packages/vboxgtk/trunk/debian/changelog
===================================================================
--- packages/vboxgtk/trunk/debian/changelog 2009-07-31 20:15:12 UTC (rev 3364)
+++ packages/vboxgtk/trunk/debian/changelog 2009-07-31 22:00:22 UTC (rev 3365)
@@ -1,5 +1,6 @@
vboxgtk (0.5.0-1) UNRELEASED; urgency=low
+ [ Devid Antonio Filoni ]
* New upstream release.
* Switch to debhelper 7.
* Remove useless debian/patches/base_path.diff patch.
@@ -10,8 +11,12 @@
* Add debian/patches/01-desktop-file.diff patch, fix FTBFS.
* Fix copyright-with-old-dh-make-debian-copyright lintian info.
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sun, 05 Jul 2009 21:10:33 +0200
+ [ Luca Falavigna ]
+ * debian/patches/02-Python2.5_compatibility.diff:
+ - Compatibility with Python 2.5.
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Fri, 31 Jul 2009 23:44:08 +0200
+
vboxgtk (0.4.1-1) unstable; urgency=low
[ Devid Antonio Filoni ]
Added: packages/vboxgtk/trunk/debian/patches/02-Python2.5_compatibility.diff
===================================================================
--- packages/vboxgtk/trunk/debian/patches/02-Python2.5_compatibility.diff (rev 0)
+++ packages/vboxgtk/trunk/debian/patches/02-Python2.5_compatibility.diff 2009-07-31 22:00:22 UTC (rev 3365)
@@ -0,0 +1,186 @@
+Compatibility with Python 2.5
+
+Index: vboxgtk-0.5.0/setup.py
+===================================================================
+--- vboxgtk-0.5.0.orig/setup.py 2009-07-31 23:35:55.000000000 +0200
++++ vboxgtk-0.5.0/setup.py 2009-07-31 23:43:23.000000000 +0200
+@@ -11,6 +11,7 @@
+ Clean removes the translations, .pyc and .pyo files and some other things.
+ """
+
++from __future__ import with_statement
+
+ import textwrap
+ import glob
+Index: vboxgtk-0.5.0/bin/vboxgtk
+===================================================================
+--- vboxgtk-0.5.0.orig/bin/vboxgtk 2009-07-31 23:40:18.000000000 +0200
++++ vboxgtk-0.5.0/bin/vboxgtk 2009-07-31 23:42:55.000000000 +0200
+@@ -30,6 +30,7 @@
+ anyway (hoping that the user has added the necessary paths to PYTHONPATH).
+ """
+
++from __future__ import with_statement
+
+ import os
+ import sys
+@@ -73,10 +74,10 @@
+ """
+ try:
+ import xpcom.vboxxpcom
+- except ImportError as ex:
++ except ImportError, ex:
+ print "ERROR: xpcom package not found\n" + textwrap.dedent(msg)
+ raise ex
+- except Exception as ex:
++ except Exception, ex:
+ print "ERROR: exception importing xpcom\n" + textwrap.dedent(msg)
+ raise ex
+
+Index: vboxgtk-0.5.0/vboxgtk/vboxdao_xpcom.py
+===================================================================
+--- vboxgtk-0.5.0.orig/vboxgtk/vboxdao_xpcom.py 2009-07-31 23:37:41.000000000 +0200
++++ vboxgtk-0.5.0/vboxgtk/vboxdao_xpcom.py 2009-07-31 23:38:34.000000000 +0200
+@@ -158,7 +158,7 @@
+ progress.waitForCompletion(-1)
+ self.hard_disks.append(hd)
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def add_hd(self, path):
+@@ -167,7 +167,7 @@
+ hd = self.vbox.openHardDisk(path, mode)
+ self.hard_disks.append(hd)
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def remove_hd(self, hd_num, delete_file):
+@@ -179,7 +179,7 @@
+ hd.close()
+ del self.hard_disks[hd_num]
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def add_dvd_image(self, path):
+@@ -188,7 +188,7 @@
+ dvd = self.vbox.openDVDImage(path, new_id)
+ self.dvd_images.append(dvd)
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def remove_dvd_image(self, dvd_num):
+@@ -197,7 +197,7 @@
+ dvd.close()
+ del self.dvd_images[dvd_num]
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ ## VM
+@@ -212,7 +212,7 @@
+ self.vbox.registerMachine(vm)
+ self.vms.append(vm)
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def delete_vm(self, vm_number):
+@@ -224,7 +224,7 @@
+ vm.deleteSettings()
+ del self.vms[vm_number]
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def prepare_vm(self, vm_number):
+@@ -239,7 +239,7 @@
+ progress.waitForCompletion(-1)
+ try:
+ session.close()
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+ return (0, None)
+
+@@ -281,7 +281,7 @@
+ session.machine.attachHardDisk(hd_id, sc, 0, 0)
+ session.machine.saveSettings()
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def get_dvd_id(self, vm_number):
+@@ -306,7 +306,7 @@
+ session.machine.DVDDrive.mountImage(dvd_id)
+ session.machine.saveSettings()
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def update_settings(self, vm_number, os_type, hw_virt_ext, mem, vmem,
+@@ -355,7 +355,7 @@
+ session.machine.createSharedFolder(name, folder, writable)
+ session.machine.saveSettings()
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def remove_shared(self, vm_number, shared_name):
+@@ -365,7 +365,7 @@
+ session.machine.removeSharedFolder(shared_name)
+ session.machine.saveSettings()
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def get_snapshot_tree(self, vm_number):
+@@ -390,7 +390,7 @@
+ progress = console.takeSnapshot(name, description)
+ progress.waitForCompletion(-1)
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def edit_snapshot(self, vm_number, uuid, name):
+@@ -399,7 +399,7 @@
+ snapshot = vm.getSnapshot(uuid)
+ snapshot.name = name
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def discard_snapshot(self, vm_number, uuid):
+@@ -410,7 +410,7 @@
+ progress = console.discardSnapshot(uuid)
+ progress.waitForCompletion(-1)
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
+ def discard_current_state(self, vm_number):
+@@ -421,6 +421,6 @@
+ progress = console.discardCurrentState()
+ progress.waitForCompletion(-1)
+ return (0, None)
+- except xpcom.Exception as e:
++ except xpcom.Exception, e:
+ return (1, e.message)
+
Modified: packages/vboxgtk/trunk/debian/patches/series
===================================================================
--- packages/vboxgtk/trunk/debian/patches/series 2009-07-31 20:15:12 UTC (rev 3364)
+++ packages/vboxgtk/trunk/debian/patches/series 2009-07-31 22:00:22 UTC (rev 3365)
@@ -1 +1,2 @@
01-desktop-file.diff
+02-Python2.5_compatibility.diff
Modified: packages/vboxgtk/trunk/debian/rules
===================================================================
--- packages/vboxgtk/trunk/debian/rules 2009-07-31 20:15:12 UTC (rev 3364)
+++ packages/vboxgtk/trunk/debian/rules 2009-07-31 22:00:22 UTC (rev 3365)
@@ -2,3 +2,11 @@
%:
dh --with quilt $@
+
+clean:
+ # it's ugly to apply patches in clean target, but this is needed to
+ # avoid distutils complaining about 'with' reserved Python 2.6 word
+ # while cleaning the package.
+ dh_quilt_patch
+ dh $@
+ dh_quilt_unpatch
More information about the Python-apps-commits
mailing list