[Pkg-wmaker-commits] [wmcdplay] 05/79: debian/patches: Convert patches from previous versions of package to quilt.
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 c132a7f70aa9be84622c6d483c7bd4f86a603d6d
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Tue Jul 29 11:28:45 2014 -0500
debian/patches: Convert patches from previous versions of package to quilt.
---
debian/changelog | 1 +
debian/patches/add_debugging_comments.patch | 29 +++++++++++++++++
debian/patches/add_interval_option.patch | 49 +++++++++++++++++++++++++++++
debian/patches/add_parentheses.patch | 21 +++++++++++++
debian/patches/build_without_manpage.patch | 19 +++++++++++
debian/patches/change_artwork_dir.patch | 19 +++++++++++
debian/patches/remove_extra_arg.patch | 20 ++++++++++++
debian/patches/series | 7 +++++
debian/patches/set_remain_to_zero.patch | 21 +++++++++++++
9 files changed, 186 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 274faa7..eab190b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ wmcdplay (1.0beta1-12) unstable; urgency=low
* New maintainer (Closes: #632877).
* Switch to dpkg-source 3.0 (quilt) format.
- Add debian/source/format.
+ - Convert patches from previous versions; now appear in debian/patches.
-- Doug Torrance <dtorrance at monmouthcollege.edu> Tue, 29 Jul 2014 09:11:19 -0500
diff --git a/debian/patches/add_debugging_comments.patch b/debian/patches/add_debugging_comments.patch
new file mode 100644
index 0000000..86eac45
--- /dev/null
+++ b/debian/patches/add_debugging_comments.patch
@@ -0,0 +1,29 @@
+Description: Add debugging comments to cdctl.h.
+
+ Patch created for some version between 1.0beta1-5 and and 1.0beta1-8.
+ Converted to quilt for 1.0beta-12.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-07-29
+
+--- a/cdctl.h
++++ b/cdctl.h
+@@ -213,9 +213,19 @@
+ 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/patches/add_interval_option.patch b/debian/patches/add_interval_option.patch
new file mode 100644
index 0000000..d080401
--- /dev/null
+++ b/debian/patches/add_interval_option.patch
@@ -0,0 +1,49 @@
+Description: Add -i option so users can specify cd polling interval.
+
+ Patch created for 1.0beta1-2. Converted to quilt for 1.0beta-12.
+Bug-Debian: http://bugs.debian.org/25121
+Author: Marcelo E. Magallon <mmagallo at debian.org>
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-07-29
+
+--- a/wmcdplay.cc
++++ b/wmcdplay.cc
+@@ -81,6 +81,7 @@
+ 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 @@
+ }
+ }
+ 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 @@
+ 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 @@
+ }
+ 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){
diff --git a/debian/patches/add_parentheses.patch b/debian/patches/add_parentheses.patch
new file mode 100644
index 0000000..af5ed16
--- /dev/null
+++ b/debian/patches/add_parentheses.patch
@@ -0,0 +1,21 @@
+Description: Add parentheses in cdctl.h.
+ This avoids the following warning during build:
+ "warning: suggest parentheses around assignment used as truth value
+ [-Wparentheses]"
+
+ Patch created for some version between 1.0beta1-5 and and 1.0beta1-8.
+ Converted to quilt for 1.0beta-12.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-07-29
+
+--- a/cdctl.h
++++ b/cdctl.h
+@@ -85,7 +85,7 @@
+ 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;
diff --git a/debian/patches/build_without_manpage.patch b/debian/patches/build_without_manpage.patch
new file mode 100644
index 0000000..c610b82
--- /dev/null
+++ b/debian/patches/build_without_manpage.patch
@@ -0,0 +1,19 @@
+Description: Build without manpage.
+ Switch from using ComplexProgramTarget() to ComplexProgramTargetNoMan() in
+ IMakefile. Otherwise, build fails with:
+ "*** No rule to make target `wmcdplay.man', needed by `wmcdplay._man'."
+
+ Patch created for 1.0beta1-8. Converted to quilt for 1.0beta-12.
+Bug-Debian: http://bugs.debian.org/123732
+Author: Anthony Wong <ypwong at debian.org>
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-07-29
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -5,4 +5,4 @@
+ SRCS = wmcdplay.cc
+ OBJS = wmcdplay.o
+
+-ComplexProgramTarget(wmcdplay)
++ComplexProgramTargetNoMan(wmcdplay)
diff --git a/debian/patches/change_artwork_dir.patch b/debian/patches/change_artwork_dir.patch
new file mode 100644
index 0000000..2b4872b
--- /dev/null
+++ b/debian/patches/change_artwork_dir.patch
@@ -0,0 +1,19 @@
+Description: Change artwork installation directory to /usr/share/wmcdplay.
+ Move artwork files to conform to FHS.
+
+ Patch created for 1.0beta1-2. Converted to quilt for 1.0beta-12.
+Author: Marcelo E. Magallon <mmagallo at debian.org>
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-07-29
+
+--- 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"
diff --git a/debian/patches/remove_extra_arg.patch b/debian/patches/remove_extra_arg.patch
new file mode 100644
index 0000000..9f2688f
--- /dev/null
+++ b/debian/patches/remove_extra_arg.patch
@@ -0,0 +1,20 @@
+Description: Remove extra argument to format in fprintf.
+ This avoids the following warning during build:
+ "warning: too many arguments for format [-Wformat-extra-args]"
+
+ Patch created for some version between 1.0beta1-5 and and 1.0beta1-8.
+ Converted to quilt for 1.0beta-12.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-07-29
+
+--- a/wmcdplay.cc
++++ b/wmcdplay.cc
+@@ -632,7 +632,7 @@
+ 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;
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d530221
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+change_artwork_dir.patch
+add_interval_option.patch
+build_without_manpage.patch
+set_remain_to_zero.patch
+remove_extra_arg.patch
+add_parentheses.patch
+add_debugging_comments.patch
diff --git a/debian/patches/set_remain_to_zero.patch b/debian/patches/set_remain_to_zero.patch
new file mode 100644
index 0000000..71fac97
--- /dev/null
+++ b/debian/patches/set_remain_to_zero.patch
@@ -0,0 +1,21 @@
+Description: Set remain variable to zero.
+ This avoids an possible undeclared variable error five lines later if remain
+ is never set:
+ "if(remain<2250)"
+
+ Patch created for some version between 1.0beta1-5 and and 1.0beta1-8.
+ Converted to quilt for 1.0beta-12.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-07-29
+
+--- a/wmcdplay.cc
++++ b/wmcdplay.cc
+@@ -485,7 +485,7 @@
+ 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)
--
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