[pitivi] Remove duplicate icon file
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pitivi] Remove duplicate icon file
- Date: Sun, 6 Sep 2009 07:20:26 +0000 (UTC)
commit 2f78259624d473e286fd319f43ad060c93dbc0a9
Author: Michael Terry <michael terry canonical com>
Date: Mon Jul 20 20:19:42 2009 -0400
Remove duplicate icon file
http://bugzilla.gnome.org/show_bug.cgi?id=520653
Makefile.am | 17 -----------------
icons/Makefile.am | 12 ++++++++++++
pitivi.png | Bin 3680 -> 0 bytes
pitivi.spec.in | 2 +-
4 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index de5919b..c5fb961 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,6 @@ desktop_in_files = pitivi.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = pitivi.png
-
mimedir = $(datadir)/mime/packages
mime_DATA = pitivi.xml
@@ -22,7 +19,6 @@ EXTRA_DIST = \
AUTHORS \
RELEASE \
ABOUT-NLS \
- $(ICON_DATA) \
pitivi.xml
@@ -43,19 +39,6 @@ EXTRA_DIST += \
$(desktop_in_files)
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-install-data-hook: update-icon-cache
-uinstall-hook: update-icon-cache
-update-icon-cache:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
- else \
- echo "*** Icon cache not updated. After (un)install, run this:"; \
- echo "*** $(gtk_update_icon_cache)"; \
- fi
-
-
locale-uninstalled:
if test -d po; then \
$(MAKE) -C po datadir=../$(top_builddir) install; \
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 4f161aa..fb12af6 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1 +1,13 @@
SUBDIRS = 16x16 22x22 24x24 32x32 48x48
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+install-data-hook: update-icon-cache
+uinstall-hook: update-icon-cache
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
diff --git a/pitivi.spec.in b/pitivi.spec.in
index d7706ac..298fc46 100644
--- a/pitivi.spec.in
+++ b/pitivi.spec.in
@@ -43,7 +43,7 @@ PiTiVi non-linear video editor
%{_bindir}/pitivi
%{_libdir}/pitivi
%{_datadir}/pitivi/pixmaps/*
-%{_datadir}/icons/hicolor/48x48/apps/pitivi.png
+%{_datadir}/icons
%{_datadir}/applications/pitivi.desktop
%{_datadir}/locale
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]