[Pkg-wmaker-commits] [wmcdplay] 02/79: Imported Debian patch 1.0beta1-11
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 11:04:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcdplay.
commit 83d9a1addbffdb53560a48bbcd7bc0dd576b9236
Author: Emanuele Rocca <ema at debian.org>
Date: Tue Mar 18 16:24:30 2014 +0100
Imported Debian patch 1.0beta1-11
---
Imakefile | 2 +-
cdctl.h | 12 +++++-
debian/README.Debian | 8 ++++
debian/changelog | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 18 ++++++++
debian/copyright | 14 ++++++
debian/dirs | 4 ++
debian/docs | 2 +
debian/menu | 2 +
debian/rules | 62 +++++++++++++++++++++++++++
debian/wmcdplay.1x | 57 ++++++++++++++++++++++++
wmcdplay.cc | 17 ++++++--
13 files changed, 312 insertions(+), 6 deletions(-)
diff --git a/Imakefile b/Imakefile
index 3dfc773..96c573c 100644
--- a/Imakefile
+++ b/Imakefile
@@ -5,4 +5,4 @@ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
SRCS = wmcdplay.cc
OBJS = wmcdplay.o
-ComplexProgramTarget(wmcdplay)
+ComplexProgramTargetNoMan(wmcdplay)
diff --git a/cdctl.h b/cdctl.h
index 8710b6c..a2f78ae 100644
--- a/cdctl.h
+++ b/cdctl.h
@@ -85,7 +85,7 @@ public:
tracksel=tsRandom;
tskOurPlay=false;
- if(cdfdopen=(cdfd=open(device,O_RDONLY | O_NONBLOCK))!=-1){
+ if((cdfdopen = (cdfd = open(device,O_RDONLY | O_NONBLOCK))) != -1) {
status_state=ssNoCD;
status_track=0;
status_pos=0;
@@ -213,9 +213,19 @@ public:
start = cd_trklist[status_track].track_start;
stop = start + cd_trklist[status_track].track_len - _CDCTL_SENSITIVITY;
now = ((sc.cdsc_absaddr.msf.minute) * 60 + sc.cdsc_absaddr.msf.second) * 75 + sc.cdsc_absaddr.msf.frame - CD_MSF_OFFSET;
+/*
+cout << "=============" << endl;
+cout << "start:" << start << endl;
+cout << "stop:" << stop << endl;
+cout << "now:" << now << endl;
+*/
if(now>0 && (now<start || now>=stop)){
status_state=ssPlaying;
selecttrack();
+/*
+cout << "Play track " << status_track << endl;
+cout << "=============" << endl;
+*/
doStatus();
return;
}
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..68f0a0c
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,8 @@
+wmcdplay for DEBIAN
+-------------------
+
+This is Debian GNU/Linux's prepackaged version of wmcdplay, a very
+flexible CD player designed with NeXTStep/OpenStep in mind.
+
+Neale Pickett <neale at debian.org> Thu, 18 Feb 1999 16:18:29 -0700
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e7e048e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,119 @@
+wmcdplay (1.0beta1-11) unstable; urgency=low
+
+ * QA upload.
+ * Maintainer field set to QA Group.
+ * Bump Standards-Version to 3.9.5.
+ * Set debhelper compatibility level to 9.
+ * Add dependency on misc:Depends.
+ * Do not start description synopsis with an article.
+ * Use dh_prep instead of deprecated dh_clean -k.
+ * Only call make distclean when Makefile is available.
+ * Add missing targets to debian/rules: build-{arch,indep}.
+
+ -- Emanuele Rocca <ema at debian.org> Tue, 18 Mar 2014 16:24:30 +0100
+
+wmcdplay (1.0beta1-10) unstable; urgency=low
+
+ * Updated to latest Policy and Menu
+ * Cleaned up Build-Depends (Closes: #485237)
+
+ -- John H. Robinson, IV <jaqque at debian.org> Tue, 8 Jul 2008 12:51:16 -0700
+
+wmcdplay (1.0beta1-9.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Splitted xlibs-dev build-dep. (Closes: #347115)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Sat, 21 Jan 2006 11:56:02 +0100
+
+wmcdplay (1.0beta1-9) unstable; urgency=low
+
+ * New Maintainer
+ * New standards version
+ * Added menu entry
+ * Created man page
+
+ -- John H. Robinson, IV <jaqque at debian.org> Tue, 17 Aug 2004 23:57:31 -0700
+
+wmcdplay (1.0beta1-8) unstable; urgency=high
+
+ * Changed Imakefile to use ComplexProgramTargetNoMan rather
+ than ComplexProgramTarget (Closes: #123732)
+ * Added a menu entry for Window Maker.
+
+ -- Anthony Wong <ypwong at debian.org> Sat, 12 Jan 2002 13:04:25 +0800
+
+wmcdplay (1.0beta1-7) unstable; urgency=low
+
+ * New maintainer (Closes: #73008)
+ * Moved the program from /usr/X11R6/bin to /usr/bin
+ * Cleaned up Build-Depends to suit the current X packaging scheme.
+
+ -- Anthony Wong <ypwong at debian.org> Sun, 14 Jan 2001 11:52:45 +0800
+
+wmcdplay (1.0beta1-6) unstable; urgency=low
+
+ * Orphaning the package
+
+ -- Sean 'Shaleh' Perry <shaleh at debian.org> Sun, 27 Aug 2000 23:01:10 -0700
+
+wmcdplay (1.0beta1-5) unstable; urgency=low
+
+ * Bug fix release
+ * Closes: #51168, #59778
+
+ -- Sean 'Shaleh' Perry <shaleh at debian.org> Tue, 18 Jul 2000 12:32:12 -0700
+
+wmcdplay (1.0beta1-4) unstable; urgency=low
+
+ * New maintainer
+
+ -- Sean E. Perry <shaleh at debian.org> Fri, 3 Sep 1999 16:38:14 -0700
+
+wmcdplay (1.0beta1-3) unstable; urgency=low
+
+ * New maintainer
+
+ -- Neale Pickett <neale at debian.org> Thu, 18 Feb 1999 16:18:29 -0700
+
+wmcdplay (1.0beta1-2) unstable; urgency=low
+
+ * wmcdplay.cc: modified the location of system art files to reflect
+ placement on Debian's package.
+ * wmcdplay.cc: modified default value for cd polling interval (from
+ about 1 second to about 5 seconds) (closes: bug#25121)
+ * wmcdplay.cc: added -i switch to let user specify the cd polling
+ interval (sent upstream)
+ * Ekkehard Kraemer has confirmed that previous release fixed reported
+ bug, re: "wmcdplay doesn't work" (closes: bug#25535)
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sun, 11 Oct 1998 14:27:49 -0600
+
+wmcdplay (1.0beta1-1) unstable; urgency=low
+
+ * New upstream version
+ * debian/rules: nukes -DX_LOCALE from Makefile
+ * debian/rules: now calls $(MAKE) CC=c++ CXXDEBUGFLAGS="-g -O2"
+ * Artwork is now installed in /usr/share/wmcdplay
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sun, 4 Oct 1998 20:36:12 -0600
+
+wmcdplay (0.8-1) unstable; urgency=low
+
+ * New upstream version
+ * Added CC = c++ to Imakefile (there's something weird going on, cause
+ the upstream author doesn't need this)
+ * Uploaded to master
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Sat, 9 May 1998 21:41:16 -0600
+
+wmcdplay (0.7-1) unstable; urgency=low
+
+ * Initial release
+ * Modified Imakefile to include CC = c++, otherwise, it won't build.
+
+ -- Marcelo E. Magallon <mmagallo at debian.org> Wed, 8 Apr 1998 18:55:39 -0600
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..beb830c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: wmcdplay
+Section: sound
+Priority: optional
+Build-Depends: debhelper (>=9), xutils-dev, libx11-dev, libxext-dev, libxpm-dev
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Standards-Version: 3.9.5
+
+Package: wmcdplay
+Architecture: any
+Section: sound
+Priority: optional
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: wmaker
+Description: CD player based on ascd designed for WindowMaker
+ There's nothing in the program that makes it *require* WindowMaker,
+ except maybe the look. It's extremely customizable, provides great
+ control, and runs on a 64x64 window. You can get it too look almost
+ like anything, provided of course you READ the documentation.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..988e438
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,14 @@
+This package was debianized by Marcelo E. Magallon
+<mmagallo at debian.org> on Sun, 25 Jan 1998 11:00:00 -0600
+
+It was downloaded from http://www.geocities.com/SiliconValley/Vista/2471/wmcdplay.html
+
+Copyright (C) 1998 Sam Hawker <shawkie at geocities.com>
+
+The author, Sam Hawker, shawkie at ultraviolet.org, states this software
+is freely distributable and supplied without warranty (express or
+otherwise).
+
+You are free to distribute this software under the terms of the GNU General
+Public License. On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..7bfd0ac
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,4 @@
+usr/share/doc/wmcdplay
+usr/share/menu
+usr/share/wmcdplay
+usr/bin
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..be23a78
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README
+ARTWORK
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..cb05710
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,2 @@
+?package(wmcdplay):needs="x11" section="Applications/Sound"\
+ title="WMCDplay" command="wmcdplay"
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..6d49203
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,62 @@
+#!/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.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
+ dh_testdir
+ xmkmf -a
+ perl -pi -e 's/-DX_LOCALE//g;' Makefile
+ $(MAKE) CC=c++ CXXDEBUGFLAGS="-g -O2"
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ [ ! -f Makefile ] || $(MAKE) distclean
+ dh_clean
+
+# Build architecture-independent files here.
+binary-indep: build
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build
+# dh_testversion
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+ install -s -m 0755 wmcdplay `pwd`/debian/wmcdplay/usr/bin/wmcdplay
+ install -m 0644 XPM/*.art `pwd`/debian/wmcdplay/usr/share/wmcdplay
+# ( cd XPM ; tar cf - . ) | \
+# ( cd debian/tmp/usr/share/wmcdplay/ ; tar xvf - )
+# mv debian/tmp/usr/share/wmcdplay/*.art \
+# debian/tmp/usr/share/wmcdplay
+ dh_installdocs
+ dh_installmenu
+ dh_installman debian/wmcdplay.1x
+ dh_installchangelogs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
diff --git a/debian/wmcdplay.1x b/debian/wmcdplay.1x
new file mode 100644
index 0000000..f568d2b
--- /dev/null
+++ b/debian/wmcdplay.1x
@@ -0,0 +1,57 @@
+.TH WMCDplay 1x "August 17, 2004"
+.SH NAME
+wmcdplay \- A cd player designed for WindowMaker
+.SH SYNOPSIS
+.B wmcdplay
+.RI [ options ]
+.br
+.SH DESCRIPTION
+A skinable CD player for the Window Maker dock.
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-help\fR | \fB\-\-help\fR
+display this help screen
+.TP
+\fB\-w\fR
+use WithdrawnState (for WindowMaker)
+.TP
+\fB\-s\fR
+shaped window
+.TP
+\fB\-a\fR
+use smaller window (for AfterStep Wharf)
+.TP
+\fB\-f\fR artwork_file
+load the specified artwork file
+.TP
+\fB\-t\fR track_selection
+set track selection (between 0 and 4)
+.TP
+\fB\-v\fR volume
+set the cdrom volume (between 0 and 255)
+.TP
+\fB\-i\fR interval
+interval in 1/20 seconds between cd polls when empty
+.TP
+\fB\-l\fR led_color
+use the specified color for led displays
+.TP
+\fB\-b\fR back_color
+use the specified color for backgrounds
+.TP
+\fB\-d\fR cd_device
+use specified device
+.TP
+\fB\-position\fR position
+set window position
+.TP
+\fB\-display\fR display
+select target display
+.SH SEE ALSO
+.BR X (1x)
+.SH AUTHOR
+wmcdplay was written by Sam Hawker <shawkie at geocities.com>
+
+This manual page was written by John H. Robinson, IV <jaqque at debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
+.\" vim:syn=nroff
diff --git a/wmcdplay.cc b/wmcdplay.cc
index 7d205ac..4bc5a32 100644
--- a/wmcdplay.cc
+++ b/wmcdplay.cc
@@ -20,7 +20,7 @@
#define CLASS "WMCDPlay"
// User defines - custom
-#define SYSARTDIR "/usr/X11R6/lib/X11/wmcdplay/"
+#define SYSARTDIR "/usr/share/wmcdplay/"
#define CDDEV "/dev/cdrom"
#define BACKCOLOR "#282828"
#define LEDCOLOR "green"
@@ -81,6 +81,7 @@ bool artwrk=false;
char artwrkf[256]="";
int tsel=1;
int vol=-1; // -1 means don't set volume
+int uinterval_e=UINTERVAL_E;
// X-Windows basics - standard
Atom _XA_GNUSTEP_WM_FUNC;
@@ -226,7 +227,7 @@ int main(int argc, char **argv)
}
}
ucount++;
- if(ucount>=((mode==ssNoCD || mode==ssTrayOpen) ? UINTERVAL_E : UINTERVAL_N))
+ if(ucount>=((mode==ssNoCD || mode==ssTrayOpen) ? uinterval_e : UINTERVAL_N))
checkStatus(false);
XFlush(d_display);
usleep(50000);
@@ -364,6 +365,7 @@ void scanArgs(int argc, char **argv){
fprintf(stderr, " -f artwork_file load the specified artwork file\n");
fprintf(stderr, " -t track_selection set track selection (between 0 and 4)\n");
fprintf(stderr, " -v volume set the cdrom volume (between 0 and 255)\n");
+ fprintf(stderr, " -i interval interval in 1/20 seconds between cd polls when empty\n");
fprintf(stderr, " -l led_color use the specified color for led displays\n");
fprintf(stderr, " -b back_color use the specified color for backgrounds\n");
fprintf(stderr, " -d cd_device use specified device (rather than /dev/cdrom)\n");
@@ -391,6 +393,13 @@ void scanArgs(int argc, char **argv){
}
continue;
}
+ if(strcmp(argv[i], "-i")==0){
+ if(i<argc-1){
+ i++;
+ sscanf(argv[i], "%i", &uinterval_e);
+ }
+ continue;
+ }
if(strcmp(argv[i], "-f")==0){
artwrk=true;
if(i<argc-1){
@@ -476,7 +485,7 @@ void checkStatus(bool forced){
drawText(art_ledpos[1][0], art_ledpos[1][1], trackstr);
}
if(mode==ssPlaying || mode==ssPaused || mode==ssStopped){
- int remain;
+ int remain = 0;
if(tdisplay==0)
remain=cdctl->getTrackLen(cdctl->getStatusTrack())-pos;
if(tdisplay==1)
@@ -623,7 +632,7 @@ bool readArtwork(char *artfilen){
sprintf(artfilenbuf, "%s%s", SYSARTDIR, artfilen);
artfile=fopen(artfilenbuf, "r");
if(artfile==NULL){
- fprintf(stderr,"%s : Tried to find artwork file, but failed.\n", NAME, artfilen);
+ fprintf(stderr,"%s : Tried to find artwork file, but failed.\n", NAME);
return false;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcdplay.git
More information about the Pkg-wmaker-commits
mailing list