diff -Nru wmsun-1.05/BUGS wmsun-1.06/BUGS --- wmsun-1.05/BUGS 2015-08-28 11:57:39.000000000 +0000 +++ wmsun-1.06/BUGS 2021-04-12 09:22:05.000000000 +0000 @@ -1 +1 @@ -Please send bug reports to wmaker-dev@lists.windowmaker.org. +Please send bug reports to wmaker-dev@googlegroups.com. diff -Nru wmsun-1.05/ChangeLog wmsun-1.06/ChangeLog --- wmsun-1.05/ChangeLog 2015-08-28 11:57:39.000000000 +0000 +++ wmsun-1.06/ChangeLog 2021-08-28 22:24:25.000000000 +0000 @@ -1,3 +1,10 @@ +Version 1.06 - released August 28, 2021 + Update mailing list links to new Google Groups. + Update old windowmaker.org/dockapps urls to dockapps.net + Fix typo in manpage. + Move version number definition to Makefile + Add 'dist' target to Makefile to generate tarball + Version 1.05 - released August 24, 2015 wmsun uses now the new library libdockapp that includes the old wmgeneral library. diff -Nru wmsun-1.05/debian/changelog wmsun-1.06/debian/changelog --- wmsun-1.05/debian/changelog 2018-04-03 12:51:12.000000000 +0000 +++ wmsun-1.06/debian/changelog 2021-08-30 16:28:50.000000000 +0000 @@ -1,8 +1,43 @@ -wmsun (1.05-1build1) bionic; urgency=high +wmsun (1.06-1) unstable; urgency=medium - * No change rebuild to pick up -fPIE compiler default + [ Doug Torrance ] + * New upstream release. + * debian/control + - Update Maintainer email address to tracker.d.o. + - Update Vcs-* after migration to Salsa. + - Update Homepage to dockapps.net. + - Drop versioned dependency on libdockapp-dev; was >= 1:0.7.0, but + 1:0.7.2 is now in o-o-stable. + - Bump Standards-Version to 4.6.0. + - Add Rules-Requires-Root field (no). + * debian/copyright + - Update Format to https. + - Update upstream mailing list address. + - Update Source to dockapps.net. + * debian/menu + - Remove deprecated Debian menu file. + * debian/rules + - Remove out-of-date get-orig-source target. + - Export all hardening flags. + * debian/salsa-ci.yml + - Add Salsa pipeline config file. + * debian/metadata/upstream + - Add DEP-12 upstream metadata file. + * debian/watch + - Bump to version 4 format. + - Update download url to dockapps.net. - -- Balint Reczey Tue, 03 Apr 2018 12:51:12 +0000 + [ Debian Janitor ] + * Remove constraints unnecessary since stretch: + + Build-Depends: Drop versioned constraint on debhelper. + * debian/copyright: use spaces rather than tabs to start continuation lines. + * Use secure URI in Homepage field. + * Bump debhelper dependency to >= 9, since that's what is used in + debian/compat. + * Bump debhelper from deprecated 9 to 13. + * Set debhelper-compat version in Build-Depends. + + -- Doug Torrance Mon, 30 Aug 2021 12:28:50 -0400 wmsun (1.05-1) unstable; urgency=medium diff -Nru wmsun-1.05/debian/compat wmsun-1.06/debian/compat --- wmsun-1.05/debian/compat 2015-08-28 11:52:18.000000000 +0000 +++ wmsun-1.06/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru wmsun-1.05/debian/control wmsun-1.06/debian/control --- wmsun-1.05/debian/control 2018-04-03 12:51:12.000000000 +0000 +++ wmsun-1.06/debian/control 2021-08-30 16:27:19.000000000 +0000 @@ -1,18 +1,18 @@ Source: wmsun Section: x11 Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Window Maker Team +Maintainer: Debian Window Maker Team Uploaders: Doug Torrance -Build-Depends: debhelper (>= 9), - libdockapp-dev (>= 1:0.7.0), +Build-Depends: debhelper-compat (= 13), + libdockapp-dev, libx11-dev, libxext-dev, libxpm-dev -Standards-Version: 3.9.6 -Homepage: http://windowmaker.org/dockapps/?name=wmsun -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-wmaker/wmsun.git -Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmsun.git +Standards-Version: 4.6.0 +Homepage: https://www.dockapps.net/wmsun +Vcs-Browser: https://salsa.debian.org/wmaker-team/wmsun +Vcs-Git: https://salsa.debian.org/wmaker-team/wmsun.git +Rules-Requires-Root: no Package: wmsun Architecture: any diff -Nru wmsun-1.05/debian/copyright wmsun-1.06/debian/copyright --- wmsun-1.05/debian/copyright 2015-08-28 11:54:58.000000000 +0000 +++ wmsun-1.06/debian/copyright 2021-08-30 16:27:19.000000000 +0000 @@ -1,8 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: wmsun -Upstream-Contact: Window Maker Developers Team - -Source: http://windowmaker.org/dockapps/?name=wmsun +Upstream-Contact: Window Maker Developers Team +Source: https://www.dockapps.net/wmsun Files: * Copyright: 1999 Mike Henderson @@ -10,8 +9,8 @@ Files: debian/* Copyright: 2002-2008 Martin A. Godisch - 2009-2010 Denis Briand - 2015 Doug Torrance + 2009-2010 Denis Briand + 2015 Doug Torrance License: GPL-2+ License: GPL-2+ diff -Nru wmsun-1.05/debian/menu wmsun-1.06/debian/menu --- wmsun-1.05/debian/menu 2015-08-28 11:52:18.000000000 +0000 +++ wmsun-1.06/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(wmsun):needs="X11" section="Applications/Science/Geoscience" \ - title="wmSun" command="/usr/bin/wmsun" diff -Nru wmsun-1.05/debian/rules wmsun-1.06/debian/rules --- wmsun-1.05/debian/rules 2015-08-28 11:52:18.000000000 +0000 +++ wmsun-1.06/debian/rules 2021-08-30 16:27:19.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ @@ -8,10 +10,3 @@ override_dh_auto_install: dh_auto_install -- PREFIX=/usr - -get-orig-source: - uscan --verbose --force-download --no-symlink - @if test -e ../wmsun-*.download ; then \ - rename -f -v "s/wmsun-(.+)\.download/wmsun_\1\.orig\.tar\.gz/" \ - ../wmsun-*.download; \ - fi diff -Nru wmsun-1.05/debian/salsa-ci.yml wmsun-1.06/debian/salsa-ci.yml --- wmsun-1.05/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ wmsun-1.06/debian/salsa-ci.yml 2021-08-30 16:27:19.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru wmsun-1.05/debian/upstream/metadata wmsun-1.06/debian/upstream/metadata --- wmsun-1.05/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ wmsun-1.06/debian/upstream/metadata 2021-08-30 16:27:19.000000000 +0000 @@ -0,0 +1,3 @@ +Repository: https://repo.or.cz/dockapps.git +Bug-Database: https://github.com/window-maker/dockapps/issues +Bug-Submit: https://github.com/window-maker/dockapps/issues/new diff -Nru wmsun-1.05/debian/watch wmsun-1.06/debian/watch --- wmsun-1.05/debian/watch 2015-08-28 11:52:18.000000000 +0000 +++ wmsun-1.06/debian/watch 2021-08-30 16:27:19.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -http://windowmaker.org/dockapps/?name=wmsun \?download=wmsun-(.+).tar.gz +version=4 +https://www.dockapps.net/@PACKAGE@ \ +/download/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ diff -Nru wmsun-1.05/Makefile wmsun-1.06/Makefile --- wmsun-1.05/Makefile 2015-08-28 11:57:39.000000000 +0000 +++ wmsun-1.06/Makefile 2021-08-28 22:24:25.000000000 +0000 @@ -4,6 +4,7 @@ BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man/man1 INSTALL = install +WMSUN_VERSION = 1.06 # If you need to compile on a Linux, dont change anything. If # compiling for Solaris, swap the LIBS below... @@ -19,7 +20,8 @@ OBJS = wmsun.o SunRise.o .c.o: - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o + $(CC) $(CPPFLAGS) -DWMSUN_VERSION=\"$(WMSUN_VERSION)\" $(CFLAGS) -c $< \ + -o $*.o all: wmsun.o wmsun @@ -32,10 +34,16 @@ for i in $(OBJS) ; do \ rm -f $$i; \ done - rm -f wmsun + rm -f wmsun wmsun-$(WMSUN_VERSION).tar.gz install:: wmsun $(INSTALL) -d $(DESTDIR)$(BINDIR) $(INSTALL) wmsun $(DESTDIR)$(BINDIR) $(INSTALL) -d $(DESTDIR)$(MANDIR) $(INSTALL) -m 644 wmsun.1 $(DESTDIR)$(MANDIR) + +dist: BUGS COPYING ChangeLog COPYING Makefile README SunRise.c TODO wmsun.1 \ + wmsun.c wmSun_mask.xbm wmSun_master.xpm + tar -cf wmsun-$(WMSUN_VERSION).tar \ + --transform "s|^|wmsun-$(WMSUN_VERSION)/|" $^ + gzip -n wmsun-$(WMSUN_VERSION).tar diff -Nru wmsun-1.05/README wmsun-1.06/README --- wmsun-1.05/README 2015-08-28 11:57:39.000000000 +0000 +++ wmsun-1.06/README 2021-04-12 09:22:05.000000000 +0000 @@ -8,16 +8,16 @@ \|_________| ================================================================================ Dockable WindowMaker SunRise/SunSet App -http://windowmaker.org/dockapps/?name=wmsun +https://www.dockapps.net/wmsun Author: Mike Henderson -Maintainers: Window Maker Developers Team +Maintainers: Window Maker Developers Team ================================================================================ REQUIREMENTS Make sure libdockapp (at least version 0.7.0) is installed. It may be obtained at -http://windowmaker.org/dockapps/?name=libdockapp +https://www.dockapps.net/libdockapp INSTALLATION diff -Nru wmsun-1.05/wmsun.1 wmsun-1.06/wmsun.1 --- wmsun-1.05/wmsun.1 2015-08-28 11:57:39.000000000 +0000 +++ wmsun-1.06/wmsun.1 2021-08-28 22:05:13.000000000 +0000 @@ -25,7 +25,7 @@ Set longitude of observer. .TP .B \-td -Set the difference beteeen UT and LT. Useful when you want to show the +Set the difference between UT and LT. Useful when you want to show the Sunrise/Sunset at a remote lat/lon without resetting your clock. .TP .B \-12 diff -Nru wmsun-1.05/wmsun.c wmsun-1.06/wmsun.c --- wmsun-1.05/wmsun.c 2015-08-28 11:57:39.000000000 +0000 +++ wmsun-1.06/wmsun.c 2021-08-28 22:06:39.000000000 +0000 @@ -63,7 +63,6 @@ * Delay between refreshes (in microseconds) */ #define DELAY 1000000L -#define WMSUN_VERSION "1.05" #define DegPerRad 57.29577951308232087680 #define RadPerDeg 0.01745329251994329576