[Pkg-wmaker-commits] [wmmixer] 15/24: Import Debian changes 1.5-9
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sun Aug 27 13:12:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmmixer.
commit 2e4c0903a3885f42fd1511302d7a3d8df6acea7c
Author: Sandro Tosi <matrixhasu at gmail.com>
Date: Mon Oct 8 21:38:57 2007 +0200
Import Debian changes 1.5-9
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
---
README | 4 +-
debian/changelog | 25 +++++++++
debian/control | 12 ++--
debian/copyright | 31 +++++++++--
debian/menu | 4 +-
debian/patches/00list | 1 +
debian/patches/01_restore_pristine_code.dpatch | 77 ++++++++++++++++++++++++++
debian/rules | 12 ++--
exception.h | 2 +-
mixctl.cc | 8 +--
mixctl.h | 4 +-
xhandler.cc | 1 -
12 files changed, 152 insertions(+), 29 deletions(-)
diff --git a/README b/README
index e77d72b..5109cbb 100644
--- a/README
+++ b/README
@@ -82,10 +82,10 @@ The effect this has is to enable shape support (it implies "-s"), and
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 wmmixer in your Wharf, add the following line in the appropriate
+To put wmmount in your Wharf, add the following line in the appropriate
part of your .steprc
-*Wharf wmmixer nil MaxSwallow "wmmixer" wmmixer -a -g -0-0 &
+*Wharf wmmixer nil MaxSwallow "wmmount" 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
diff --git a/debian/changelog b/debian/changelog
index c8f2cfc..b5bc1d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+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 <matrixhasu at gmail.com> Mon, 08 Oct 2007 21:38:57 +0200
+
wmmixer (1.5-8) unstable; urgency=medium
* QA upload.
diff --git a/debian/control b/debian/control
index c17b969..9708c4e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
Source: wmmixer
Section: x11
Priority: optional
-Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev
-Maintainer: Debian QA Group <packages at qa.debian.org>
+Maintainer: Sandro Tosi <matrixhasu at gmail.com>
+Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxpm-dev, dpatch
Standards-Version: 3.7.2
Package: wmmixer
Architecture: any
Depends: ${shlibs:Depends}
Suggests: wmaker | afterstep
-Description: A 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.
+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.
diff --git a/debian/copyright b/debian/copyright
index e510f39..3af0bef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,13 +3,32 @@ This package was first debianized by Marcelo E. Magallon
Additional modifications by Neale Pickett <neale at debian.org>
and Gordon Fraser <gordon at debian.org>
-wmmixer - a mixer control for WindowMaker, originally by
-Sam Hawker <shawkie at geocities.com>, now maintained by
+It is now maintained by Sandro Tosi <matrixhasu at gmail.com>
+
+It was downloaded from http://freakzone.net/gordon/wmmixer-1.3.tar.gz
+
+Upstream authors: Sam Hawker <shawkie at geocities.com>, now maintained by
Gordon Fraser <gordon at freakzone.net>
-It was downloaded from:
+Copyright: 1998 Sam Hawker <shawkie at geocities.com>
+ 2002 Gordon Fraser <gordon at debian.org>
+
+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.
- http://freakzone.net/gordon/wmmixer-1.3.tar.gz
+ 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.
-This program is distributed under the GPL. You can find a copy on
-/usr/share/common-licenses/GPL.
+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'
diff --git a/debian/menu b/debian/menu
index 92de3ae..0fa5156 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,10 +1,10 @@
?package(wmmixer):\
needs="x11"\
- section="Apps/Sound"\
+ section="Applications/Sound"\
title="WMMixer (Docked)"\
command="/usr/bin/wmmixer -w"
?package(wmmixer):\
needs="x11"\
- section="Apps/Sound"\
+ section="Applications/Sound"\
title="WMMixer"\
command="/usr/bin/wmmixer"
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..b91f055
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_restore_pristine_code
diff --git a/debian/patches/01_restore_pristine_code.dpatch b/debian/patches/01_restore_pristine_code.dpatch
new file mode 100644
index 0000000..7c9675c
--- /dev/null
+++ b/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 <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from wmmixer 1.5-8 diff.gz
+
+ at 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 <soundcard.h>
+ #endif
+-#ifdef __FreeBSD__
+-#include <machine/soundcard.h>
++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
++#include <sys/soundcard.h>
+ #endif
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+--- 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;
+ }
+
+ //--------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 9ae6393..6c628f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
CXXFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CXXFLAGS += -O0
@@ -14,12 +16,12 @@ else
endif
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh_testdir
$(MAKE) CXXFLAGS="$(CXXFLAGS)"
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
@@ -38,9 +40,9 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs CHANGES
- dh_installdocs README
- dh_installexamples home.wmmixer
+ dh_installchangelogs CHANGES
+ dh_installdocs README
+ dh_installexamples home.wmmixer
dh_installmenu
dh_strip
dh_compress
diff --git a/exception.h b/exception.h
index 4c8a138..3923006 100644
--- a/exception.h
+++ b/exception.h
@@ -37,4 +37,4 @@ class MixerDeviceException : public Exception
// virtual ~MixerDeviceException();
};
-#endif //_exception_h__
+#endif _exception_h__
diff --git a/mixctl.cc b/mixctl.cc
index 10de39d..7cf3261 100644
--- a/mixctl.cc
+++ b/mixctl.cc
@@ -243,16 +243,16 @@ char* MixCtl::getLabel(int dev)
//----------------------------------------------------------------------
bool MixCtl::hasChanged()
{
- struct mixer_info mixer_info1;
- ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info1);
+ struct mixer_info mixer_info;
+ ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info);
- if (mixer_info1.modify_counter == modify_counter)
+ if (mixer_info.modify_counter == modify_counter)
{
return false;
}
else
{
- modify_counter = mixer_info1.modify_counter;
+ modify_counter = mixer_info.modify_counter;
return true;
}
}
diff --git a/mixctl.h b/mixctl.h
index 4acf079..2750693 100644
--- a/mixctl.h
+++ b/mixctl.h
@@ -23,8 +23,8 @@
#ifdef __NetBSD__
#include <soundcard.h>
#endif
-#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include <sys/soundcard.h>
+#ifdef __FreeBSD__
+#include <machine/soundcard.h>
#endif
#ifdef __linux__
#include <linux/soundcard.h>
diff --git a/xhandler.cc b/xhandler.cc
index 9c2a7b9..652335d 100644
--- a/xhandler.cc
+++ b/xhandler.cc
@@ -24,7 +24,6 @@ XHandler::XHandler()
strcpy(backcolor_name_, BACKCOLOR);
button_state_ = 0;
- icon_list_ = NULL;
}
//--------------------------------------------------------------------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmixer.git
More information about the Pkg-wmaker-commits
mailing list