Merging skeleton changes

[gonvert] / support / builddeb.py

diff --git a/support/builddeb.py b/support/builddeb.py
index f607ab0..b6abd9e 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -19,13 +19,10 @@ __email__ = "anthony@unihedron.com"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-* Switched from GTK to QT in preparation for Meego, all previous features still present
-* Except removed the current form of search
-* Added a "Recent" window
-* Added a "Quick Jump" window (to replace old form of search)
-* Added favorites to limit the number of categories and units shown
-* Should be auto-rotatable (might not be working for some reason)
-* Should auto-enable Fn on Maemo 5
+* 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
 """
 
 
@@ -69,13 +66,17 @@ 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.upgradeDescription = __changelog__.split("\n\n", 1)[0]
+=======
+       p.bugTracker = "REPLACEME"
+>>>>>>> 6e3215856a887adc778853fcacf0dfcee13701bc
        p.author = __author__
        p.mail = __email__
        p.license = "gpl"
        p.depends = ", ".join([
                "python2.6 | python2.5",
+               "python-simplejson",
        ])
        p.depends += {
                "debian": ", python-qt4",
@@ -101,9 +102,10 @@ def build_package(distribution):
                "diablo": "data-pixmaps-gonvert.png",
                "fremantle": "data-pixmaps-gonvert.png", # Fremantle natively uses 48x48
        }[distribution]
-       p["/usr/bin"] = [ "gonvert.py" ]
+<<<<<<< HEAD
+       p["/opt/gonvert/bin"] = [ "gonvert.py" ]
        for relPath, files in unflatten_files(find_files("src", ".")).iteritems():
-               fullPath = "/usr/lib/gonvert"
+               fullPath = "/opt/gonvert/lib"
                if relPath:
                        fullPath += os.sep+relPath
                p[fullPath] = list(
@@ -111,7 +113,12 @@ def build_package(distribution):
                        for (oldName, newName) in files
                )
        for relPath, files in unflatten_files(find_files("data", ".")).iteritems():
-               fullPath = "/usr/share/gonvert"
+               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(