Fixing package building

diff --git a/Makefile b/Makefile
index 7c8aef1..72cbae0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,10 +66,9 @@ package: $(OBJ) build_mo
        #$(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        $(foreach file, $(LOCALE_FILES), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        cp data/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
-       cp data/$(PROJECT_NAME).service $(BUILD_PATH)/generic
-       cp data/26_$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
-       cp data/40_$(PROJECT_NAME).png $(BUILD_PATH)/generic/40x40-$(PROJECT_NAME).png
-       cp data/64_$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
+       cp data/icons/26_$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
+       cp data/icons/40_$(PROJECT_NAME).png $(BUILD_PATH)/generic/40x40-$(PROJECT_NAME).png
+       cp data/icons/64_$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
        cp support/builddeb.py $(BUILD_PATH)/generic
        cp support/py2deb.py $(BUILD_PATH)/generic
        cp support/fake_py2deb.py $(BUILD_PATH)/generic

diff --git a/support/builddeb.py b/support/builddeb.py
index 363f470..699c78d 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -23,7 +23,7 @@ __build__ = constants.__build__
 __changelog__ = """
 0.3.1
   * I18N, extract de.po, add ru.po.
- 
+
 0.3.0
   * Initial Release.
 """
@@ -99,7 +99,7 @@ def build_package(distribution):
        p.icon = {
                "debian": "26x26-multilist.png",
                "diablo": "26x26-multilist.png",
-               "fremantle": "48x48-multilist.png", # Fremantle natively uses 48x48
+               "fremantle": "40x40-multilist.png", # Fremantle natively uses 48x48
        }[distribution]
        p["/usr/bin"] = [ "multilist.py" ]
        for relPath, files in unflatten_files(find_files(".", "locale")).iteritems():