--- wmix-3.1.orig/debian/compat +++ wmix-3.1/debian/compat @@ -0,0 +1 @@ +4 --- wmix-3.1.orig/debian/wmix.1x +++ wmix-3.1/debian/wmix.1x @@ -0,0 +1,36 @@ +.TH "wmix" "1" "2.2" "Fredrik Steen" +.SH "NAME" +.LP +wmix \- Dockapp mixer for OSS +.SH "SYNTAX" +.LP +wmix [\fI\-h\fP] +.br +wmix \fI\-f\fP <\fIfile\fP> +.SH "DESCRIPTION" +.LP +Dockapp mixer for OSS. Allows toggling record source, +muting individual channels, adjusting volume and balance, all in a +compact dockapp size, with TV\-like on\-screen\-display for volume levels. +.LP +Supports mousewheel to adjust current channelvolume +and can be controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume. +Keeps a simple configuration file for user\-defined settings. + +.SH "OPTIONS" +.LP +.TP +\fB\-h\fR Display list of command\-line options. +.TP +\fB\-f\fR <\fIfile\fP> use alternate config file +.SH "FILES" +.LP +See \fI/usr/share/doc/wmix/README.gz\fP for more information + + +.SH "AUTHORS" +This man page was written by Fredrik Steen for the Debian +distribution. +.PP +wmix was written by Tim, +timecop --- wmix-3.1.orig/debian/wmix.dirs +++ wmix-3.1/debian/wmix.dirs @@ -0,0 +1 @@ +/usr/bin --- wmix-3.1.orig/debian/changelog +++ wmix-3.1/debian/changelog @@ -0,0 +1,117 @@ +wmix (3.1-5) unstable; urgency=low + + * Updated build-depends (Closes:#515428) + + -- Fredrik Steen Sun, 29 Nov 2009 23:09:31 +0100 + +wmix (3.1-4) unstable; urgency=low + + * Fix for inaccurate volume adjustments. Patch from + Dan Pascu + + -- Fredrik Steen Mon, 24 Apr 2006 16:34:06 +0200 + +wmix (3.1-3) unstable; urgency=low + + * Tested under ALSA won't work, removed ALSA text from + description and manpage. Closes:#350039 + + -- Fredrik Steen Fri, 24 Mar 2006 15:01:43 +0100 + +wmix (3.1-2) unstable; urgency=low + + * Update build-deps for xlibs-dev removal; closes: #347119. + Thanks to Justin Pryzby for sending patch. + * Bumped Standards-Version + + -- Fredrik Steen Sun, 15 Jan 2006 21:14:30 +0100 + +wmix (3.1-1) unstable; urgency=low + + * New upstream release (Closes:#254291) + + -- Fredrik Steen Fri, 14 Oct 2005 11:23:58 +0200 + +wmix (3.0-7) unstable; urgency=low + + * It seems the reason is that the new kernel headers don't like having + the mixer_info type name masked by a local variable. Patch from + Daniel Schepler (thanks) Closes:#224790 + + -- Fredrik Steen Fri, 2 Jan 2004 14:07:50 +0100 + +wmix (3.0-6) unstable; urgency=low + + * The doh! release. Forgot to Build-depend on cdbs + Closes:#217054 + + -- Fredrik Steen Wed, 22 Oct 2003 15:50:07 +0200 + +wmix (3.0-5) unstable; urgency=low + + * Converted package to use cdbs + * Patch from Andreas Tscharner to fix 10% bug + (Closes:#216488) + + -- Fredrik Steen Wed, 22 Oct 2003 11:35:06 +0200 + +wmix (3.0-4) unstable; urgency=low + + * lib6g-dev is obsolete. Build-Depends on xlibs-dev instead. + Thanks to Daniel Schepler for the bug report. (Closes:#170151) + * Updated Standards-version + + -- Fredrik Steen Tue, 17 Dec 2002 16:15:28 +0100 + +wmix (3.0-3) unstable; urgency=low + + * Fixed a too long description line, Closes:#130987. + + -- Fredrik Steen Tue, 29 Jan 2002 04:43:56 +0100 + +wmix (3.0-2) unstable; urgency=low + + * fixed spelling error in description Closes:#125494 + + -- Fredrik Steen Tue, 18 Dec 2001 13:49:22 +0100 + +wmix (3.0-1) unstable; urgency=low + + * New upstream release Closes:#99315 + * Sample rc file included + + -- Fredrik Steen Fri, 1 Jun 2001 08:21:01 +0200 + +wmix (2.20-2) unstable; urgency=low + + * Removed gzip from Build-Depends, not needed. + * Changed Build-Depends from xpm4g-dev to xlibs-dev. + + -- Fredrik Steen Thu, 26 Apr 2001 08:15:03 +0200 + +wmix (2.20-1) unstable; urgency=low + + * New upstream release. + * Man page created and added Closes:#92595. + * Debian Packaging + + Fixed wrong path to binary in menu. + + Fixed Build-Depends: occuring twice in control. + + Added gzip in Build-Depends for compressing man page during build. + + -- Fredrik Steen Mon, 23 Apr 2001 19:35:52 +0200 + +wmix (2.11-oss-2) unstable; urgency=low + + * Fixed Builddepends to include xlibs-dev Closes:#93423 + + -- Fredrik Steen Tue, 10 Apr 2001 17:17:20 +0200 + +wmix (2.11-oss-1) unstable; urgency=low + + * Initial Release, Closes:#91759 wnpp bug + + -- Fredrik Steen Mon, 26 Mar 2001 13:39:54 +0200 + +Local variables: +mode: debian-changelog +End: --- wmix-3.1.orig/debian/copyright +++ wmix-3.1/debian/copyright @@ -0,0 +1,11 @@ +This package was debianized by Fredrik Steen on +Mon, 26 Mar 2001 13:39:54 +0200. + +It was downloaded from: http://www.ne.jp/asahi/linux/timecop/ + +Upstream Author: timecop, + +Copyright: +Copyright (C) 1989, 1991 Free Software Foundation, Inc. + +The text of the GPL is at /usr/share/common-licenses/GPL --- wmix-3.1.orig/debian/menu.wmix +++ wmix-3.1/debian/menu.wmix @@ -0,0 +1,2 @@ +?package(wmix):needs="X11" section="Apps/Sound"\ + title="wmix" command="wmix" --- wmix-3.1.orig/debian/docs +++ wmix-3.1/debian/docs @@ -0,0 +1,3 @@ +BUGS +NEWS +README --- wmix-3.1.orig/debian/control +++ wmix-3.1/debian/control @@ -0,0 +1,18 @@ +Source: wmix +Section: x11 +Priority: extra +Build-Depends: debhelper (>> 2.0.0), cdbs (>= 0.2.4), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, patchutils +Maintainer: Fredrik Steen +Standards-Version: 3.8.0 + +Package: wmix +Architecture: any +Depends: ${shlibs:Depends} +Description: Dockapp mixer for OSS + Allows toggling record source, muting individual channels, + adjusting volume and balance, all in a compact dockapp size, + with TV-like on-screen-display for volume levels. + . + Supports mousewheel to adjust current channelvolume + and can be controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume. + Keeps a simple configuration file for user-defined settings. --- wmix-3.1.orig/debian/rules +++ wmix-3.1/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Fredrik Steen +export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_INSTALL_MANPAGES_wmix := debian/wmix.1x + +build/wmix:: + make + +install/wmix:: + install -s -o root -g root -m 0755 wmix debian/wmix/usr/bin/ +clean:: + [ ! -f Makefile ] || $(MAKE) clean --- wmix-3.1.orig/debian/patches/wmix-3.2-fix-volume-adjustment.diff +++ wmix-3.1/debian/patches/wmix-3.2-fix-volume-adjustment.diff @@ -0,0 +1,58 @@ +diff -ur wmix-3.2.orig/mixer-oss.c wmix-3.2/mixer-oss.c +--- wmix-3.2.orig/mixer-oss.c 2004-10-27 11:37:52.000000000 +0300 ++++ wmix-3.2/mixer-oss.c 2006-04-09 02:12:24.000000000 +0300 +@@ -179,8 +179,8 @@ + vb_to_lr(mixer[cur_channel].volume, + mixer[cur_channel].balance, &left, &right); + +- dev_left_volume = (int) (100.0 * left); +- dev_right_volume = (int) (100.0 * right); ++ dev_left_volume = (int) (100.0 * left + 0.5); ++ dev_right_volume = (int) (100.0 * right + 0.5); + dev_lr_volume = (dev_right_volume << 8) | dev_left_volume; + ioctl(mixer_fd, MIXER_WRITE(mixer[cur_channel].dev), &dev_lr_volume); + } +diff -ur wmix-3.2.orig/ui_x.c wmix-3.2/ui_x.c +--- wmix-3.2.orig/ui_x.c 2004-10-27 11:37:52.000000000 +0300 ++++ wmix-3.2/ui_x.c 2006-04-09 02:05:43.000000000 +0300 +@@ -91,7 +91,7 @@ + static void draw_stereo_led(void); + static void draw_rec_led(void); + static void draw_mute_led(void); +-static void draw_percent(void); ++static void draw_percent(float volume); + static void draw_knob(float volume); + static void draw_slider(float offset); + +@@ -527,16 +527,16 @@ + copy_xpm_area(65, 21, 20, 7, 39, 14); /* turn off LCD */ + } + +-static void draw_percent(void) ++static void draw_percent(float volume) + { +- int volume = (int)(mixer_get_volume() * 100); ++ int vol = (int)(volume*100 + 0.5); + + copy_xpm_area(0, 87, 18, 9, 41, 22); /* clear percentage */ + +- if (volume < 100) { +- if (volume >= 10) +- copy_xpm_area((volume / 10) * 6, 67, 6, 9, 47, 22); +- copy_xpm_area((volume % 10) * 6, 67, 6, 9, 53, 22); ++ if (vol < 100) { ++ if (vol >= 10) ++ copy_xpm_area((vol / 10) * 6, 67, 6, 9, 47, 22); ++ copy_xpm_area((vol % 10) * 6, 67, 6, 9, 53, 22); + } else { + copy_xpm_area(6, 67, 6, 9, 41, 22); + copy_xpm_area(0, 67, 6, 9, 47, 22); +@@ -570,7 +570,7 @@ + } + XCopyArea(display, led_pixmap, dockapp.pixmap, dockapp.gc, + 0, 0, LED_WIDTH, LED_HEIGHT, led_topleft_x, led_topleft_y); +- draw_percent(); ++ draw_percent(volume); + } + + static void draw_slider(float offset)