[Pkg-wmaker-commits] [wmsun] 44/73: debian/patches: Remove directory; patches applied upstream.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Aug 28 12:04:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmsun.
commit 799fddca1cd801bbc1f93d7ba066a7a11f989a42
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sun Jun 14 20:39:30 2015 -0500
debian/patches: Remove directory; patches applied upstream.
---
debian/patches/01_all_previous_diff.diff | 182 ---------------------
.../patches/02_fix_hyphen-used-as-minus-sign.diff | 48 ------
debian/patches/03_add_upstream_changelog.diff | 69 --------
debian/patches/series | 3 -
4 files changed, 302 deletions(-)
diff --git a/debian/patches/01_all_previous_diff.diff b/debian/patches/01_all_previous_diff.diff
deleted file mode 100644
index b4758e1..0000000
--- a/debian/patches/01_all_previous_diff.diff
+++ /dev/null
@@ -1,182 +0,0 @@
-Description: This is all previous diff
-=========================================================================
-diff -ur wmSun-1.03_orig/wmSun/Makefile wmsun-1.03_debian/wmSun/Makefile
---- wmSun-1.03_orig/wmSun/Makefile 1999-01-06 03:28:39.000000000 +0100
-+++ wmsun-1.03_debian/wmSun/Makefile 2009-11-02 11:27:31.000000000 +0100
-@@ -1,5 +1,5 @@
- CC = gcc
--CFLAGS = -O2 -Wall
-+# CFLAGS = -O2 -Wall
- INCDIR = -I/usr/X11R6/include/X11
- DESTDIR= /usr/X11R6
- LIBDIR = -L/usr/X11R6/lib
-@@ -22,14 +22,14 @@
-
-
- .c.o:
-- $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-+ $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-
-
- all: wmSun.o wmSun
-
- wmSun.o: wmSun_master.xpm wmSun_mask.xbm
- wmSun: $(OBJS)
-- $(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+ $(CC) $(CFLAGS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
-
- clean:
- for i in $(OBJS) ; do \
-@@ -38,6 +38,6 @@
- rm -f wmSun
-
- install:: wmSun
-- install -s -m 0755 wmSun $(DESTDIR)/bin
-- install -m 0644 wmSun.1 $(DESTDIR)/man/man1
-+ install -D -m 0755 wmSun $(DESTDIR)/usr/bin/wmSun
-+ install -D -m 0644 wmSun.1 $(DESTDIR)/usr/share/man/man1/wmSun.1
-
-diff -ur wmSun-1.03_orig/wmSun/SunRise.c wmsun-1.03_debian/wmSun/SunRise.c
---- wmSun-1.03_orig/wmSun/SunRise.c 1999-01-05 23:39:06.000000000 +0100
-+++ wmsun-1.03_debian/wmSun/SunRise.c 2009-11-02 11:27:31.000000000 +0100
-@@ -10,8 +10,9 @@
- double sinEPS = 0.39778;
- double P2 = 6.283185307;
-
-+int Interp(double, double, double, double*, double*, double*, double*, int*);
-
--SunRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){
-+void SunRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){
-
- double UT, ym, y0, yp, SinH0;
- double xe, ye, z1, z2, SinH(), hour24();
-@@ -80,7 +81,7 @@
- }
-
-
--UTTohhmm(double UT, int *h, int *m){
-+void UTTohhmm(double UT, int *h, int *m){
-
-
- if (UT < 0.0) {
-@@ -98,7 +99,7 @@
-
-
-
--Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
-+int Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
-
- double a, b, c, d, dx;
-
-@@ -129,8 +130,8 @@
-
- double SinH(int year, int month, int day, double UT){
-
-- double TU0, TU, TU2, TU3, LambdaMoon, BetaMoon, R, AGE, frac(), jd();
-- double RA_Sun, DEC_Sun, T0, gmst, lmst, Tau, epsilon;
-+ double TU0, TU, TU2, TU3, frac(), jd();
-+ double RA_Sun, DEC_Sun, gmst, lmst, Tau;
- double M, DL, L, SL, X, Y, Z, RHO;
-
-
-@@ -176,7 +177,7 @@
- int ny, nm, nd;
- double UT;
- {
-- double A, B, C, D, JD, MJD, day;
-+ double A, B, C, D, JD, day;
-
- day = nd + UT/24.0;
-
-diff -ur wmSun-1.03_orig/wmSun/wmSun.c wmsun-1.03_debian/wmSun/wmSun.c
---- wmSun-1.03_orig/wmSun/wmSun.c 1999-02-04 18:43:09.000000000 +0100
-+++ wmsun-1.03_debian/wmSun/wmSun.c 2009-11-02 11:27:31.000000000 +0100
-@@ -86,7 +86,7 @@
- /*
- * Delay between refreshes (in microseconds)
- */
--#define DELAY 10000L
-+#define DELAY 1000000L
- #define WMSUN_VERSION "1.03"
-
- #define DegPerRad 57.29577951308232087680
-@@ -95,6 +95,7 @@
-
-
-
-+void SunRise(int, int, int, double, double*, double*);
-
- void ParseCMDLine(int argc, char *argv[]);
- void pressEvent(XButtonEvent *xev);
-@@ -125,14 +126,14 @@
-
- struct tm *GMTTime, *LocalTime;
- XEvent event;
-- int i, n, k, j, ImageNumber;
-- int Year, Month, DayOfWeek, OldLocalDayOfMonth;
-+ int n;
-+ int Year, Month, OldLocalDayOfMonth;
- int LocalDayOfMonth, DayOfMonth;
-- int Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
- long CurrentLocalTime, CurrentGMTTime, date;
-- double UT, val, RA, DEC, LTRise, LTSet, LocalHour, hour24();
-- int D, H, M, S, sgn, A, B, q;
-- char str[10];
-+ double UT, val, LTRise, LTSet, LocalHour, hour24();
-+ int H, M;
-+ struct timeval timeout;
-+ fd_set xfdset;
-
-
-
-@@ -179,7 +180,7 @@
- if (n>nMAX){
-
- n = 0;
-- nMAX = 1000;
-+ nMAX = 60;
-
-
- CurrentGMTTime = time(CurrentTime); GMTTime = gmtime(&CurrentGMTTime);
-@@ -193,7 +194,8 @@
- CurrentLocalTime = CurrentGMTTime; LocalTime = localtime(&CurrentLocalTime);
- LocalDayOfMonth = LocalTime->tm_mday;
-
-- if ((OldLocalDayOfMonth != LocalDayOfMonth)||(Flag)){
-+// Redraw always to catch e.g. DST changes (M. Stigge, 2008-04-10)
-+// if ((OldLocalDayOfMonth != LocalDayOfMonth)||(Flag)){
-
- Flag = 0;
-
-@@ -250,7 +252,7 @@
- copyXPMArea(10, 84, 28, 7, 19, 40);
- }
-
-- }
-+// }
-
- OldLocalDayOfMonth = LocalDayOfMonth;
-
-@@ -267,6 +269,11 @@
-
-
-
-+ /*
-+ * Add X display to file descriptor set for polling.
-+ */
-+ FD_ZERO(&xfdset);
-+ FD_SET(ConnectionNumber(display), &xfdset);
-
-
-
-@@ -297,7 +304,9 @@
- * Redraw and wait for next update
- */
- RedrawWindow();
-- usleep(DELAY);
-+ timeout.tv_sec = DELAY / 1000000L;
-+ timeout.tv_usec = DELAY % 1000000L;
-+ select(ConnectionNumber(display) + 1, &xfdset, NULL, NULL, &timeout);
-
-
- }
diff --git a/debian/patches/02_fix_hyphen-used-as-minus-sign.diff b/debian/patches/02_fix_hyphen-used-as-minus-sign.diff
deleted file mode 100644
index 344538c..0000000
--- a/debian/patches/02_fix_hyphen-used-as-minus-sign.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: fix hyphen-used-as-minus-sign
-Author: Denis Briand <denis at narcan.fr>
-Index: wmSun-1.03/wmSun/wmSun.1
-===================================================================
---- wmSun-1.03.orig/wmSun/wmSun.1 2009-11-02 15:46:20.000000000 +0100
-+++ wmSun-1.03/wmSun/wmSun.1 2009-11-02 15:47:03.000000000 +0100
-@@ -3,7 +3,7 @@
- WMSUN \- Dockable WindowMaker SunRise/SunSet App
- .SH SYNOPSIS
- .B wmSun
--[-h] [-display <Display>] [-lat <Latitude>] [-lon <Longitude>] [-td <TimeDiff>] [-date <yyyymmdd>]
-+[\-h] [\-display <Display>] [\-lat <Latitude>] [\-lon <Longitude>] [\-td <TimeDiff>] [\-date <yyyymmdd>]
- .SH DESCRIPTION
- .PP
- wmSun displays the current day's Sun Rise and Set Times. You must enter your
-@@ -11,7 +11,7 @@
- .SH OPTIONS
- .TP
- .B \-h
--Display list of command-line options.
-+Display list of command\-line options.
- .TP
- .B \-display <display>
- Use an alternate X Display.
-@@ -22,7 +22,7 @@
- .B \-lon <Longitude>
- Set longitude of observer.
- .TP
--.B \-td <UT - LT>
-+.B \-td <UT \- LT>
- Set the difference beteeen UT and LT. Useful when you want to show the
- Sunrise/Sunset at a remote lat/lon without resetting your clock.
- .TP
-@@ -30,11 +30,11 @@
- Set the date to show sunrise/sunset for.
- .SH EXAMPLES
- .TP
--.B wmSun -lon 106.3 -lat 35.9
-+.B wmSun \-lon 106.3 \-lat 35.9
- this would display rise/set times at Los Alamos in local time.
- .TP
--.B wmSun -lat 19.58 -lon 155.92 -td 10
--this would display rise/set times in Kona, Hawaii in local time (in winter -- you need to
-+.B wmSun \-lat 19.58 \-lon 155.92 \-td 10
-+this would display rise/set times in Kona, Hawaii in local time (in winter \-\- you need to
- take into account daylight savings at other times of the year).
- .SH BUGS
- Who knows? (Let me know if you find any).
diff --git a/debian/patches/03_add_upstream_changelog.diff b/debian/patches/03_add_upstream_changelog.diff
deleted file mode 100644
index c30242e..0000000
--- a/debian/patches/03_add_upstream_changelog.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Add upstream changelog
-===================================================================
-diff -urN wmSun-1.03.orig/changelog wmSun-1.03/changelog
---- wmSun-1.03.orig/changelog 1970-01-01 01:00:00.000000000 +0100
-+++ wmSun-1.03/changelog 2009-11-02 11:30:01.000000000 +0100
-@@ -0,0 +1,63 @@
-+/*
-+ *
-+ * wmSun-1.03 (C) 1999 Mike Henderson (mghenderson at lanl.gov)
-+ *
-+ * - Shows Sun Rise/Set Times....
-+ *
-+ *
-+ *
-+ *
-+ *
-+ * 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, 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.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program (see the file COPYING); if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA
-+ *
-+ * Things TODO:
-+ * - clean up code!
-+ * - support for 8-bit displays.
-+ * - more detailed documentation.
-+ * - eclipses?
-+ * - add buttons to play will date and lat lon...
-+ * Could be something like this;
-+ * First click brings up buttons to change date.
-+ * Second click brings up buttons to change lat/lon.
-+ * Third goes back to display
-+ * Set time delay to go back to display if user doesnt do it...
-+ *
-+ *
-+ *
-+ *
-+ *
-+ * Changes:
-+ *
-+ * Version 1.03 - released February 4, 1999.
-+ * cosmetic for AfterStep users. removed spurious black line at RHS edge an mask.
-+ *
-+ *
-+ * Version 1.02 - released January 12, 1999.
-+ * Added support for User-specified date and Time difference so that
-+ * you can have the display be correct in local time even for remote
-+ * lat/lons. (I am in Hawaii right now. I dont want to reset the time on
-+ * my laptop, so with these new options I can still get the correct
-+ * local times of rise/set. Sunset is awesome here in Kona!!! And the calcs
-+ * seem to be quite good -- it's a good test here because the Sun sets over
-+ * the Pacific (no mountains are in the way)).
-+ *
-+ * Version 1.01 - released January 6, 1999.
-+ * Fixed stupid bug in Date change montior.
-+ *
-+ * Version 1.0 - released January 5, 1999.
-+ *
-+ *
-+ */
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e9f9876..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01_all_previous_diff.diff
-02_fix_hyphen-used-as-minus-sign.diff
-03_add_upstream_changelog.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmsun.git
More information about the Pkg-wmaker-commits
mailing list