[Pkg-wmaker-commits] [wmsun] 17/73: Imported Debian patch 1.03+1-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Aug 28 12:04:43 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 8f7613f606343555aefce58e14a83fae9ef9bdd7
Merge: d0cf9f4 cfa9938
Author: Denis Briand <denis at narcan.fr>
Date: Mon Nov 2 11:46:30 2009 +0100
Imported Debian patch 1.03+1-1
debian/README.source | 58 +++++++
debian/changelog | 22 ++-
debian/changelog.upstream | 63 -------
debian/compat | 1 +
debian/control | 6 +-
debian/copyright | 2 +-
debian/menu | 2 +-
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 +
debian/postinst | 1 +
debian/postrm | 1 +
debian/rules | 76 ++++-----
debian/watch | 2 +
debian/wmsun.install | 1 +
wmSun/Makefile | 10 +-
wmSun/SunRise.c | 13 +-
wmSun/SunRise.o | Bin 5000 -> 0 bytes
wmSun/wmSun | Bin 43745 -> 0 bytes
wmSun/wmSun.c | 31 ++--
wmSun/wmSun.o | Bin 33044 -> 0 bytes
wmgeneral/wmgeneral.o | Bin 7324 -> 0 bytes
23 files changed, 448 insertions(+), 143 deletions(-)
diff --cc debian/README.source
index 0000000,0000000..5dde0bf
new file mode 100644
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,58 @@@
++This package uses quilt to manage all modifications to the upstream
++source. Changes are stored in the source package as diffs in
++debian/patches and applied during the build.
++
++To configure quilt to use debian/patches instead of patches, you want
++either to export QUILT_PATCHES=debian/patches in your environment
++or use this snippet in your ~/.quiltrc:
++
++ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
++ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
++ export QUILT_PATCHES=debian/patches
++ break
++ fi
++ done
++
++To get the fully patched source after unpacking the source package, cd to
++the root level of the source package and run:
++
++ quilt push -a
++
++The last patch listed in debian/patches/series will become the current
++patch.
++
++To add a new set of changes, first run quilt push -a, and then run:
++
++ quilt new <patch>
++
++where <patch> is a descriptive name for the patch, used as the filename in
++debian/patches. Then, for every file that will be modified by this patch,
++run:
++
++ quilt add <file>
++
++before editing those files. You must tell quilt with quilt add what files
++will be part of the patch before making changes or quilt will not work
++properly. After editing the files, run:
++
++ quilt refresh
++
++to save the results as a patch.
++
++Alternately, if you already have an external patch and you just want to
++add it to the build system, run quilt push -a and then:
++
++ quilt import -P <patch> /path/to/patch
++ quilt push -a
++
++(add -p 0 to quilt import if needed). <patch> as above is the filename to
++use in debian/patches. The last quilt push -a will apply the patch to
++make sure it works properly.
++
++To remove an existing patch from the list of patches that will be applied,
++run:
++
++ quilt delete <patch>
++
++You may need to run quilt pop -a to unapply patches first before running
++this command.
diff --cc debian/changelog
index 0919930,0000000..b219d47
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,231 -1,0 +1,251 @@@
++wmsun (1.03+1-1) unstable; urgency=low
++
++ * Use a clean upstream sources tarball.
++ * Use quilt patch system.
++ * Bump standards version to 3.8.3.
++ * Remove Martin A. Godisch from uploaders field
++ Thanks to him to have sponsored wmmoonclock.
++ * Allow Debian Maintainers upload.
++ * Use debhelper (>= 7).
++ * Add compat file.
++ * Add watch file.
++ * Add README.source file.
++ * Fix copyright-refers-to-symlink-license lintian tag.
++ * Fix hyphen-used-as-minus-sign lintian tag into man file.
++ * Remove debian/changelog.upstream and use patch to add it in the sources
++ * Use symlink `wmsun' into debian/menu than `wmSun' binary file name.
++ * Add #DEBHELPER# into postinst and postrm files.
++
++ -- Denis Briand <denis at narcan.fr> Mon, 02 Nov 2009 11:46:30 +0100
++
+wmsun (1.03-29) unstable; urgency=low
+
- * Add Co-maintainer Martin A. Godisch
++ * Add Co-maintainer Martin A. Godisch
+ * Updated standards version to 3.8.1
+
+ -- Denis Briand <denis at narcan.fr> Fri, 10 Apr 2009 18:00:50 +0200
+
+wmsun (1.03-28) unstable; urgency=low
+
+ * New maintainer, closes: #455543.
+
+ -- Denis Briand <denis at narcan.fr> Sun, 08 Mar 2009 15:24:21 +0100
+
+wmsun (1.03-27) unstable; urgency=low
+
+ * Applied patch for DST changes, closes: #414489.
+ Thanks to Martin Stigge.
+ * Removed db_purge in postrm, closes: #502521.
+ Thanks to Cesare Tirabassi.
+ * Fixed copyright file.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 26 Oct 2008 10:03:16 +0100
+
+wmsun (1.03-26) unstable; urgency=low
+
+ * Enhanced display refresh rate, closes: #446681.
+ Thanks to Peter Colberg.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Sat, 02 Feb 2008 17:57:36 +0100
+
+wmsun (1.03-25) unstable; urgency=low
+
+ * Fixed clean target, closes: #445622.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 07 Oct 2007 12:41:45 +0200
+
+wmsun (1.03-24) unstable; urgency=low
+
+ * Changed display refresh rate to 100 ms, see: #440406.
+ * Updated menu section.
+ * Fixed distclean target.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 07 Oct 2007 09:28:40 +0200
+
+wmsun (1.03-23) unstable; urgency=low
+
+ * Removed debconf, added README.Debian, closes: #413517.
+ * Fixed timestamps.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 25 Mar 2007 10:40:34 +0200
+
+wmsun (1.03-22) unstable; urgency=low
+
+ * Updated Japanese translation file, closes: #405776.
+ Thanks to Hideki Yamane.
+
+ -- Martin A. Godisch <godisch at debian.org> Wed, 10 Jan 2007 19:26:12 +0100
+
+wmsun (1.03-21) unstable; urgency=low
+
+ * Updated control file.
+ * Updated French translation file, closes: #402672.
+ Thanks to Christian Perrier.
+ * Updated Czech localization file, closes: #404382.
+ Thanks to Miroslav Kure.
+
+ -- Martin A. Godisch <godisch at debian.org> Tue, 09 Jan 2007 18:43:20 +0100
+
+wmsun (1.03-20) unstable; urgency=low
+
+ * Fixed debconf spelling.
+ * Updated German debconf translation.
+ * Updated control file.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 10 Dec 2006 10:04:48 +0100
+
+wmsun (1.03-19) unstable; urgency=low
+
+ * Fixed longitude/latitude information URL, closes: #401872.
+ Thanks to Jacopo.
+ * Updated German debconf translation.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 10 Dec 2006 09:23:55 +0100
+
+wmsun (1.03-18) unstable; urgency=low
+
+ * Updated build-dependencies according to xlibs-dev transition.
+
+ -- Martin A. Godisch <godisch at debian.org> Wed, 30 Nov 2005 19:07:25 +0100
+
+wmsun (1.03-17) unstable; urgency=low
+
+ * Added Vietnamese debconf translation, closes: #324132.
+ Thanks to Clytie Siddall.
+ * Added Swedish debconf translation, closes: #331190.
+ Thanks to Daniel Nylander.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Wed, 05 Oct 2005 19:43:35 +0200
+
+wmsun (1.03-16) unstable; urgency=low
+
+ * Added Czech debconf translation, closes: #294734.
+ Thanks to Miroslav Kure.
+ * Fixed POSIX compliance of debian/rules.
+ * Removed watch file, upstream homepage is gone.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 11 Feb 2005 22:18:05 +0100
+
+wmsun (1.03-15) unstable; urgency=low
+
+ * Added Japanese debconf translation, closes: #236819.
+ Thanks to Hideki Yamane.
+ * Removed ucf/debconf and lintian workarounds.
+ * Updated debian/menu, debian/rules, and standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Mon, 08 Mar 2004 16:41:45 +0100
+
+wmsun (1.03-14) unstable; urgency=low
+
+ * Simplified ucf handling, see bug #199233, adjusted ucf dependency,
+ closes: #201574.
+ * Added Spanish debconf translation, closes: #201902.
+ Thanks to Carlos Alberto Martín Edo.
+ * Removed useless BUGS file.
+ * Converted debian/changelog to UTF-8.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 27 Jul 2003 15:56:32 +0200
+
+wmsun (1.03-13) unstable; urgency=low
+
+ * Improved ucf transition.
+
+ -- Martin A. Godisch <godisch at debian.org> Sun, 29 Jun 2003 10:24:00 +0200
+
+wmsun (1.03-12) unstable; urgency=low
+
+ * Updated deb'configuration, added ucf support.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 27 Jun 2003 07:11:55 +0200
+
+wmsun (1.03-11) unstable; urgency=low
+
+ * Updated deb'configuration.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 30 May 2003 18:38:35 +0200
+
+wmsun (1.03-10) unstable; urgency=low
+
+ * Added french debconf translation, closes: #189225.
+ Thanks to Christian Perrier.
+ * Updated configuration.
+
+ -- Martin A. Godisch <godisch at debian.org> Wed, 16 Apr 2003 09:52:25 +0200
+
+wmsun (1.03-9) unstable; urgency=low
+
+ * Added portuguese debconf translation, closes: #185684.
+ Thanks to André Luís Lopes.
+ * Improved debconf template, see #185710.
+
+ -- Martin A. Godisch <godisch at debian.org> Sat, 22 Mar 2003 07:33:40 +0100
+
+wmsun (1.03-8) unstable; urgency=low
+
+ * Transition to po-debconf, updated build-dependencies.
+ * Fixed package description.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 14 Mar 2003 08:09:42 +0100
+
+wmsun (1.03-7) unstable; urgency=low
+
+ * Made debian/config asking wmmoonclock for default values.
+ * Fixed update-menus in debian/postinst and debian/postrm.
+ * Added upstream changelog.
+ * Added upstream homepage to package description.
+
+ -- Martin A. Godisch <godisch at debian.org> Sat, 01 Mar 2003 09:54:54 +0100
+
+wmsun (1.03-6) unstable; urgency=low
+
+ * Fixed Makefile and compiler warnings.
+ * Added Lintian override about menu file not in DEBIAN/md5sums,
+ because it is debconf'igured.
+ * Simplified debian/config.
+ * Removed build-dependency on debhelper.
+ * Updated maintainer email address.
+
+ -- Martin A. Godisch <godisch at debian.org> Fri, 21 Feb 2003 20:22:10 +0100
+
+wmsun (1.03-5) unstable; urgency=low
+
+ * Fixed handling of menu file (closes: #161745).
+ * Updated Debian standards version.
+
+ -- Martin A. Godisch <godisch at tcs.inf.tu-dresden.de> Sat, 21 Sep 2002 15:41:40 +0200
+
+wmsun (1.03-4) unstable; urgency=low
+
+ * Added symbolic links "wmsun -> wmSun" and "wmsun.1.gz -> wmSun.1.gz"
+ (closes: #149923).
+ * Added Spanish debconf translation.
+ Thanks to Ricardo Javier Cardenes <ricardo at conysis.com>.
+ * Added debian/watch.
+
+ -- Martin A. Godisch <godisch at tcs.inf.tu-dresden.de> Fri, 30 Aug 2002 18:49:06 +0200
+
+wmsun (1.03-3) unstable; urgency=low
+
+ * Moved files from /usr/X11R6 to /usr.
+ * Updated standards version.
+
+ -- Martin A. Godisch <godisch at tcs.inf.tu-dresden.de> Mon, 4 Mar 2002 02:15:09 +0100
+
+wmsun (1.03-2) unstable; urgency=low
+
+ * Fixed architecture in debian/control.
+
+ -- Martin A. Godisch <godisch at tcs.inf.tu-dresden.de> Sun, 3 Mar 2002 07:51:51 +0100
+
+wmsun (1.03-1) unstable; urgency=low
+
+ * Initial release (closes: #136355).
+
+ -- Martin A. Godisch <godisch at tcs.inf.tu-dresden.de> Fri, 1 Mar 2002 21:53:26 +0100
+
diff --cc debian/compat
index 0000000,0000000..7f8f011
new file mode 100644
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++7
diff --cc debian/control
index d714e3a,0000000..a4d6a7e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,17 @@@
+Source: wmsun
+Section: x11
+Priority: optional
+Maintainer: Denis Briand <denis at narcan.fr>
- Uploaders: Martin A. Godisch <godisch at debian.org>
- Build-Depends: libx11-dev, libxext-dev, libxpm-dev
- Standards-Version: 3.8.1
++DM-Upload-Allowed: yes
++Build-Depends: libx11-dev, libxext-dev, libxpm-dev, quilt (>= 0.46-7~), debhelper (>= 7)
++Standards-Version: 3.8.3
+
+Package: wmsun
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: wmmoonclock, wmaker | afterstep
+Description: Dockable WindowMaker SunRise/SunSet App
+ wmSun displays the current day's Sun Rise and Set Times. You have to
+ enter your Latitude and Longitude for it to work correctly. wmSun is
+ designed to work with the WindowMaker dock, but will work with other
+ window managers as well.
diff --cc debian/copyright
index 6f55b6d,0000000..5b0736b
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,24 -1,0 +1,24 @@@
+This package was originally debianized by Martin A. Godisch <godisch at debian.org>
+New maintainer is Denis Briand <denis at narcan.fr>
+
+It was downloaded from
+http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml.
+
+Copyright (c) 1999 Michael G. Henderson <mghenderson at lanl.gov>
+
+ 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.
+
+ 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.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
++License can be found in /usr/share/common-licenses/GPL-2.
diff --cc debian/menu
index de47a57,0000000..94a0af1
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,2 -1,0 +1,2 @@@
+?package(wmsun):needs="X11" section="Applications/Science/Geoscience" \
- title="wmSun" command="/usr/bin/wmSun"
++ title="wmSun" command="/usr/bin/wmsun"
diff --cc debian/patches/01_all_previous_diff.diff
index 0000000,0000000..b4758e1
new file mode 100644
--- /dev/null
+++ b/debian/patches/01_all_previous_diff.diff
@@@ -1,0 -1,0 +1,182 @@@
++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 --cc debian/patches/02_fix_hyphen-used-as-minus-sign.diff
index 0000000,0000000..344538c
new file mode 100644
--- /dev/null
+++ b/debian/patches/02_fix_hyphen-used-as-minus-sign.diff
@@@ -1,0 -1,0 +1,48 @@@
++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 --cc debian/patches/03_add_upstream_changelog.diff
index 0000000,0000000..c30242e
new file mode 100644
--- /dev/null
+++ b/debian/patches/03_add_upstream_changelog.diff
@@@ -1,0 -1,0 +1,69 @@@
++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 --cc debian/patches/series
index 0000000,0000000..e9f9876
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++01_all_previous_diff.diff
++02_fix_hyphen-used-as-minus-sign.diff
++03_add_upstream_changelog.diff
diff --cc debian/postinst
index 70fed3c,0000000..e320b38
mode 100644,000000..100644
--- a/debian/postinst
+++ b/debian/postinst
@@@ -1,9 -1,0 +1,10 @@@
+#!/bin/sh
++#DEBHELPER#
+
+set -e
+
+if [ "$1" = configure ] && [ -x /usr/bin/update-menus ]; then
+ update-menus
+fi
+
+exit 0
diff --cc debian/postrm
index d8606e3,0000000..6faac76
mode 100644,000000..100644
--- a/debian/postrm
+++ b/debian/postrm
@@@ -1,16 -1,0 +1,17 @@@
+#!/bin/sh
++#DEBHELPER#
+
+set -e
+
+if [ "$1" = purge ]; then
+ if [ -x /usr/bin/ucf ]; then
+ ucf --purge /etc/menu/wmsun
+ fi
+ rm -f /etc/menu/wmsun /etc/menu/wmsun.*
+fi
+
+if [ -x /usr/bin/update-menus ]; then
+ update-menus
+fi
+
+exit 0
diff --cc debian/rules
index c06de0a,0000000..7e85a25
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,63 -1,0 +1,55 @@@
+#!/usr/bin/make -f
+
- BUILDDIR = debian/wmsun
- DEBDIR = $(BUILDDIR)/DEBIAN
- DOCDIR = $(BUILDDIR)/usr/share/doc/wmsun
- testdir = test -f wmSun/wmSun.c && test -f debian/rules
- testroot = test x`whoami` = xroot
-
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+export CFLAGS
+
- clean:
- $(testdir)
- -rm -f build debian/files debian/substvars
++clean: unpatch
++ dh_testdir
+ [ ! -f wmSun/Makefile ] || $(MAKE) -C wmSun clean
- -rm -rf debian/wmsun
++ dh_clean
++ rm -f build-stamp
++
++patch: patch-stamp
++patch-stamp:
++ dh_quilt_patch
++ touch patch-stamp
++
++unpatch:
++ dh_quilt_unpatch
+
- build:
- $(testdir)
++build: build-stamp
++build-stamp: patch
++ dh_testdir
+ $(MAKE) -C wmSun
- touch build
++ touch build-stamp
+
+binary: binary-arch
+
+binary-indep:
+
+binary-arch: build
- $(testdir)
- $(testroot)
- rm -rf debian/wmsun
-
- $(MAKE) -C wmSun install DESTDIR=$(CURDIR)/debian/wmsun
- ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- strip -R .comment -R .note $(BUILDDIR)/usr/bin/wmSun
- endif
- gzip -9 $(BUILDDIR)/usr/share/man/man1/wmSun.1
- ln -s wmSun $(BUILDDIR)/usr/bin/wmsun
- ln -s wmSun.1.gz $(BUILDDIR)/usr/share/man/man1/wmsun.1.gz
- install -D -p -m 0644 debian/menu $(BUILDDIR)/usr/share/menu/wmsun
-
- install -D -p -m 0644 debian/changelog $(DOCDIR)/changelog.Debian
- install -D -p -m 0644 debian/changelog.upstream $(DOCDIR)/changelog
- install -p -m 0644 TODO debian/copyright debian/README.Debian $(DOCDIR)
- gzip -9 $(DOCDIR)/changelog*
-
- install -d -p -m 0755 $(DEBDIR)
- install -p -m 0644 debian/control $(DEBDIR)
- install -p -m 0755 debian/postinst debian/postrm $(DEBDIR)
- cd $(BUILDDIR) && find usr -type f -print0 | xargs -0 md5sum > DEBIAN/md5sums
- chmod 0644 $(DEBDIR)/md5sums
-
- dpkg-shlibdeps $(BUILDDIR)/usr/bin/wmSun
- dpkg-gencontrol -isp -pwmsun -P$(BUILDDIR)
- chown -R root:root $(BUILDDIR)
- chmod -R go=u-w $(BUILDDIR)
- dpkg --build $(BUILDDIR) ..
++ dh_testdir
++ dh_testroot
++ dh_prep
++ dh_install
++ dh_installdocs TODO changelog
++ dh_installman wmSun/wmSun.1
++ dh_installchangelogs
++ dh_installmenu
++ dh_link usr/bin/wmSun usr/bin/wmsun
++ dh_link usr/share/man/man1/wmSun.1.gz usr/share/man/man1/wmsun.1.gz
++ dh_strip
++ dh_compress
++ dh_fixperms
++ dh_installdeb
++ dh_shlibdeps
++ dh_gencontrol
++ dh_md5sums
++ dh_builddeb
+
+.PHONY: clean binary-indep binary-arch binary
diff --cc debian/watch
index 0000000,0000000..3fa062f
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=3
++#there is no upstream repository
diff --cc debian/wmsun.install
index 0000000,0000000..f628948
new file mode 100644
--- /dev/null
+++ b/debian/wmsun.install
@@@ -1,0 -1,0 +1,1 @@@
++wmSun/wmSun usr/bin/
--
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