removed icon again

diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am
index c0198dc..8b1cc39 100644 (file)
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@ -31,9 +31,6 @@ matrixtheme_DATA = theme/Matrix/*
 dbus_servicedir = $(datadir)/dbus-1/services
 dbus_service_DATA = org.maemo.livewp.service
 
-desktopdir    = $(datadir)/applications/hildon
-desktop_files = livewp.desktop
-desktop_DATA  = $(desktop_files)
 
 desktoppaneldir    = $(datadir)/applications/hildon-control-panel
 desktoppanel_files = livewpp.desktop
@@ -47,11 +44,6 @@ EXTRA_DIST = $(berlintheme_DATA) \
             $(dbus_service_DATA)
 
 
-livewp.desktop: livewp.desktop.in
-       sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \
-       sed "s/__PACKAGE__/$(PACKAGE)/g" $@.tmp >$@ && \
-       $(RM) *.tmp
-
 livewpp.desktop: livewpp.desktop.in
        sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \
        sed "s/__PACKAGE__/$(PACKAGE)/g" $@.tmp >$@ && \

diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index 5fd92ab..26c29db 100644 (file)
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -67,15 +67,14 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__installdirs = "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)"
+am__installdirs = "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)"
 berlinthemeDATA_INSTALL = $(INSTALL_DATA)
 dbus_serviceDATA_INSTALL = $(INSTALL_DATA)
-desktopDATA_INSTALL = $(INSTALL_DATA)
 desktoppanelDATA_INSTALL = $(INSTALL_DATA)
 matrixthemeDATA_INSTALL = $(INSTALL_DATA)
 modernthemeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(berlintheme_DATA) $(dbus_service_DATA) $(desktop_DATA) \
-       $(desktoppanel_DATA) $(matrixtheme_DATA) $(moderntheme_DATA)
+DATA = $(berlintheme_DATA) $(dbus_service_DATA) $(desktoppanel_DATA) \
+       $(matrixtheme_DATA) $(moderntheme_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -239,9 +238,6 @@ matrixthemedir = $(datadir)/livewp/theme/Matrix
 matrixtheme_DATA = theme/Matrix/* 
 dbus_servicedir = $(datadir)/dbus-1/services
 dbus_service_DATA = org.maemo.livewp.service
-desktopdir = $(datadir)/applications/hildon
-desktop_files = livewp.desktop
-desktop_DATA = $(desktop_files)
 desktoppaneldir = $(datadir)/applications/hildon-control-panel
 desktoppanel_files = livewpp.desktop
 desktoppanel_DATA = $(desktoppanel_files)
@@ -326,23 +322,6 @@ uninstall-dbus_serviceDATA:
          echo " rm -f '$(DESTDIR)$(dbus_servicedir)/$$f'"; \
          rm -f "$(DESTDIR)$(dbus_servicedir)/$$f"; \
        done
-install-desktopDATA: $(desktop_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
-       @list='$(desktop_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
-         $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
-       done
-
-uninstall-desktopDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(desktop_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
-       done
 install-desktoppanelDATA: $(desktoppanel_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(desktoppaneldir)" || $(mkdir_p) "$(DESTDIR)$(desktoppaneldir)"
@@ -433,7 +412,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-       for dir in "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)"; do \
+       for dir in "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
 install: install-am
@@ -479,8 +458,8 @@ info: info-am
 info-am:
 
 install-data-am: install-berlinthemeDATA install-dbus_serviceDATA \
-       install-desktopDATA install-desktoppanelDATA \
-       install-matrixthemeDATA install-modernthemeDATA
+       install-desktoppanelDATA install-matrixthemeDATA \
+       install-modernthemeDATA
 
 install-exec-am:
 
@@ -507,31 +486,23 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \
-       uninstall-desktopDATA uninstall-desktoppanelDATA \
-       uninstall-info-am uninstall-matrixthemeDATA \
-       uninstall-modernthemeDATA
+       uninstall-desktoppanelDATA uninstall-info-am \
+       uninstall-matrixthemeDATA uninstall-modernthemeDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
        dvi-am html html-am info info-am install install-am \
        install-berlinthemeDATA install-data install-data-am \
-       install-dbus_serviceDATA install-desktopDATA \
-       install-desktoppanelDATA install-exec install-exec-am \
-       install-info install-info-am install-man \
+       install-dbus_serviceDATA install-desktoppanelDATA install-exec \
+       install-exec-am install-info install-info-am install-man \
        install-matrixthemeDATA install-modernthemeDATA install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
        uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \
-       uninstall-desktopDATA uninstall-desktoppanelDATA \
-       uninstall-info-am uninstall-matrixthemeDATA \
-       uninstall-modernthemeDATA
-
+       uninstall-desktoppanelDATA uninstall-info-am \
+       uninstall-matrixthemeDATA uninstall-modernthemeDATA
 
-livewp.desktop: livewp.desktop.in
-       sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \
-       sed "s/__PACKAGE__/$(PACKAGE)/g" $@.tmp >$@ && \
-       $(RM) *.tmp
 
 livewpp.desktop: livewpp.desktop.in
        sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \

diff --git a/applet/debian/changelog b/applet/debian/changelog
index f62f761..fce69ee 100644 (file)
--- a/applet/debian/changelog
+++ b/applet/debian/changelog
@@ -1,3 +1,9 @@
+live-wallpaper (0.5) unstable; urgency=low
+
+  * Removed unusable menu icon again
+
+ -- Vlad Vasiliev <vlad@gas.by>  Sun, 02 May 2010 21:29:10 +0200
+
 live-wallpaper (0.4.2) unstable; urgency=low
 
   * Fixed number version in about window