Pulling in skeleton changes

[quicknote] / Makefile

diff --git a/Makefile b/Makefile
index 197d40d..d0d39b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,6 @@ debug: $(OBJ)
 test: $(OBJ)
        $(UNIT_TEST)
 
-package: clean $(OBJ) all
-       dpkg-buildpackage -rfakeroot 
-       dpkg -i ../$(PROJECT_NAME)_$(PROJECT_VERSION)_all.deb
-
 update_po: po/templates.pot
        @for lang in $(basename $(notdir $(wildcard po/*.po))); do \
                msgmerge -U --strict --no-wrap po/$$lang.po po/templates.pot; \
@@ -59,7 +55,7 @@ build_mo:
                msgfmt --statistics -c -o locale/$$lang/LC_MESSAGES/$(TEXT_DOMAIN).mo po/$$lang.po; \
        done
 
-build: $(OBJ) build_mo
+package: $(OBJ) build_mo
        rm -Rf $(BUILD_PATH)
 
        mkdir -p $(BUILD_PATH)/generic
@@ -71,26 +67,17 @@ build: $(OBJ) build_mo
        $(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/low/$(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/48/$(PROJECT_NAME).png $(BUILD_PATH)/generic/48x48-$(PROJECT_NAME).png
-       cp data/scale/$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
+       cp data/*_$(PROJECT_NAME).png $(BUILD_PATH)/generic/
        cp support/builddeb.py $(BUILD_PATH)/generic
        cp support/py2deb.py $(BUILD_PATH)/generic
        cp support/fake_py2deb.py $(BUILD_PATH)/generic
 
-       mkdir -p $(BUILD_PATH)/chinook
-       cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/chinook
-       cd $(BUILD_PATH)/chinook ; python builddeb.py chinook
        mkdir -p $(BUILD_PATH)/diablo
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
        cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
        mkdir -p $(BUILD_PATH)/fremantle
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/fremantle
        cd $(BUILD_PATH)/fremantle ; python builddeb.py fremantle
-       mkdir -p $(BUILD_PATH)/mer
-       cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
-       cd $(BUILD_PATH)/mer ; python builddeb.py mer
        mkdir -p $(BUILD_PATH)/debian
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
        cd $(BUILD_PATH)/debian ; python builddeb.py debian
@@ -98,8 +85,7 @@ build: $(OBJ) build_mo
 upload:
        dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
        dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
-       dput chinook-extras-builder $(BUILD_PATH)/chinook/$(PROJECT_NAME)*.changes
-       cp $(BUILD_PATH)/debian/*.deb ../www/$(PROJECT_NAME).deb
+       cp $(BUILD_PATH)/debian/*.deb ./www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
        $(foreach file, $(SOURCE), $(LINT) $(file) ; )