[Demudi-commits] r1175 - timidity/trunk/debian
Joost Damad
andete-guest at alioth.debian.org
Thu Mar 29 21:03:58 CET 2007
Author: andete-guest
Date: 2007-03-29 20:03:52 +0000 (Thu, 29 Mar 2007)
New Revision: 1175
Added:
timidity/trunk/debian/timidity.xpm
Modified:
timidity/trunk/debian/changelog
timidity/trunk/debian/control
timidity/trunk/debian/rules
timidity/trunk/debian/timidity.init
timidity/trunk/debian/timidity.install
timidity/trunk/debian/timidity.menu
Log:
WIP
Modified: timidity/trunk/debian/changelog
===================================================================
--- timidity/trunk/debian/changelog 2007-03-28 12:07:15 UTC (rev 1174)
+++ timidity/trunk/debian/changelog 2007-03-29 20:03:52 UTC (rev 1175)
@@ -1,3 +1,11 @@
+timidity (2.13.2-11) UNRELEASED; urgency=low
+
+ * add menu icon (Closes: #299394)
+ * use /lib/lsb/init-functions
+ * add INIT INFO section to init.d script
+
+ -- Joost Yervante Damad <andete at debian.org> Thu, 29 Mar 2007 21:00:13 +0200
+
timidity (2.13.2-10) unstable; urgency=low
* fix error message (Closes: #335295)
Modified: timidity/trunk/debian/control
===================================================================
--- timidity/trunk/debian/control 2007-03-28 12:07:15 UTC (rev 1174)
+++ timidity/trunk/debian/control 2007-03-29 20:03:52 UTC (rev 1175)
@@ -8,7 +8,7 @@
Package: timidity
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6)
Suggests: pmidi
Recommends: freepats
Description: Software sound renderer (MIDI sequencer, MOD player)
Modified: timidity/trunk/debian/rules
===================================================================
--- timidity/trunk/debian/rules 2007-03-28 12:07:15 UTC (rev 1174)
+++ timidity/trunk/debian/rules 2007-03-29 20:03:52 UTC (rev 1175)
@@ -114,6 +114,10 @@
mkdir -p $(TMPPKG)/etc/timidity && \
install -m 644 debian/timidity.cfg $(TMPPKG)/etc/timidity ;\
fi
+
+ # install an icon for menu
+ mkdir -p $(TMPPKG)/usr/share/pixmaps
+ install -m 644 debian/timidity.xpm $(TMPPKG)/usr/share/pixmaps
# fix permissions
chmod a+x $(TMPPKG)/usr/lib/timidity/tk*.tcl
Modified: timidity/trunk/debian/timidity.init
===================================================================
--- timidity/trunk/debian/timidity.init 2007-03-28 12:07:15 UTC (rev 1174)
+++ timidity/trunk/debian/timidity.init 2007-03-29 20:03:52 UTC (rev 1175)
@@ -7,14 +7,25 @@
# Distributed under the GPL version 2
#
-# use lsb-base
-# . /lib/lsb/init-functions
+### BEGIN INIT INFO
+# Provides: timidity
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop timidity
+# Description: TiMidity++ is a very high quality software-only MIDI sequencer
+# and MOD player.
+### END INIT INFO
+. /lib/lsb/init-functions
+
+NAME="timidity"
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/timidity
+DAEMON=/usr/bin/${NAME}
DESC="TiMidity++ ALSA midi emulation"
PMIDI=/usr/bin/pmidi
-PIDFILE=/var/run/timidity.pid
+PIDFILE=/var/run/${NAME}.pid
set -e
@@ -24,20 +35,25 @@
TIM_ALSASEQ=
TIM_ALSASEQPARAMS="-B2,8"
[ -r /etc/default/timidity ] && . /etc/default/timidity
-[ "${TIM_ALSASEQ}" != "true" ] && exit 0
+if [ "${TIM_ALSASEQ}" != "true" ]; then
+ echo "Timidity is not yet configured." >&2
+ echo "Enable Alsa Sequencer first by editing /etc/default/timidity." >&2
+ exit 0
+fi
PARAMS="${TIM_ALSASEQPARAMS} -iAD"
START="--start --quiet --exec ${DAEMON} --pidfile ${PIDFILE} -- ${PARAMS}"
case "$1" in
start)
- echo -n "Starting ${DESC}: "
+ log_daemon_msg "Starting" "${NAME}"
[ -d /proc/asound ] || {
- echo "(ALSA is not active, cannot start)"
+ log_end_msg 1
+ echo "(ALSA is not active, cannot start)" >&2
exit 0
}
if start-stop-daemon ${START} >/dev/null; then
- echo "timidity."
+ log_end_msg 0
if [ $pmidi_enabled = "true" ] ; then
sleep 1
echo -n "Emulating midi on ports: ";
@@ -45,21 +61,21 @@
fi
else
if start-stop-daemon --test ${START} >/dev/null 2>&1; then
- echo "(failed)."
+ log_end_msg 1
exit 1
else
- echo "already running."
+ echo " (already running) "
exit 0
fi
fi
;;
stop)
- echo -n "Stopping $DESC: "
- if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} \
+ echo -n "Stopping" "${NAME}"
+ if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} \
--name $(basename ${DAEMON}) --retry 10 ; then
- echo "timidity."
+ log_end_msg 0
else
- echo "(failed)."
+ log_end_msg 1
exit 1
fi
;;
Modified: timidity/trunk/debian/timidity.install
===================================================================
--- timidity/trunk/debian/timidity.install 2007-03-28 12:07:15 UTC (rev 1174)
+++ timidity/trunk/debian/timidity.install 2007-03-29 20:03:52 UTC (rev 1175)
@@ -1,4 +1,5 @@
usr/bin
usr/lib/timidity/bitmaps
usr/share/man
+usr/share/pixmaps
etc/
Modified: timidity/trunk/debian/timidity.menu
===================================================================
--- timidity/trunk/debian/timidity.menu 2007-03-28 12:07:15 UTC (rev 1174)
+++ timidity/trunk/debian/timidity.menu 2007-03-29 20:03:52 UTC (rev 1175)
@@ -1,2 +1,3 @@
?package(timidity):needs="x11" section="Apps/Sound" \
- title="TiMidity++" command="timidity -ia" hints="Player"
+ title="TiMidity++" command="timidity -ia" hints="Player" \
+ icon="/usr/share/pixmaps/timidity.xpm"
Added: timidity/trunk/debian/timidity.xpm
===================================================================
--- timidity/trunk/debian/timidity.xpm 2007-03-28 12:07:15 UTC (rev 1174)
+++ timidity/trunk/debian/timidity.xpm 2007-03-29 20:03:52 UTC (rev 1175)
@@ -0,0 +1,56 @@
+/* XPM */
+static char * timidity_xpm[] = {
+"32 32 21 1",
+" c None",
+". c #333399",
+"+ c #000000",
+"@ c #666699",
+"# c #FFFFFF",
+"$ c #DDDDDD",
+"% c #888888",
+"& c #999999",
+"* c #7777A4",
+"= c #4949A4",
+"- c #BBBBBB",
+"; c #111111",
+"> c #444444",
+", c #2B2B2B",
+"' c #555555",
+") c #FF9999",
+"! c #FF9966",
+"~ c #666666",
+"{ c #333333",
+"] c #FF0000",
+"^ c #00FF00",
+" . .. ",
+" . ... + ",
+" . ..@ +#+ + ",
+" .@@.. +#$#+%#+ ",
+" ....@ +#$#$#+$#+ ",
+" .... +#$#$#$#+$#+ ",
+" @...@ +#$#$#$#$#+$#+ ",
+" @.... +#$#$#$#$#$#+$#+ ",
+" @... at . %#$#$#$#$#$#$#&$#& ",
+" @...@ +++++++$#++$+++++&$++ ",
+" ...@ ++$++#++$++#++$$++$++$ ",
+" @..@ %++#++$++#++$++$&++$++ ",
+" ... %#++$++#++$++#++&$++#++ ",
+"*..@ .&++#++$++#++$++++++&++ ",
+"=.. ...&#$#$#$#$#$#&-$#$& ",
+"=.. ...+++++$++#+$+++++++ ++ ",
+"=.. .. .&#$#$#$$&-$#&& ",
+"=.. .. . +&$#$&+-$#&+ ",
+" ;;;;;;;;;;;;;;;;;;;>;;;;;;; ",
+",#%%%%%%%%%%%%%%%%%';#%%%%%'+ ",
+",%+++++++++++++++''>;%'''''>+ ",
+",%+#)))))))))))!;''>;%'%~+'>+ ",
+",'+);;!;!!;!!!!!;>>>;'>+++>>+ ",
+",'+)>!!;!!;!;!;!;>>>;'>>>>>>+ ",
+",'+!!!!!!!!!!!!!;>>{;'>%~+>>+ ",
+",'+;;;;;;;;;;;;;'>>{;'>+++>>+ ",
+",'>>>>>>>>>>>>>>>>>{;'>>>>>>+> ",
+",'%~'>>%~'>>'>'>'>>{;'>%~+>{++> ",
+",']++>>^++>>+>+>+>>{;'>+++>{++>>",
+",'>>>>>>>>>>>>>>{{{';'>>{{{'+>>~",
+" +++++++++++++++++++>+++++++>>~ ",
+" "};
More information about the Demudi-commits
mailing list