put icons into right place

diff --git a/debian/dirs b/debian/dirs
index 3c786a2..818637a 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,6 +2,6 @@ usr/share/applications/hildon-home
 usr/share/applications/hildon
 usr/lib/hildon-desktop
 usr/share/xkcdha
 usr/share/applications/hildon
 usr/lib/hildon-desktop
 usr/share/xkcdha

-usr/share/icons
-usr/share/dbus-1/services/
+usr/share/icons/hicolor
+usr/share/dbus-1/services

 
 

diff --git a/debian/rules b/debian/rules
index cb105b0..3aae40c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ install: build
        cp $(CURDIR)/$(PACKAGE).app.desktop $(PREFIX)/usr/share/applications/hildon/$(PACKAGE).desktop
        cp $(CURDIR)/$(PACKAGE).service $(PREFIX)/usr/share/dbus-1/services/
        cp -r $(CURDIR)/icons $(PREFIX)/usr/share/$(PACKAGE)/
        cp $(CURDIR)/$(PACKAGE).app.desktop $(PREFIX)/usr/share/applications/hildon/$(PACKAGE).desktop
        cp $(CURDIR)/$(PACKAGE).service $(PREFIX)/usr/share/dbus-1/services/
        cp -r $(CURDIR)/icons $(PREFIX)/usr/share/$(PACKAGE)/

-       cp -r $(CURDIR)/maemo-icons/* $(PREFIX)/usr/share/icons/
+       cp -r $(CURDIR)/maemo-icons/* $(PREFIX)/usr/share/icons/hicolor/

        cp -r $(CURDIR)/img $(PREFIX)/usr/share/$(PACKAGE)/
        dh_link usr/lib/hildon-desktop/$(PACKAGE).py usr/bin/$(PACKAGE)
 
        cp -r $(CURDIR)/img $(PREFIX)/usr/share/$(PACKAGE)/
        dh_link usr/lib/hildon-desktop/$(PACKAGE).py usr/bin/$(PACKAGE)
 

diff --git a/maemo-icons/40x40/hildon/xkcdha.png b/maemo-icons/40x40/hildon/xkcdha.png
deleted file mode 100644 (file)
index 1391f4b..0000000
Binary files a/maemo-icons/40x40/hildon/xkcdha.png and /dev/null differ