[Pkg-privacy-commits] [torbrowser-launcher] 16/476: getting the icons working with the Makefile

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit a183c5101bfb9757132cc613ffaeadd4cddbe26c
Author: Micah Lee <micahflee at riseup.net>
Date:   Sun Feb 10 13:56:33 2013 -0800

    getting the icons working with the Makefile
---
 Makefile.am                      | 5 +++++
 {misc => icons}/torbrowser32.xpm | 0
 {misc => icons}/torbrowser80.xpm | 0
 misc/torbrowser.desktop          | 9 ---------
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d42b429..decbcad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,8 @@ EXTRA_DIST=  \
 desktopdir = $(datadir)/applications
 desktop_DATA = \
 	torbrowser-launcher.desktop
+
+# The icons
+iconsdir = $(datadir)/icons
+icons_DATA = icons/torbrowser32.xpm icons/torbrowser80.xpm
+
diff --git a/misc/torbrowser32.xpm b/icons/torbrowser32.xpm
similarity index 100%
rename from misc/torbrowser32.xpm
rename to icons/torbrowser32.xpm
diff --git a/misc/torbrowser80.xpm b/icons/torbrowser80.xpm
similarity index 100%
rename from misc/torbrowser80.xpm
rename to icons/torbrowser80.xpm
diff --git a/misc/torbrowser.desktop b/misc/torbrowser.desktop
deleted file mode 100644
index ed40f2b..0000000
--- a/misc/torbrowser.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Tor Browser
-Comment=Launch the Tor Browser Bundle
-Exec=/usr/bin/torbrowser-launcher
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/torbrowser80.xpm
-Categories=Internet;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git