[Pkg-wmaker-commits] [wmix] 04/10: Import Debian changes 3.0-7
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Sep 29 02:16:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmix.
commit a217bccdad7af511e1c9f8cb126ddde683cf559f
Author: Fredrik Steen <stone at debian.org>
Date: Fri Jan 2 14:07:50 2004 +0100
Import Debian changes 3.0-7
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
wmix (3.0-6) unstable; urgency=low
* The doh! release. Forgot to Build-depend on cdbs
Closes:#217054
wmix (3.0-5) unstable; urgency=low
* Converted package to use cdbs
* Patch from Andreas Tscharner <starfire at dplanet.ch> to fix 10% bug
(Closes:#216488)
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
---
debian/changelog | 31 +++++++++++++
debian/compat | 1 +
debian/control | 10 ++---
debian/copyright | 2 +-
debian/patches/wmix_10percent_fix.patch | 11 +++++
debian/rules | 80 +++++++--------------------------
debian/wmix.dirs | 1 +
mixer-oss.c | 14 +++---
8 files changed, 74 insertions(+), 76 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8adbb9b..2de074b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+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 <stone at debian.org> 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 <stone at debian.org> Wed, 22 Oct 2003 15:50:07 +0200
+
+wmix (3.0-5) unstable; urgency=low
+
+ * Converted package to use cdbs
+ * Patch from Andreas Tscharner <starfire at dplanet.ch> to fix 10% bug
+ (Closes:#216488)
+
+ -- Fredrik Steen <stone at debian.org> 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 <stone at debian.org> Tue, 17 Dec 2002 16:15:28 +0100
+
wmix (3.0-3) unstable; urgency=low
* Fixed a too long description line, Closes:#130987.
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index 721bdd4..5543325 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
Source: wmix
Section: x11
Priority: extra
-Build-Depends: debhelper (>> 2.0.0), xlib6g-dev, xlibs-dev
+Build-Depends: debhelper (>> 2.0.0), xlibs-dev, cdbs (>= 0.2.4)
Maintainer: Fredrik Steen <stone at debian.org>
-Standards-Version: 3.2.1
+Standards-Version: 3.5.8
Package: wmix
Architecture: any
Depends: ${shlibs:Depends}
Description: Dockapp mixer for OSS or ALSA
- Dockapp mixer for OSS or ALSA. 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.
+ 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.
diff --git a/debian/copyright b/debian/copyright
index 3628358..b6a3519 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Mon, 26 Mar 2001 13:39:54 +0200.
It was downloaded from: http://www.ne.jp/asahi/linux/timecop/
-Upstream Author(s): timecop, <timecop at japan.co.jp>
+Upstream Author: timecop, <timecop at japan.co.jp>
Copyright:
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
diff --git a/debian/patches/wmix_10percent_fix.patch b/debian/patches/wmix_10percent_fix.patch
new file mode 100644
index 0000000..d62ed72
--- /dev/null
+++ b/debian/patches/wmix_10percent_fix.patch
@@ -0,0 +1,11 @@
+--- ui_x.c~ 2001-05-25 12:00:16.000000000 +0200
++++ ui_x.c 2003-10-11 11:02:53.000000000 +0200
+@@ -516,7 +516,7 @@
+ copy_xpm_area(0, 87, 18, 9, 41, 22); /* clear percentage */
+
+ if (volume < 100) {
+- if (volume > 10)
++ 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);
+ } else {
diff --git a/debian/rules b/debian/rules
index 49f5bb7..6542edd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,18 @@
#!/usr/bin/make -f
-# vim: nowrap:ts=4
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
-
-build: build-stamp
-build-stamp:
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- -$(MAKE) clean
- dh_clean
- -/bin/gunzip debian/wmix.1x.gz
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs usr/X11R6/bin
- dh_installdirs usr/X11R6/man/man1
- /bin/gzip -9 debian/wmix.1x
- install -s -o root -g root -m 0755 wmix debian/wmix/usr/X11R6/bin/
- install -o root -g root -m 0644 debian/wmix.1x.gz debian/wmix/usr/X11R6/man/man1/
-
-# 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
-# Depricated, use build dependencies instead.
-# dh_testversion 2
- dh_testdir
- dh_testroot
- dh_installdocs BUGS AUTHORS NEWS README
- dh_installexamples sample.wmixrc
- dh_installmenu
-# dh_installman wmix.1.gz
-# dh_undocumented usr/share/man/man1/wmix.1
-# dh_installchangelogs ChangeLog
- dh_installchangelogs
- 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
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Fredrik Steen <stone at debian.org>
+export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.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::
+ -make clean
+# pwd
+# -/bin/gunzip debian/wmix.1x.gz
diff --git a/debian/wmix.dirs b/debian/wmix.dirs
new file mode 100644
index 0000000..415f082
--- /dev/null
+++ b/debian/wmix.dirs
@@ -0,0 +1 @@
+/usr/bin
diff --git a/mixer-oss.c b/mixer-oss.c
index 51b13b2..a7e8d71 100644
--- a/mixer-oss.c
+++ b/mixer-oss.c
@@ -93,7 +93,7 @@ static int prev_modify_counter = -1;
static bool get_mixer_state(void)
{
- struct mixer_info mixer_info;
+ struct mixer_info mix_info;
int dev_lr_volume, dev_left_volume, dev_right_volume;
float left, right;
int srcmask;
@@ -102,9 +102,9 @@ static bool get_mixer_state(void)
/* to really keep track of updates */
static MixerChannel oldmixer[SOUND_MIXER_NRDEVICES];
- ioctl(mixer_fd, SOUND_MIXER_INFO, &mixer_info);
+ ioctl(mixer_fd, SOUND_MIXER_INFO, &mix_info);
- if (mixer_info.modify_counter == prev_modify_counter)
+ if (mix_info.modify_counter == prev_modify_counter)
/*
* Mixer state has not changed
*/
@@ -156,7 +156,7 @@ static bool get_mixer_state(void)
}
mixer[ch].is_recording = ((1 << mixer[ch].dev) & srcmask) != 0;
}
- prev_modify_counter = mixer_info.modify_counter;
+ prev_modify_counter = mix_info.modify_counter;
/* check if this was due to OSS stupidity or if we really changed */
if (!memcmp(&mixer, &oldmixer, sizeof(mixer))) {
memcpy(&oldmixer, &mixer, sizeof(mixer));
@@ -223,7 +223,7 @@ static void set_record_state(void)
void mixer_init(const char *mixer_device, bool verbose)
{
int devmask, srcmask, recmask, stmask;
- struct mixer_info mixer_info;
+ struct mixer_info mix_info;
int count;
int mask;
@@ -255,13 +255,13 @@ void mixer_init(const char *mixer_device, bool verbose)
exit(EXIT_FAILURE);
}
- if (ioctl(mixer_fd, SOUND_MIXER_INFO, &mixer_info) == -1) {
+ if (ioctl(mixer_fd, SOUND_MIXER_INFO, &mix_info) == -1) {
fputs("error: could not read mixer info\n", stderr);
exit(EXIT_FAILURE);
}
if (verbose) {
- printf("%s (%s)\n", mixer_info.name, mixer_info.id);
+ printf("%s (%s)\n", mix_info.name, mix_info.id);
puts("Supported channels:");
}
for (count = 0; count < SOUND_MIXER_NRDEVICES; count++) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmix.git
More information about the Pkg-wmaker-commits
mailing list