[Pkg-wmaker-commits] [wmauda] 10/17: Import Debian changes 0.7-3

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmauda.

commit 35c70a68de155cfa8322a6e2609456cc68ccb5e2
Author: Julien BLACHE <jblache at debian.org>
Date:   Fri Jun 26 17:35:45 2009 +0200

    Import Debian changes 0.7-3
    
    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.
---
 Makefile         |  4 ++--
 debian/changelog | 21 +++++++++++++++++++++
 debian/control   |  4 ++--
 debian/rules     |  2 ++
 wmauda.1         | 10 +++++-----
 wmauda.c         |  4 ++--
 6 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 840ad7c..8388588 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ INSTALL_DIR	:= $(PREFIX)/bin
 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
diff --git a/debian/changelog b/debian/changelog
index e20cd13..6c463cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+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 <jblache at debian.org>  Fri, 26 Jun 2009 17:35:45 +0200
+
 wmauda (0.7-2) unstable; urgency=low
 
   * Add dependency on dbus-x11, for dbus-launch.
diff --git a/debian/control b/debian/control
index 9c2652d..1ed126b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: wmauda
 Section: sound
 Priority: extra
 Maintainer: Julien BLACHE <jblache at debian.org>
-Build-Depends: debhelper (>= 5), audacious-dev (>= 1.4.0)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), audacious-dev (>= 1.4.0), chrpath
+Standards-Version: 3.8.2
 
 Package: wmauda
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 4a9c675..7158906 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,8 @@ install: build
 	# 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
diff --git a/wmauda.1 b/wmauda.1
index 33a579c..77a9b46 100644
--- a/wmauda.1
+++ b/wmauda.1
@@ -1,4 +1,4 @@
-.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
@@ -7,7 +7,7 @@ WMAUDA \- a dockable Audacious control applet.
 [\-\-icon=\fI<icon>\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:
@@ -16,14 +16,14 @@ wmauda accepts the following options:
 Show summary of options.
 .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.
diff --git a/wmauda.c b/wmauda.c
index 07dc4a8..4b3d889 100644
--- a/wmauda.c
+++ b/wmauda.c
@@ -128,7 +128,7 @@ GdkBitmap *mask, *launch_mask;
 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 @@ void display_usage(char *cmd)
 		"--------\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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmauda.git