diff -u timidity-2.13.2/debian/rules timidity-2.13.2/debian/rules --- timidity-2.13.2/debian/rules +++ timidity-2.13.2/debian/rules @@ -114,6 +114,9 @@ mkdir -p $(TMPPKG)/etc/timidity && \ install -m 644 debian/timidity.cfg $(TMPPKG)/etc/timidity ;\ fi + + mkdir -p $(TMPPKG)/usr/share/applications + install -m 644 debian/timidity-interfaces-extra.desktop $(TMPPKG)/usr/share/applications # install an icon for menu mkdir -p $(TMPPKG)/usr/share/pixmaps diff -u timidity-2.13.2/debian/changelog timidity-2.13.2/debian/changelog --- timidity-2.13.2/debian/changelog +++ timidity-2.13.2/debian/changelog @@ -1,3 +1,13 @@ +timidity (2.13.2-13ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Added freepats on dependencies list + - Added desktop file + - Add some lsb init functions + - Update Maintainer field in debian/control + + -- Luca Falavigna Sun, 10 Jun 2007 22:21:35 +0100 + timidity (2.13.2-13) unstable; urgency=low * Make work with flac 1.1.4 API (Closes: #426669, #427593) @@ -5,6 +15,16 @@ -- Joost Yervante Damad Sun, 10 Jun 2007 09:52:13 +0200 +timidity (2.13.2-12ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Added freepats on dependenties list + - Added desktop file + - Add some lsb init functions + - Update Maintainer field in debian/control + + -- Luca Falavigna Sat, 12 May 2007 22:24:16 +0100 + timidity (2.13.2-12) unstable; urgency=low * honor CFLAGS (Closes: #421502) @@ -12,6 +32,16 @@ -- Joost Yervante Damad Sat, 12 May 2007 16:04:06 +0200 +timidity (2.13.2-11ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Added freepats on dependenties list + - Added desktop file + - Add some lsb init functions + - Update Maintainer field in debian/control + + -- Luca Falavigna Mon, 9 Apr 2007 01:38:33 +0200 + timidity (2.13.2-11) unstable; urgency=low * add menu icon (Closes: #299394) @@ -75,6 +105,18 @@ -- Aurelien Jarno Sun, 11 Mar 2007 01:29:56 +0100 +timidity (2.13.2-7.1ubuntu2) feisty; urgency=low + + * added desktop file (CommonCustomizations spec) + + -- Michael Vogt Mon, 11 Dec 2006 17:13:11 +0100 + +timidity (2.13.2-7.1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Lucas Nussbaum Mon, 17 Jul 2006 17:06:39 +0200 + timidity (2.13.2-7.1) unstable; urgency=high * Non-maintainer upload. @@ -86,6 +128,20 @@ -- Steve Langasek Sun, 8 Jan 2006 23:06:19 -0800 +timidity (2.13.2-7ubuntu2) dapper; urgency=low + + * Added freepats on dependenties list. + closes(# 3085) + + -- rave Fri, 2 Dec 2005 20:48:28 +0100 + +timidity (2.13.2-7ubuntu1) dapper; urgency=low + + * Merge with Debian: + - Adjusted back to libxaw7-dev. + + -- Christian Bjälevik Wed, 16 Nov 2005 20:10:29 +0100 + timidity (2.13.2-7) unstable; urgency=low * Update libjack-dev dependencies (closes: #317227) @@ -112,6 +168,32 @@ -- Henrique de Moraes Holschuh Sat, 3 Sep 2005 16:23:40 -0300 +timidity (2.13.2-6ubuntu4) breezy; urgency=low + + * Add lsb init functions + * Thanks to David Mandelberg for the patch + + -- Barry deFreese Wed, 5 Oct 2005 00:45:40 -0400 + +timidity (2.13.2-6ubuntu3) breezy; urgency=low + + * Adjusted Build-Depends for slang2 transition + + -- Sebastian Dröge Wed, 24 Aug 2005 22:41:08 +0200 + +timidity (2.13.2-6ubuntu2) breezy; urgency=low + + * Rebuild with the new cairo version + + -- Sebastien Bacher Thu, 18 Aug 2005 17:23:16 +0000 + +timidity (2.13.2-6ubuntu1) breezy; urgency=low + + * Fix FTBFS: + + Remove static redeclaration of voices in interface/xaw_i.c:264. + + -- Daniel T Chen Sun, 7 Aug 2005 19:28:04 -0700 + timidity (2.13.2-6) unstable; urgency=medium * Rebuild against libflac 1.1.1-5. This does NOT fix the whole @@ -566 +647,0 @@ - diff -u timidity-2.13.2/debian/timidity-interfaces-extra.install timidity-2.13.2/debian/timidity-interfaces-extra.install --- timidity-2.13.2/debian/timidity-interfaces-extra.install +++ timidity-2.13.2/debian/timidity-interfaces-extra.install @@ -2,0 +3 @@ +usr/share/applications/timidity-interfaces-extra.desktop diff -u timidity-2.13.2/debian/timidity.init timidity-2.13.2/debian/timidity.init --- timidity-2.13.2/debian/timidity.init +++ timidity-2.13.2/debian/timidity.init @@ -49,28 +49,31 @@ log_daemon_msg "Starting" "${NAME}" [ -d /proc/asound ] || { log_end_msg 1 - echo "(ALSA is not active, cannot start)" >&2 + log_warning_msg "ALSA is not active, cannot start $DESC" exit 0 } + log_begin_msg "Starting $DESC..." if start-stop-daemon ${START} >/dev/null; then log_end_msg 0 - if [ $pmidi_enabled = "true" ] ; then - sleep 1 - echo -n "Emulating midi on ports: "; - pmidi -l | grep "TiMidity" | cut -f 1 -d ' ' | xargs - fi + #if [ $pmidi_enabled = "true" ] ; then + # sleep 1 + # echo -n "Emulating midi on ports: "; + # pmidi -l | grep "TiMidity" | cut -f 1 -d ' ' | xargs + #fi else - if start-stop-daemon --test ${START} >/dev/null 2>&1; then - log_end_msg 1 - exit 1 - else - echo " (already running) " - exit 0 - fi + log_end_msg 1 + exit 1 + #if start-stop-daemon --test ${START} >/dev/null 2>&1; then + # echo "(failed)." + # exit 1 + #else + # echo "already running." + # exit 0 + #fi fi ;; stop) - echo -n "Stopping" "${NAME}" + log_begin_msg "Stopping $DESC..." if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} \ --name $(basename ${DAEMON}) --retry 10 ; then log_end_msg 0 diff -u timidity-2.13.2/debian/control timidity-2.13.2/debian/control --- timidity-2.13.2/debian/control +++ timidity-2.13.2/debian/control @@ -1,14 +1,15 @@ Source: timidity Section: sound Priority: optional -Maintainer: Debian Multimedia Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Multimedia Team Uploaders: Joost Yervante Damad Build-Depends: debhelper (>= 4), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libesd0-dev, libarts1-dev, libjack0.100.0-dev, libaudio-dev, libvorbis-dev (>= 1.0.0-3), libspeex-dev (>= 1.0), libflac-dev (>= 1.1.4-1), libncurses-dev, libslang2-dev, libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, x-dev, libxaw7-dev, tcl8.4-dev, tk8.4-dev, libgtk2.0-dev, autotools-dev, dpkg-dev (>= 1.13.19) Standards-Version: 3.7.2 Package: timidity Architecture: any -Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6) +Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6), freepats Suggests: pmidi Recommends: freepats Description: Software sound renderer (MIDI sequencer, MOD player) only in patch2: unchanged: --- timidity-2.13.2.orig/debian/timidity-interfaces-extra.desktop +++ timidity-2.13.2/debian/timidity-interfaces-extra.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Comment=Software sound renderer (MIDI sequencer, MOD player) +Name=TiMidity++ MIDI sequencer +Encoding=UTF-8 +Terminal=false +Type=Application +Exec=timidity -ia +Categories=Application;Multimedia;AudioVideo; +X-AppInstall-Package=timidity-interfaces-extra +X-AppInstall-Section=universe