[Pkg-wmaker-commits] [wmrack] 34/97: Imported Debian patch 1.0b5-4

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sat Aug 22 02:42:02 UTC 2015


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

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

commit a40c407d7f6a9812e3b6484596e2c45980da6815
Merge: 9584de1 b70b1b6
Author: Sean E. Perry <shaleh at debian.org>
Date:   Tue Sep 7 14:46:52 1999 -0700

    Imported Debian patch 1.0b5-4

 .cvsignore             |    8 +
 CHANGES                |   49 ++
 Imakefile              |   12 -
 Makefile.cdctrl        |   12 -
 Makefile.in            |   77 +++
 README                 |   47 +-
 README.cdctrl          |    8 -
 README.ctrl            |   10 +
 TODO                   |   18 +-
 XPM/.cvsignore         |    2 +
 XPM/Makefile.in        |   21 +
 XPM/README             |   29 +-
 XPM/big.style          |  705 -------------------
 XPM/blue.style         |  327 ---------
 XPM/bluered.style      | 1213 --------------------------------
 XPM/cd-mask.xpm        |   72 +-
 XPM/clean.style        |  374 ++++++++++
 XPM/gold.style         |  402 -----------
 XPM/grey.style         |  475 ++++++++-----
 XPM/grey/alphaled.xpm  |   18 +
 XPM/grey/cdnodisc.xpm  |   83 +--
 XPM/grey/cdpaused.xpm  |   83 +--
 XPM/grey/cdplaying.xpm |   83 +--
 XPM/grey/cdstopped.xpm |   83 +--
 XPM/grey/led.xpm       |   12 +-
 XPM/grey/mixer.xpm     |   59 ++
 XPM/grey/mixled.xpm    |   52 ++
 XPM/led.xpm            |   12 +-
 XPM/mixer-mask.xpm     |   54 ++
 XPM/orange.style       |  327 ---------
 XPM/smiley.style       |  523 --------------
 XPM/standart.style     |    1 -
 cdctrl.c               |  153 +++--
 cdrom.c                |  948 ++++++++++++++-----------
 cdrom.h                |   91 ++-
 config.h.in            |    7 +
 configure              | 1786 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in           |  118 ++++
 debian/README.debian   |   30 +
 debian/changelog       |   40 +-
 debian/control         |   14 +-
 debian/copyright       |    2 +-
 debian/dirs            |    1 -
 debian/menu            |    3 +-
 debian/rules           |   60 +-
 install-sh             |  250 +++++++
 library.c              |  163 +++++
 library.h              |   33 +
 mixctrl.c              |  141 ++++
 mixer.c                |  511 ++++++++++++++
 mixer.h                |   59 ++
 wmrack.c               | 1268 +++++++++++++++++++++++++---------
 wmrack.man             |  117 +++-
 xpmicon.c              |   66 +-
 xpmicon.h              |   14 +-
 55 files changed, 6334 insertions(+), 4792 deletions(-)

diff --cc debian/README.debian
index 71e1678,0000000..cfbc1d8
mode 100644,000000..100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@@ -1,7 -1,0 +1,37 @@@
 +wmrack for DEBIAN
 +-----------------
 +
 +This is Debian GNU/Linux's prepackaged version of wmrack, a rack like
 +program designed for WindowMaker.
 +
++The following is an excerpt from a message exchange regarding the
++configuration of audio devices under Debian GNU/Linux:
++
++> wmrack could really use documentation on how to configure the
++> permissions for the cdrom device.  That's /dev/hdc (symlinked to
++> /dev/cdrom) for me, which I did 'chgrp audio' on that device
++> and added users to the audio group.  But I'm not sure if that's
++> correct, since the device is g+w (0660).
++
++ It's correct.  Sort of.
++
++ Only users in the audio group have access to the audio devices.
++ Adding users to audio is much like doing 'xhost +localhost' which is
++ a great source for practical jokes in computer labs...  I remember
++ writing a script to add a number of xeyes instances once per second
++ to a classmate's display...  they were positioned and sized in such a
++ way that after 5-10 seconds my classmate would be screaming all over
++ the lab.
++
++ With the 'users in audio group' setup it about the same...  playing
++ Quake's shotgun every now and then comes to mind...  making the
++ computer say "don't think about it" is amusing, too -- especially if
++ the person is using headphones.
++
++ The *proper* solution is to add audio to the CONSOLE_GROUPS in
++ /etc/login.defs; the problem with this is that the xdm gang doesn't
++ obey this (patch someone?). In this way, only the user at the console
++ has access to the audio devices (and the floppy, cdrom, scanner,
++ whatever)
++
 +Marcelo E. Magallon <mmagallo at debian.org>, Fri,  2 Jan 1998 13:42:00 -0600
diff --cc debian/changelog
index 4ab260c,0000000..07659a4
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,0 +1,49 @@@
++wmrack (1.0b5-4) unstable; urgency=low
++
++  * Upload for fhs compliance
++  * Closes: #44538
++
++ -- Sean E. Perry <shaleh at debian.org>  Tue,  7 Sep 1999 14:46:52 -0700
++
++wmrack (1.0b5-3) unstable; urgency=low
++
++  * New maintainer
++
++ -- Sean E. Perry <shaleh at debian.org>  Fri,  3 Sep 1999 16:13:17 -0700
++
++wmrack (1.0b5-2) unstable; urgency=low
++
++  * debian/control: improved description (closes: bug#33399)
++  * debian/README.Debian: added note regarding audio devices (closes:
++    bug#31308)
++  * 1.0b5 added signal handling (closes: bug#29211, bug#31257)
++
++ -- Marcelo E. Magallon <mmagallo at debian.org>  Sun, 13 Jun 1999 10:13:13 -0600
++
++wmrack (1.0b5-1) frozen unstable; urgency=low
++
++  * New upstream release
++  * Renamed source package back to wmrack
++
++ -- Marcelo E. Magallon <mmagallo at debian.org>  Thu, 31 Dec 1998 18:38:40 -0600
++
++WMRack (1.0b3-1) unstable; urgency=low
++
++  * New upstream version
++  * Renaming source package from wmrack to WMRack, upstream's name
++  * Patched a bit to prevent wmrack to crash on startup if no
++    configuration file is found
++
++ -- Marcelo E. Magallon <mmagallo at debian.org>  Sat, 11 Apr 1998 22:09:54 -0600
++
 +wmrack (0.9-1) unstable; urgency=low
 +
 +  * Initial release
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Fri,  2 Jan 1998 14:00:10 -0600
 +
 +Local variables:
 +mode: debian-changelog
 +mode: auto-fill
- add-log-mailing-address: "mmagallo at debian.org"
++add-log-mailing-address: "shaleh at debian.org"
 +End:
diff --cc debian/control
index a3c2851,0000000..6cde081
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,0 +1,17 @@@
 +Source: wmrack
- Section: x11
++Section: sound
 +Priority: optional
- Maintainer: Marcelo E. Magallon <mmagallo at debian.org>
++Maintainer: Sean E. Perry <shaleh at debian.org>
 +Standards-Version: 2.4.0.0
 +
 +Package: wmrack
 +Architecture: any
++Section: sound
++Priority: optional
 +Depends: ${shlibs:Depends}
 +Suggests: wmaker
- Description: A rack like program designed for WindowMaker
-  There's nothing in the program that makes it requiere WindowMaker, except
-  maybe the look.
++Description: A rack like program designed for Window Maker
++ wmrack is both a CD-player and a mixer.  Its look is very
++ customizable and uses very little screen realstate.  It's desinged
++ with Window Maker in mind, but there's nothing in the program that
++ makes it require a particular window manager.
diff --cc debian/copyright
index f5ccf75,0000000..719a005
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,11 -1,0 +1,11 @@@
 +This package was debianized by Marcelo E. Magallon
 +<mmagallo at efis.ucr.ac.cr> on Sun, 5 Mar 1998 22:42:00 -0600.
 +
 +It was downloaded from http://wm.wep.net/
 +
 +wmrack is distributed under the terms of the GNU Public License.
 +
 +You can find a copy of the GNU General Public License in the directory
- /usr/doc/copyright, in the file GPL; if not, you can obtain a copy
++/usr/share/common-licenses, in the file GPL; if not, you can obtain a copy
 +writing to the Free Software Foundation, Inc., 59 Temple Place, Suite
 +330, Boston, MA 02111-1307, USA.
diff --cc debian/dirs
index 6d26313,0000000..3d6c764
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,4 -1,0 +1,3 @@@
 +usr/X11R6/bin
 +usr/X11R6/man/man1
- usr/doc/wmrack
 +usr/lib/menu
diff --cc debian/menu
index 6966565,0000000..8a28f0c
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,6 -1,0 +1,5 @@@
 +?package(wmrack):\
 +   needs="x11"\
-    icon="none"\
 +   section="Apps/Sound"\
 +   title="WMrack"\
-    command="/usr/X11R6/bin/wmrack -w"
++   command="/usr/bin/X11/wmrack -w"
diff --cc debian/rules
index fadab6f,0000000..76656d3
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,57 -1,0 +1,61 @@@
 +#!/usr/bin/make -f
 +
- package=wmrack
++#export DH_VERBOSE = 1
 +
- SHELL=/bin/sh
++package=wmrack
 +
- export DH_VERBOSE = 1
++build: stamp-build
 +
- build: Makefile
++stamp-build: Makefile
 +	dh_testdir
- 	make
- 	touch build
++	$(MAKE)
++	touch stamp-build
 +
 +Makefile: 
- 	xmkmf
++	./configure --without-debug
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
- 	-make clean
- 	-rm -f build Makefile
++	-$(MAKE) clean
++	-rm -f build Makefile XPM/standart.style cdctrl mixctrl wmrack \
++	  XPM/Makefile config.log config.h config.cache config.status \
++	  .depend
 +	dh_clean
 +
 +binary-indep: build
 +#	dh_testdir -i
 +#	dh_testroot
 +#	dh_clean -i -k
 +
 +binary-arch: build
- 	dh_testdir -a
++	dh_testdir
 +	dh_testroot
- 	dh_clean -a -k
- 	dh_installdirs -a
- 	cp wmrack debian/tmp/usr/X11R6/bin
- 	dh_installdocs -a
- 	dh_installmenu -a
- 	cp wmrack.man debian/tmp/usr/X11R6/man/man1/wmrack.1x
- 	dh_installchangelogs -a
- 	dh_strip -a
- 	dh_compress -a
- 	dh_fixperms -a
- 	dh_installdeb -a
- 	dh_shlibdeps -a
- 	dh_gencontrol -a -u-isp #-DSection=x11 -u-DPriority=extra
- 	dh_makeshlibs -a
- 	dh_du -a
- 	dh_md5sums -a
- 	dh_builddeb -a
++	dh_clean -k
++	dh_installdirs
++	install -m 755 -s wmrack debian/tmp/usr/X11R6/bin
++	install -m 755 -s cdctrl debian/tmp/usr/X11R6/bin
++	install -m 755 -s mixctrl debian/tmp/usr/X11R6/bin
++	dh_installdocs
++	dh_installmenu
++	install -m 0644 wmrack.man debian/tmp/usr/X11R6/man/man1/wmrack.1x
++	dh_undocumented mixctrl.1x cdctrl.1x
++	dh_installchangelogs
++	dh_strip
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_shlibdeps
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
 +
 +binary:	binary-indep binary-arch
 +
- .PHONY: binary binary-arch binary-indep clean
++.PHONY: binary binary-arch binary-indep clean build
 +
 +# Local variables:
 +# mode: makefile
 +# mode: font-lock
 +# End:
++
diff --cc wmrack.c
index 877e216,be31ded..f039fb0
--- a/wmrack.c
+++ b/wmrack.c
@@@ -198,7 -259,7 +259,6 @@@ void initHandler(
    sa.sa_handler=shutDown;
    sigfillset(&sa.sa_mask);
    sa.sa_flags=0;
--  sa.sa_restorer=NULL;
    sigaction(SIGTERM,&sa,NULL);
    sigaction(SIGINT,&sa,NULL);
    sigaction(SIGHUP,&sa,NULL);

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



More information about the Pkg-wmaker-commits mailing list