Merging skeleton changes

diff --combined support/builddeb.py
index bd89d13,04fd6e2..b6abd9e
--- 1/support/builddeb.py
--- 2/support/builddeb.py
+++ b/support/builddeb.py
@@@ -3,33 -3,33 +3,33 @@@
  import os
  import sys
  
 -try:
 -      import py2deb
 -except ImportError:
 -      import fake_py2deb as py2deb
 +import py2deb
  
  import constants
  
  
  __appname__ = constants.__app_name__
 -__description__ = """REPLACEME
 -REPLACEME
 +__description__ = """Unit Conversions
 +A conversion utility that allows conversion between many units like CGS, Ancient, Imperial with many categories like length, mass, numbers, etc. All units converted values shown at once as you type
  .
 -Homepage:
 +Homepage: http://www.unihedron.com/projects/gonvert/index.php
  """
 -__author__ = "Ed Page"
 -__email__ = "eopage@byu.net"
 +__author__ = "Anthony Tekatch"
 +__email__ = "anthony@unihedron.com"
  __version__ = constants.__version__
  __build__ = constants.__build__
  __changelog__ = """
 -REPLACEME
 +* A condensed view of unit conversion for those who so chose
 +* Changed the way windows handle closing
 +* Improved performance of jumping between some of the windows (including startup)
 +* Persisting the sort preference
  """
  
  
  __postinstall__ = """#!/bin/sh -e
  
  gtk-update-icon-cache -f /usr/share/icons/hicolor
 -rm -f ~/.REPLACEME/REPLACEME.log
 +rm -f ~/.gonvert/gonvert.log ~/.gonvert/selections.dat ~/.gonvert/window.dat
  """
  
  __preremove__ = """#!/bin/sh -e
@@@ -66,25 -66,28 +66,29 @@@ 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([
        ])
        p.section = {
 -              "debian": "REPLACEME",
 -              "diablo": "user/REPLACEME",
 -              "fremantle": "user/REPLACEME",
 +              "debian": "science",
 +              "diablo": "user/science",
 +              "fremantle": "user/science",
        }[distribution]
        p.arch = "all"
        p.urgency = "low"
@@@ -94,31 -97,23 +98,37 @@@
        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(
                        "|".join((oldName, newName))
                        for (oldName, newName) in files
                )
 -      p["/usr/share/applications/hildon"] = ["REPLACEME.desktop"]
 -      p["/usr/share/icons/hicolor/26x26/hildon"] = ["REPLACEME"]
 -      p["/usr/share/icons/hicolor/64x64/hildon"] = ["REPLACEME"]
 -      p["/usr/share/icons/hicolor/scalable/hildon"] = ["REPLACEME"]
 +      p["/usr/share/applications/hildon"] = ["gonvert.desktop"]
 +      p["/usr/share/icons/hicolor/26x26/hildon"] = ["data-pixmaps-gonvert.png|gonvert.png"]
 +      p["/usr/share/icons/hicolor/64x64/hildon"] = ["data-pixmaps-gonvert.png|gonvert.png"]
 +      p["/usr/share/icons/hicolor/scalable/hildon"] = ["data-pixmaps-gonvert.png|gonvert.png"]
  
        if distribution == "debian":
                print p