[SCM] yoshimi/master: Use upstream manpage and desktop file

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 62545b7f652337150c7973fa341e20934bd91f90
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Feb 7 12:55:26 2016 +0100

    Use upstream manpage and desktop file

diff --git a/debian/rules b/debian/rules
index 4d78967..91a150e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,5 @@ endif
 %:
 	dh $@ --parallel --sourcedirectory=src
 
-override_dh_install:
-	dh_install
-	install -d $(CURDIR)/debian/yoshimi/usr/share/applications
-	install -d $(CURDIR)/debian/yoshimi/usr/share/icons
-	install -m 644 $(CURDIR)/debian/yoshimi.desktop $(CURDIR)/debian/yoshimi/usr/share/applications
-	install -m 644 $(CURDIR)/desktop/yoshimi.png $(CURDIR)/debian/yoshimi/usr/share/icons
-
 override_dh_strip:
 	dh_strip --dbg-package=yoshimi-dbg
diff --git a/debian/yoshimi.1 b/debian/yoshimi.1
deleted file mode 100644
index 0ccbc7e..0000000
--- a/debian/yoshimi.1
+++ /dev/null
@@ -1,106 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH YOSHIMI 1 "May 12, 2010"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-yoshimi \- A software synthesizer based on ZynAddSubFX
-.SH SYNOPSIS
-.B yoshimi
-.RI [ options ] 
-.br
-.B bar
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B yoshimi
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fByoshimi\fP is a opensource software synthesizer capable of making a countless number of instruments, from some common heared from expensive hardware to interesting sounds that you'll boost to an amazing universe of sounds. 
-.PP
-\fByoshimi\fP A software synthesizer based on ZynAddSubFX with very good Jack and Alsa midi/audio functionality on Linux. 
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B \-?, \-\-help
-display command-line help and exit
-.TP
-.B \-\-usage
-display a short usage message
-.TP
-.B \-V, \-\-version
-display program version
-.TP
-.B \-a, \-\-alsa-midi[=<device>]
-use alsa midi input
-.TP
-.B \-A, \-\-alsa-audio[=<device>]
-use alsa audio output
-.TP
-.B \-b, \-\-buffersize=<size>
-set buffer size (alsa audio)
-.TP
-.B \-c, \-\-show-console
-show console on startup
-.TP
-.B \-i, \-\-no-gui
-no-gui
-.TP
-.B \-j, \-\-jack-midi[=<device>]
-use jack midi input
-.TP
-.B \-J, \-\-jack-audio[=<server>]
-use jack audio output
-.TP
-.B \-k, \-\-autostart-jack
-auto start jack server
-.TP
-.B \-K, \-\-auto-connect
-auto connect jack audio
-.TP
-.B \-V, \-\-version
-display program version
-.TP
-.B \-l, \-\-load=<file> 
-load .xmz file
-.TP
-.B \-L, \-\-load-instrument=<file>
-load .xiz file
-.TP
-.B \-N, \-\-name-tag=<tag>
-add tag to clientname
-.TP
-.B \-o, \-\-oscilsize=<size>
-set ADsynth oscilsize
-.TP
-.B \-R, \-\-samplerate=<rate>
-set sample rate (alsa audio)
-.TP
-.B \-S, \-\-state[=<file>]
-load state from <file>, defaults to '$HOME/.yoshimi/yoshimi.state'
-.TP
-.TP
-.SH SEE ALSO
-.BR jackd(1).
-.br
-.SH AUTHOR
-yoshimi was written by Alan Calvert
-.PP
-This manual page was written by Jaromír Mikeš <mira.mikes at seznam.cz>,
-for the Debian project (but may be used by others).
diff --git a/debian/yoshimi.desktop b/debian/yoshimi.desktop
deleted file mode 100644
index 1ee8035..0000000
--- a/debian/yoshimi.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Yoshimi
-GenericName=Software Synthesizer
-Comment=Software Synthesizer based on ZynAddSubFX
-Keywords=audio;sound;jackd,midi,synth;synthesizer
-Icon=yoshimi
-Exec=yoshimi
-Terminal=false
-StartupNotify=true
-Categories=AudioVideo;Audio;
diff --git a/debian/yoshimi.install b/debian/yoshimi.install
index 7d7c33e..61d1c19 100644
--- a/debian/yoshimi.install
+++ b/debian/yoshimi.install
@@ -1 +1,6 @@
-usr/bin/* usr/bin/
+usr/bin
+usr/share/appdata
+usr/share/applications
+usr/share/icons
+usr/share/man
+usr/share/pixmaps
diff --git a/debian/yoshimi.manpages b/debian/yoshimi.manpages
deleted file mode 100644
index 16a62cd..0000000
--- a/debian/yoshimi.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/yoshimi.1

-- 
yoshimi packaging