Merging skeleton changes

[gonvert] / support / builddeb.py

diff --git a/support/builddeb.py b/support/builddeb.py
index bd89d13..b6abd9e 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -66,7 +66,11 @@ 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 = "gpl"
@@ -98,6 +102,7 @@ def build_package(distribution):
                "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"
@@ -109,6 +114,11 @@ def build_package(distribution):
                )
        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(