packaging problems

.quickly

@@ -1,4 +1,4 @@
 project = lutris
 template = ubuntu-application
 lp_id = lutris
-version = 0.4.3
+version = 0.6

apport/source_lutris.py

@@ -1,6 +1,6 @@
 # Apport integration for lutris
 #
-# -*- coding: utf-8 -*-
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
 # This program is free software: you can redistribute it and/or modify it 

bin/lutris

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
 # This program is free software: you can redistribute it and/or modify it

debian/control

@@ -5,16 +5,14 @@ Build-Depends: cdbs (>= 0.4.43), debhelper (>= 6), python,
  python-support (>= 0.6.4), python-distutils-extra (>= 2.10)
 Maintainer: Mathieu Comandon <strycore@gmail.com>
 Standards-Version: 3.9.1
-XS-Python-Version: current
 
 Package: lutris
 Architecture: all
-XB-Python-Version: ${python:Versions}
+Depends: ${misc:Depends}, ${python:Depends}, python-apport, python-pyglet,
-Depends: ${misc:Depends}, ${python:Depends}, python-apport,
+ python-gobject, python-apt, python-gtk2, python-yaml, python-gconf, joy2key
- python-gobject, python-apt, python-gtk2, python-yaml, python-gconf, python-pyglet
 Description: Install and play any video game easily
- Lutris is a gaming platform for GNU/Linux. It's goal is to make 
+ Lutris is a gaming platform for GNU/Linux. It's goal is to make
  gaming on Linux as easy as possible by taking care of installing
- and setting up the game for the user. The only thing you have to 
+ and setting up the game for the user. The only thing you have to
  do is play the game. It aims to support every game that is playable
- on Linux. 
+ on Linux.

debian/pycompat

@@ -0,0 +1 @@
+2

debian/pyversions

@@ -0,0 +1 @@
+2.6

lutris/gui/aboutdialog.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
 # This program is free software: you can redistribute it and/or modify it 

lutris/helpers.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
 # This program is free software: you can redistribute it and/or modify it 

lutris/lutrisconfig.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
 # This program is free software: you can redistribute it and/or modify it 

lutris/runners/jzintv.py

@@ -35,7 +35,7 @@ class jzintv(Runner):
 
 
         self.description = "Intellivision Emulator"
-      
+
         self.game_options = [{"option":"rom","type":"single","label":"Rom File"}]
         self.runner_options = [{"option": "bios_path", "type":"directory_chooser", "label":"Bios Path"},
                                {"option": "fullscreen", "type":"bool", "label":"Fullscreen"},
@@ -59,4 +59,4 @@ class jzintv(Runner):
     def play(self):
         command = [self.executable] + self.arguments
         return command
-        
+

lutris/runners/o2em.py

@@ -61,9 +61,9 @@ class o2em(Runner):
             romfile = os.path.basename(settings["game"]["rom"])
             self.arguments = self.arguments + ["-romdir=\"%s\"" % romdir+"/"]
             self.arguments = self.arguments + ["\""+romfile+"\""]
-            
+
 
     def play(self):
         command = [self.executable] + self.arguments
         return command
-        
+

lutris/runners/openmsx.py

@@ -35,9 +35,8 @@ class openmsx(Runner):
         self.runner_options = []
         if settings:
             self.rom = settings["game"]["rom"]
-        
+
-        
     def play(self):
         command = [self.executable,"\""+self.rom+"\""]
         return command
-        
+

lutris/runners/scummvm.py

@@ -54,7 +54,7 @@ class scummvm(Runner):
         self.runner_options = [ \
             {"option":"fullscreen", "label":"Fullscreen", "type":"bool"},
             {"option":"gfx-mode", "label": "Graphics scaler", "type":"one_choice", "choices":scaler_modes}]
-        
+
         if isinstance(settings, LutrisConfig):
             config = settings.config
             if "scummvm" in config:
@@ -64,7 +64,7 @@ class scummvm(Runner):
                 if "gfx-mode" in config["scummvm"]:
                     self.gfxmode = "--gfx-mode="+config["scummvm"]["gfx-mode"]
             self.game = settings["name"]
-            
+
     def play(self):
         return [self.executable,self.fullscreen,self.gfxmode,self.game]
 
@@ -101,7 +101,7 @@ class scummvm(Runner):
             if gameListStart:
                 if len(game) > 1:
                     dirLimit=game.index(" ")
-                else : 
+                else :
                     dirLimit == None
                 if dirLimit != None:
                     gameDir = game[0:dirLimit]
@@ -110,5 +110,4 @@ class scummvm(Runner):
             if game.startswith("-----"):
                 gameListStart = True
         return gameArray
-        
+
-        

lutris/runners/uae.py

@@ -36,7 +36,7 @@ class uae(Runner):
         amiga_choices = [("Amiga 500","amiga500"),
                          ("Amiga 1200","amiga1200")]
         self.game_options = [ {"option": "disk", "type":"multiple", "label":"Floppies"}]
- 
+
         self.runner_options = [
           {"option": "x11.rom_path", "label": "Rom Path", "type":"directory_chooser"},
           {"option": "x11.floppy_path", "label":"Floppy path", "type": "directory_chooser"},
@@ -111,7 +111,7 @@ class uae(Runner):
                     inserted_disks = inserted_disks +1
                     if inserted_disks == disks:
                         break
-                    
+
     def get_game_options(self):
         return {"file":self.file_options , "options":self.runner_options}
 
@@ -122,5 +122,4 @@ class uae(Runner):
             command.append("-s")
             command.append(option+"="+self.uae_options[option])
         return command
-       
+
-        

lutris/runners/vice.py

@@ -33,7 +33,7 @@ class vice(Runner):
         self.machine = "Commodore 64"
 
         self.arguments = []
-        
+
         self.description = "Commodore Emulator"
         self.game_options = [{"option":"disk","type":"single","label":"Disk File"}]
         self.runner_options = [{"option": "joy", "type":"bool", "label":"Use joysticks"},
@@ -53,8 +53,7 @@ class vice(Runner):
 
             self.arguments = self.arguments + ["\""+settings['game']['disk']+"\""]
 
-
     def play(self):
         command = [self.executable] + self.arguments
         return command
-        
+

lutris/script_interpreter.py

@@ -21,12 +21,13 @@
 
 import yaml
 import urlparse
-from tool.url_tool import UrlTool
 import os
 import hashlib
 import logging
 import lutris.constants
 
+from lutris.tool.url_tool import UrlTool
+
 class LutrisInterpreter():
 
     def __init__(self, filename = None):
@@ -36,7 +37,7 @@ class LutrisInterpreter():
         self.dirs = {}
         self.dirs['cache'] = lutris.constants.cache_path
         self.dirs['gamedir'] = '/home/strider/Jeux'
-        
+
         if filename:
             self.load(filename)
 
@@ -59,7 +60,7 @@ class LutrisInterpreter():
                     self.files[file_id] = destpath
                 else:
                     print 'not a url', file_id
-        
+
     def install(self):
         if not 'installer' in self.config:
             return False
@@ -77,20 +78,20 @@ class LutrisInterpreter():
                     self.dirs[extract_info['newdir']] = dest
                 else:
                     dest = self.dirs[extract_info['destination']]
-                self.extract(extract_info['file'], dest)    
+                self.extract(extract_info['file'], dest)
-    
+
     def check_md5(self, file_id):
-        print 'checking ', self.files[file_id]     
+        print 'checking ', self.files[file_id]
-    
+
     def extract(self,archive,dest,options = {}):
         if not 'method' in options:
             method = 'zip'
         else:
-            method = options['method'] 
+            method = options['method']
         print "extracting %s to %s " % (self.files[archive], dest )
         command = "unzip %s -d  %s"%(self.files[archive], dest)
         os.system(command)
-    
+
     def move(self,source, destination):
         os.move
 

setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
 # This program is free software: you can redistribute it and/or modify it