--- wmmixer-1.5.orig/debian/rules +++ wmmixer-1.5/debian/rules @@ -0,0 +1,57 @@ +#!/usr/bin/make -f +# This is a -*- makefile -*- +# Modified from the sample debian/rules that uses debhelper. +# GNU copyright 1998 by Marcelo Magallon. +# GNU copyright 1997 by Joey Hess. + +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +CXXFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -O0 +else + CXXFLAGS += -O2 +endif + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + $(MAKE) CXXFLAGS="$(CXXFLAGS)" + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + $(MAKE) clean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) prefix=/usr DESTDIR=$(CURDIR)/debian/wmmixer install + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGES + dh_installdocs README + dh_installexamples home.wmmixer + dh_installmenu + 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 --- wmmixer-1.5.orig/debian/compat +++ wmmixer-1.5/debian/compat @@ -0,0 +1 @@ +5 --- wmmixer-1.5.orig/debian/changelog +++ wmmixer-1.5/debian/changelog @@ -0,0 +1,268 @@ +wmmixer (1.5-11) unstable; urgency=low + + * QA upload. + * debian/control + - set QA Group as maintainer + - added depends on oss-compat; Closes: #503846 + - bump Standards-Version to 3.8.0 + + added debian/README.source + + -- Sandro Tosi Wed, 29 Oct 2008 14:03:45 +0100 + +wmmixer (1.5-10) unstable; urgency=low + + * debian/control + - bump Standard-Version to 3.7.3 + * debian/copyright + - upstream authors, copyright and license indented with 4 spaces + + -- Sandro Tosi Sun, 06 Jan 2008 01:23:22 +0100 + +wmmixer (1.5-9) unstable; urgency=low + + * Adopting package (Closes: #427083) + * debian/control + - set myself as new maintainer + - little reformat of short and long descriptions + - added dependency against dpatch + * debian/copyright + - set myself as new maintainer + - added upstream author + - added copyright owners information + - added license information + - added license file location on a debian system + * debian/menu + - updated menu section + * debian/rules + - very little fixes installed filenames formattation + - integrated dpatch + * debian/patches/01_restore_pristine_code.dpatch + - added to remove upstream code changes + * {mixctl.h,exception.h,xhandler.cc,mixctl.cc,README} + - restored to upstream version + + -- Sandro Tosi Mon, 08 Oct 2007 21:38:57 +0200 + +wmmixer (1.5-8) unstable; urgency=medium + + * QA upload. + * Acknowledge NMU. Closes: #174899. + * xhandler.cc: Initialize `icon_list_'. Thanks to Florent Bayle for + the patch. Closes: #429509. + * Remove no longer necessary build dependency on x-dev. + * Switch to debhelper 5. + * debian/rules: + - Add support for DEB_BUILD_OPTIONS=noopt. + - Remove support for DEB_BUILD_OPTIONS=debug. + - Let dh_strip handle DEB_BUILD_OPTION=nostrip. + * Conforms to Standards version 3.7.2. + + -- Matej Vela Mon, 18 Jun 2007 21:24:01 +0200 + +wmmixer (1.5-7) unstable; urgency=low + + * Orphan package, set maintainer to Debian QA Group + + -- Gordon Fraser Fri, 01 Jun 2007 21:09:47 +0200 + +wmmixer (1.5-6.1) unstable; urgency=low + + * Porter NMU. + * Added support for GNU/kFreeBSD (Closes: #332992). + + -- Aurelien Jarno Sun, 10 Dec 2006 21:45:54 +0100 + +wmmixer (1.5-6) unstable; urgency=low + + * Fix build dependencies (Closes: #346893) + + -- Gordon Fraser Sun, 15 Jan 2006 19:20:10 +0100 + +wmmixer (1.5-5) unstable; urgency=low + + * Rebuild for g++ transition + + -- Gordon Fraser Mon, 3 Oct 2005 14:30:09 +0200 + +wmmixer (1.5-4) unstable; urgency=low + + * Added missing dot to package description (Closes: #174899) + + -- Thu, 29 Jul 2004 08:38:02 +0200 + +wmmixer (1.5-3) unstable; urgency=low + + * gcc-3.x updates to fix FTBFS (Closes: #218942) + (Thanks, Frank Lichtenheld) + + -- Gordon Fraser Tue, 11 Nov 2003 07:51:21 +0100 + +wmmixer (1.5-2) unstable; urgency=low + + * Fix documentation error (Closes: #151385) + + -- Gordon Fraser Sat, 29 Jun 2002 19:16:55 +0200 + +wmmixer (1.5-1) unstable; urgency=low + + * New upstream version + + -- Gordon Fraser Tue, 25 Jun 2002 22:14:11 +0200 + +wmmixer (1.4-1) unstable; urgency=low + + * New upstream version + + -- Gordon Fraser Sat, 8 Jun 2002 18:13:17 +0200 + +wmmixer (1.3-3) unstable; urgency=low + + * Fix build failure on ia64 (Closes: #148454) + + -- Gordon Fraser Wed, 29 May 2002 11:29:51 +0200 + +wmmixer (1.3-2) unstable; urgency=low + + * Fix segfault on reading configuration file (Closes: #148245) + * Support DEB_BUILD_OPTIONS + + -- Gordon Fraser Mon, 27 May 2002 09:28:24 +0200 + +wmmixer (1.3-1) unstable; urgency=low + + * New upstream version + * Fix build failure on hppa (Closes: #148196) + + -- Gordon Fraser Sun, 26 May 2002 13:18:59 +0200 + +wmmixer (1.2-1) unstable; urgency=low + + * New upstream version + + -- Gordon Fraser Sat, 25 May 2002 15:01:15 +0200 + +wmmixer (1.1-4) unstable; urgency=low + + * Fix version string + * Improve mousewheel behaviour for changing both channels + + -- Gordon Fraser Sun, 14 Apr 2002 15:52:40 +0200 + +wmmixer (1.1-3) unstable; urgency=low + + * Added ioctl to check for changes before doing updates + This reduces CPU load a _lot_ + * Really give compiler CXXFLAGS + * Get rid of compiler warnings + + -- Gordon Fraser Fri, 12 Apr 2002 09:13:37 +0200 + +wmmixer (1.1-2) unstable; urgency=low + + * Correct Makefile to use C++ compiler instead of C compiler + (Closes: #141696) + + -- Gordon Fraser Mon, 8 Apr 2002 09:00:48 +0200 + +wmmixer (1.1-1) unstable; urgency=low + + * New maintainer + * New upstream release, new upstream author - me + * Add manpage (Closes: #93477) + * Add wheelmouse support (Closes: #47984) + * Move executable to /usr/bin (Closes: #122022) + * Update menu entry (Closes: #82330) + * Update X handling, now works with KDE Dock App Bar (Closes: #108529) + * It builds now (new Makefile, without imake), change Build-Depends + + -- Gordon Fraser Tue, 2 Apr 2002 19:36:36 +0200 + +wmmixer (1.0beta1-6.1) unstable; urgency=low + + * NMU + * Add Build-Depends: xutils. Closes: #105305 + + -- LaMont Jones Sat, 14 Jul 2001 23:16:14 -0600 + +wmmixer (1.0beta1-6) unstable; urgency=low + + * Can now handle as many channels as your sound card can. + * cleaned up menu file, added a non-docked entry + * Closes: #52908 + + -- Sean 'Shaleh' Perry Fri, 6 Oct 2000 10:46:24 -0700 + +wmmixer (1.0beta1-5) unstable; urgency=low + + * New maintainer + + -- Sean E. Perry Fri, 3 Sep 1999 14:30:29 -0700 + +wmmixer (1.0beta1-4) unstable; urgency=low + + * New maintainer + + -- Neale Pickett Thu, 25 Feb 1999 14:30:29 -0700 + +wmmixer (1.0beta1-3) frozen unstable; urgency=low + + * debian/rules: added dh_installexamples home.wmmixer (closes: bug#25482) + * recompiled with lastest g++ + * Added frozen to the target distributions... + + -- Marcelo E. Magallon Fri, 4 Dec 1998 13:58:26 -0600 + +wmmixer (1.0beta1-2) unstable; urgency=low + + * debian/rules: added dh_installexamples home.wmmixer (closes: bug#25482) + * recompiled with lastest g++ + + -- Marcelo E. Magallon Fri, 4 Dec 1998 12:36:31 -0600 + +wmmixer (1.0beta1-1) unstable; urgency=low + + * New upstream version + * Added CC=c++ to debian/rules (why does it work ok with wmmount but not + with this one?) + * debian/rules: changed cp wmmixer ... to install -s -m 0755 wmmixer ... + * debian/control: upgraded Standards Version to 2.4.1 + * debian/control: Suggests: wmaker | afterstep + * debian/rules: nuke -DX_LOCALE after making Makefile + * Added copyright information to debian/rules + + -- Marcelo E. Magallon Sun, 4 Oct 1998 20:42:22 -0600 + +wmmixer (0.8-1) frozen unstable; urgency=low + + * New upstream version + * WRT version 0.2 this: fixes bug relating to manual window positioning; + reduces CPU load; fixes bug relating to cards with no volume channel; + has better checking of supported channels; is GPLed. + + -- Marcelo E. Magallon Sat, 9 May 1998 21:33:48 -0600 + +wmmixer (0.7-1) unstable; urgency=low + + * New upstream version. It's GPL'ed now! Moving into main + * Applied patch that handles Expose events + + -- Marcelo E. Magallon Sat, 2 May 1998 13:37:54 -0600 + +wmmixer (0.6-1) unstable; urgency=low + + * New upstream version + + -- Marcelo E. Magallon Wed, 8 Apr 1998 21:20:33 -0600 + +wmmixer (0.2-2) frozen unstable; urgency=low + + * Moving to non-free due to copyright + + -- Marcelo E. Magallon Sat, 21 Mar 1998 15:29:04 -0600 + +wmmixer (0.2-1) unstable; urgency=low + + * Initial release + + -- Marcelo E. Magallon Sun, 5 Mar 1998 23:01:10 -0600 + --- wmmixer-1.5.orig/debian/copyright +++ wmmixer-1.5/debian/copyright @@ -0,0 +1,38 @@ +This package was first debianized by Marcelo E. Magallon + on Sun, 5 Mar 1998 23:00:00 -0600. +Additional modifications by Neale Pickett +and Gordon Fraser + +It is now maintained by Sandro Tosi + +It was downloaded from http://freakzone.net/gordon/wmmixer-1.3.tar.gz + +Upstream Authors: + + Sam Hawker + Gordon Fraser + +Copyright: + + 1998 Sam Hawker + 2002 Gordon Fraser + +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 St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On a Debian system the complete text of the GNU General Public License +can be found in the file `/usr/share/common-licenses/GPL-2' --- wmmixer-1.5.orig/debian/README.source +++ wmmixer-1.5/debian/README.source @@ -0,0 +1,4 @@ +This package uses dpatch to handle patches against upstream source code; you +can find additional information about dpatch at + + /usr/share/doc/dpatch/ --- wmmixer-1.5.orig/debian/control +++ wmmixer-1.5/debian/control @@ -0,0 +1,15 @@ +Source: wmmixer +Section: x11 +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev, dpatch +Standards-Version: 3.8.0 + +Package: wmmixer +Architecture: any +Depends: ${shlibs:Depends}, oss-compat +Suggests: wmaker | afterstep +Description: mixer application designed for WindowMaker + There's nothing in the program that makes it require WindowMaker, + except maybe the NeXTStep look and the fact that it properly + docks. It can be used with other window managers without problems. --- wmmixer-1.5.orig/debian/menu +++ wmmixer-1.5/debian/menu @@ -0,0 +1,10 @@ +?package(wmmixer):\ + needs="x11"\ + section="Applications/Sound"\ + title="WMMixer (Docked)"\ + command="/usr/bin/wmmixer -w" +?package(wmmixer):\ + needs="x11"\ + section="Applications/Sound"\ + title="WMMixer"\ + command="/usr/bin/wmmixer" --- wmmixer-1.5.orig/debian/patches/00list +++ wmmixer-1.5/debian/patches/00list @@ -0,0 +1 @@ +01_restore_pristine_code --- wmmixer-1.5.orig/debian/patches/01_restore_pristine_code.dpatch +++ wmmixer-1.5/debian/patches/01_restore_pristine_code.dpatch @@ -0,0 +1,77 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_restore_pristine_code.dpatch by Sandro Tosi +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: New patch generated from wmmixer 1.5-8 diff.gz + +@DPATCH@ + +--- wmmixer-1.5.orig/README ++++ wmmixer-1.5/README +@@ -82,10 +82,10 @@ + to reduce the size of the window to 56x56 pixels. + The "-position position" option has also been added, so you can push + wmcdplay off the edge of the screen while it gets swallowed. +-To put wmmount in your Wharf, add the following line in the appropriate ++To put wmmixer in your Wharf, add the following line in the appropriate + part of your .steprc + +-*Wharf wmmixer nil MaxSwallow "wmmount" wmmixer -a -g -0-0 & ++*Wharf wmmixer nil MaxSwallow "wmmixer" wmmixer -a -g -0-0 & + + It is also possible (by editing and recompiling the afterstep sources), + to make Wharf handle the new 56x56 pixel window properly - yes, I add +--- wmmixer-1.5.orig/mixctl.h ++++ wmmixer-1.5/mixctl.h +@@ -23,8 +23,8 @@ + #ifdef __NetBSD__ + #include + #endif +-#ifdef __FreeBSD__ +-#include ++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) ++#include + #endif + #ifdef __linux__ + #include +--- wmmixer-1.5.orig/mixctl.cc ++++ wmmixer-1.5/mixctl.cc +@@ -243,16 +243,16 @@ + //---------------------------------------------------------------------- + bool MixCtl::hasChanged() + { +- struct mixer_info mixer_info; +- ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info); ++ struct mixer_info mixer_info1; ++ ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info1); + +- if (mixer_info.modify_counter == modify_counter) ++ if (mixer_info1.modify_counter == modify_counter) + { + return false; + } + else + { +- modify_counter = mixer_info.modify_counter; ++ modify_counter = mixer_info1.modify_counter; + return true; + } + } +--- wmmixer-1.5.orig/exception.h ++++ wmmixer-1.5/exception.h +@@ -37,4 +37,4 @@ + // virtual ~MixerDeviceException(); + }; + +-#endif _exception_h__ ++#endif //_exception_h__ +--- wmmixer-1.5.orig/xhandler.cc ++++ wmmixer-1.5/xhandler.cc +@@ -24,6 +24,7 @@ + strcpy(backcolor_name_, BACKCOLOR); + + button_state_ = 0; ++ icon_list_ = NULL; + } + + //--------------------------------------------------------------------