--- wmauda-0.7.orig/wmauda.c +++ wmauda-0.7/wmauda.c @@ -128,7 +128,7 @@ GdkGC *dock_gc; GtkTooltips *tooltips = NULL; -char *xmms_cmd = "audacious"; +char *xmms_cmd = "audacious2"; gboolean xmms_running = FALSE; gboolean has_geometry = FALSE, single_click = FALSE, song_title = FALSE; @@ -804,7 +804,7 @@ "--------\n\n" "-h, --help Display this text and exit.\n" "-g, --geometry Set the geometry (for example +20+20)\n" - "-c, --command Command to launch Audacious (Default: audacious)\n" + "-c, --command Command to launch Audacious (Default: audacious2)\n" "-i, --icon Set the icon to use when Audacious is not running\n" "-n, --single Only a single click is needed to start Audacious\n" "-t, --title Display song title when mouse is in window\n" --- wmauda-0.7.orig/wmauda.1 +++ wmauda-0.7/wmauda.1 @@ -1,15 +1,13 @@ -.TH WMAUDA 1 "16 April 2006" "Version 0.1" "WMAuda Manual Pages" +.TH WMAUDA 1 "21 June 2009" "Version 0.7" "WMAuda Manual Pages" .SH NAME WMAUDA \- a dockable Audacious control applet. .SH SYNOPSIS .B wmauda -[\-h] [\-\-help] [\-s \fI\fP] [\-\-session=\fI\fP] -[\-c \fI\fP] [\-\-command=\fI\fP] [\-i \fI\fP] -[\-\-icon=\fI\fP] [\-n] [\-\-single] [\-t] [\-\-title] -[\-\-version] +[\-h] [\-\-help] [\-c \fI\fP] [\-\-command=\fI\fP] [\-i \fI\fP] +[\-\-icon=\fI\fP] [\-n] [\-\-single] [\-t] [\-\-title] [\-\-version] .SH DESCRIPTION \fIWMAUDA\fP is a dock applet for the Window Maker window manager. -From the applet you can start and control audacious. +From the applet you can start and control Audacious. .SH OPTIONS wmauda accepts the following options: @@ -17,18 +15,15 @@ .B \-h, \-\-help Show summary of options. .TP -.B \-s, \-\-session -Select Audacious session (Default: 0). -.TP .B \-c, \-\-command -Command to start audacious (Default: audacious). +Command to start Audacious (Default: audacious2). .TP .B \-i, \-\-icon -Icon to show instead of the default one when audacious is not running. The +Icon to show instead of the default one when Audacious is not running. The icon must be in XPM format. .TP .B \-n, \-\-single -Start audacious with only a single click (Default: Double click). +Start Audacious with only a single click (Default: Double click). .TP .B \-t, \-\-title Show the song title when the mouse is in the wmauda window. --- wmauda-0.7.orig/Makefile +++ wmauda-0.7/Makefile @@ -7,8 +7,8 @@ PIXMAP_DIR := $(PREFIX)/share/pixmaps MANPAGE_DIR := $(PREFIX)/share/man/man1 -CFLAGS += $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags) -LIBS := $(shell pkg-config audacious --libs) $(shell pkg-config dbus-1 --libs) +CFLAGS += $(shell pkg-config audclient --cflags) $(shell pkg-config dbus-1 --cflags) +LIBS := $(shell pkg-config audclient --libs) $(shell pkg-config dbus-1 --libs) OBJS = wmauda.o HEADERS = config.h dock-master.xpm --- wmauda-0.7.orig/debian/changelog +++ wmauda-0.7/debian/changelog @@ -0,0 +1,94 @@ +wmauda (0.7-3) unstable; urgency=low + + * debian/control: + + Bump Standards-Version to 3.8.2 (no changes). + + Add build-dep on chrpath. + * debian/rules: + + Use chrpath to remove rpath on wmauda binary. The rpath is due to + audclient.pc. + + * wmauda.c: + + audacious is now called audacious2, change default command to + match (closes: #534109). + * wmauda.1: + + Ditto. + + Capitalize Audacious in the manpage in a consistent manner, update + date and version. + * Makefile: + + Use audclient.pc instead of audacious.pc. + + -- Julien BLACHE Fri, 26 Jun 2009 17:35:45 +0200 + +wmauda (0.7-2) unstable; urgency=low + + * Add dependency on dbus-x11, for dbus-launch. + + -- Julien BLACHE Sat, 05 Apr 2008 09:35:28 +0200 + +wmauda (0.7-1) unstable; urgency=low + + * Switched to new upstream source. + + * debian/patches/10_Makefile_default_CFLAGS.dpatch: + + Removed; not needed. + * debian/patches/11_fix_pixmap_depth.dpatch: + + Removed; merged upstream. + * debian/patches/12_port_to_audacious_1.4.dpatch: + + Removed; merged upstream. + * debian/control: + + Remove Build-Dependency on dpatch. + + Bump Standards-Version to 3.7.3 (no changes). + * debian/rules: + + Remove dpatch support. + * debian/copyright: + + Update upstream URL. + * wmauda.1: + + Remove -s/--session as it's no longer supported. + + -- Julien BLACHE Mon, 31 Dec 2007 14:48:06 +0100 + +wmauda (0.3-5) unstable; urgency=low + + * debian/control: + + Build-Depends: dpatch. + + Bump audacious-dev build-dep. + + Promote audacious from Recommends to Depends, versionned on >= 1.4.0-1. + * debian/rules: + + Use dpatch. + * debian/patches/10_Makefile_default_CFLAGS.dpatch: + + From previous Debian diff. + * debian/patches/11_fix_pixmap_depth.dpatch: + + From previous Debian diff. + * debian/patches/12_port_to_audacious_1.4.dpatch: + + Added; Port wmauda to the new DBus remote control interface in + Audacious 1.4 (closes: #450439). + + -- Julien BLACHE Thu, 15 Nov 2007 09:20:14 +0100 + +wmauda (0.3-4) unstable; urgency=low + + * wmauda.c: + + Fix launch_pixmap creation; use drawable depth instead of specifying an + erroneous depth (closes: #444379). + + -- Julien BLACHE Mon, 01 Oct 2007 20:13:08 +0200 + +wmauda (0.3-3) unstable; urgency=low + + * debian/menu: + + Added a description. + + -- Julien BLACHE Sun, 05 Aug 2007 21:03:03 +0200 + +wmauda (0.3-2) unstable; urgency=low + + * debian/menu: + + Added; add debian menu file. + + -- Julien BLACHE Thu, 02 Aug 2007 18:54:15 +0200 + +wmauda (0.3-1) unstable; urgency=low + + * Initial release (Closes: #435390) + + -- Julien BLACHE Tue, 31 Jul 2007 14:44:06 +0200 --- wmauda-0.7.orig/debian/compat +++ wmauda-0.7/debian/compat @@ -0,0 +1 @@ +5 --- wmauda-0.7.orig/debian/menu +++ wmauda-0.7/debian/menu @@ -0,0 +1,3 @@ +?package(wmauda):needs="X11" section="Applications/Sound" \ + title="wmauda" command="/usr/bin/wmauda" \ + description="Audacious remote-control dockapp for WindowMaker" --- wmauda-0.7.orig/debian/copyright +++ wmauda-0.7/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Julien BLACHE on +Mon, 30 Jul 2007 19:05:48 +0200. + +It was downloaded from: http://www.netswarm.net/misc/ + +Upstream Authors: + Original wmxmms sources: + Peter Alm + Mikael Alm + Olle Hallnas + Thomas Nilsson + 4Front Technologies + + wmauda port: + Michael Stewart + Christian Birchinger + George Averill + +Copyright: + Copyright (C) 2006 Michael Stewart + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +The Debian packaging is (C) 2007, Julien BLACHE and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- wmauda-0.7.orig/debian/rules +++ wmauda-0.7/debian/rules @@ -0,0 +1,85 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/wmauda. + $(MAKE) DESTDIR=$(CURDIR)/debian/wmauda PREFIX=/usr install + + # Remove rpath caused by audclient.pc + chrpath -d debian/wmauda/usr/bin/wmauda + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- wmauda-0.7.orig/debian/control +++ wmauda-0.7/debian/control @@ -0,0 +1,16 @@ +Source: wmauda +Section: sound +Priority: extra +Maintainer: Julien BLACHE +Build-Depends: debhelper (>= 5), audacious-dev (>= 1.4.0), chrpath +Standards-Version: 3.8.2 + +Package: wmauda +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, audacious (>= 1.4.0), dbus-x11 +Description: remote-control dockapp for Audacious + wmauda is a dockapp for WindowMaker and other window managers that support + dockable applets. It acts as a remote control for the Audacious media player. + . + wmauda is a port of wmxmms to Audacious, itself seen as a replacement for + XMMS.