From: Richard Kettlewell <rjk@terraraq.org.uk>
Date: Sun, 17 Feb 2013 16:10:24 +0000 (+0000)
Subject: disobedience: add a disobedience.desktop file
X-Git-Tag: branchpoint-5.1~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/51827ce3c5ef5edce4a4659e91f599de72d688d1

disobedience: add a disobedience.desktop file
---

diff --git a/CHANGES.html b/CHANGES.html
index 3bffb46..4fbc197 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -45,6 +45,9 @@ href="README.upgrades.html">README.upgrades</a> before upgrading.</p>
     it will not work.  This depends on a server change too, so it may still be
     wrong if a new Disobedience is used against an old server.</p>
 
+    <p>A <tt>.desktop</tt> file is now shipped, making Disobedience visible as
+    an application in freedesktop.org-compliant systems.</p>
+
   </div>
 
   <h3>Backups</h3>
diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 3aff555..66473d9 100644
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -33,10 +33,29 @@ disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
 	$(LIBASOUND) $(COREAUDIO) $(LIBICONV)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
+install-data-local:
+	$(MKDIR_P) ${DESTDIR}${datarootdir}/applications
+	$(INSTALL) -m 644 ${srcdir}/disobedience.desktop \
+		${DESTDIR}${datarootdir}/applications/disobedience.desktop
+	$(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps
+	$(INSTALL) -m 644 ${top_srcdir}/images/disobedience48x48.png \
+		${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/disobedience.png
+	$(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/64x64/apps
+	$(INSTALL) -m 644 ${top_srcdir}/images/disobedience64x64.png \
+		${DESTDIR}${datarootdir}/icons/hicolor/64x64/apps/disobedience.png
+	$(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/128x128/apps
+	$(INSTALL) -m 644 ${top_srcdir}/images/disobedience128x128.png \
+		${DESTDIR}${datarootdir}/icons/hicolor/128x128/apps/disobedience.png
+	$(MKDIR_P) ${DESTDIR}${datarootdir}/icons/hicolor/256x256/apps
+	$(INSTALL) -m 644 ${top_srcdir}/images/disobedience256x256.png \
+		${DESTDIR}${datarootdir}/icons/hicolor/256x256/apps/disobedience.png
+
 check: check-help
 
 misc.o: ../images/images.h
 
+EXTRA_DIST=disobedience.desktop
+
 # check everything has working --help
 check-help: all
 	unset DISPLAY;./disobedience --version > /dev/null
diff --git a/disobedience/disobedience.desktop b/disobedience/disobedience.desktop
new file mode 100644
index 0000000..a5bb583
--- /dev/null
+++ b/disobedience/disobedience.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Disobedience
+Comment=User interface for DisOrder network jukebox
+Exec=disobedience
+Icon=disobedience.png
+Terminal=false
+Categories=Audio;AudioVideo;Player;Music;
diff --git a/images/Makefile.am b/images/Makefile.am
index 36a6ad5..649897b 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -28,7 +28,8 @@ query.svg queryon.svg speaker.svg speakeron.svg cross32.png		\
 pause32.png play32.png playdisabled32.png playenabled32.png		\
 randomdisabled32.png randomenabled32.png rtpdisabled32.png		\
 rtpenabled32.png duck55.png cards24.png cards48.png 			\
-cards-simple-fanned.svg cards-thin.svg
+cards-simple-fanned.svg cards-thin.svg disobedience128x128.png 		\
+disobedience256x256.png disobedience48x48.png disobedience64x64.png
 
 DISOBEDIENCE_IMAGES=up.png down.png cards24.png logo256.png duck.png	\
 propagate.png
diff --git a/images/disobedience128x128.png b/images/disobedience128x128.png
new file mode 100644
index 0000000..45d7800
Binary files /dev/null and b/images/disobedience128x128.png differ
diff --git a/images/disobedience256x256.png b/images/disobedience256x256.png
new file mode 100644
index 0000000..02ccd4a
Binary files /dev/null and b/images/disobedience256x256.png differ
diff --git a/images/disobedience48x48.png b/images/disobedience48x48.png
new file mode 100644
index 0000000..4757bab
Binary files /dev/null and b/images/disobedience48x48.png differ
diff --git a/images/disobedience64x64.png b/images/disobedience64x64.png
new file mode 100644
index 0000000..b99b8b5
Binary files /dev/null and b/images/disobedience64x64.png differ