Merging skeleton changes

diff --cc support/builddeb.py
index bd89d13,04fd6e2..b6abd9e
--- 1/support/builddeb.py
--- 2/support/builddeb.py
+++ b/support/builddeb.py
@@@ -66,18 -66,21 +66,22 @@@ def build_package(distribution)
        p = py2deb.Py2deb(__appname__)
        p.prettyName = constants.__pretty_app_name__
        p.description = __description__
++<<<<<<< HEAD
 +      p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=Gonvert"
++=======
+       p.bugTracker = "REPLACEME"
++>>>>>>> 6e3215856a887adc778853fcacf0dfcee13701bc
        p.author = __author__
        p.mail = __email__
 -      p.license = "lgpl"
 +      p.license = "gpl"
        p.depends = ", ".join([
                "python2.6 | python2.5",
 -              "python-gtk2 | python2.5-gtk2",
 -              "python-xml | python2.5-xml",
 -              "python-dbus | python2.5-dbus",
 +              "python-simplejson",
        ])
 -      maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
 -              "debian": ", python-glade2",
 -              "diablo": maemoSpecificDepends + ", python2.5-conic",
 -              "fremantle": maemoSpecificDepends + ", python-glade2, python-alarm",
 +              "debian": ", python-qt4",
 +              "diablo": ", python2.5-qt4-core, python2.5-qt4-gui",
 +              "fremantle": ", python2.5-qt4-core, python2.5-qt4-gui, python2.5-qt4-maemo5",
        }[distribution]
        p.recommends = ", ".join([
        ])
@@@ -94,21 -97,13 +98,27 @@@
        p.postinstall = __postinstall__
        p.preremove = __preremove__
        p.icon = {
 -              "debian": "REPLACEME",
 -              "diablo": "REPLACEME",
 -              "fremantle": "REPLACEME", # Fremantle natively uses 48x48
 +              "debian": "data-pixmaps-gonvert.png",
 +              "diablo": "data-pixmaps-gonvert.png",
 +              "fremantle": "data-pixmaps-gonvert.png", # Fremantle natively uses 48x48
        }[distribution]
++<<<<<<< HEAD
 +      p["/opt/gonvert/bin"] = [ "gonvert.py" ]
 +      for relPath, files in unflatten_files(find_files("src", ".")).iteritems():
 +              fullPath = "/opt/gonvert/lib"
 +              if relPath:
 +                      fullPath += os.sep+relPath
 +              p[fullPath] = list(
 +                      "|".join((oldName, newName))
 +                      for (oldName, newName) in files
 +              )
 +      for relPath, files in unflatten_files(find_files("data", ".")).iteritems():
 +              fullPath = "/opt/gonvert/share"
++=======
+       p["/opt/REPLACEME/bin"] = [ "REPLACEME" ]
+       for relPath, files in unflatten_files(find_files("src", ".")).iteritems():
+               fullPath = "/opt/REPLACEME/lib"
++>>>>>>> 6e3215856a887adc778853fcacf0dfcee13701bc
                if relPath:
                        fullPath += os.sep+relPath
                p[fullPath] = list(