[hamradio-commits] [wwl] 05/11: Change source format to 3.0 (quilt)
Iain Learmonth
irl-guest at moszumanska.debian.org
Mon Aug 10 22:33:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository wwl.
commit c19892fb135065bf4d9466aafe3c732717b2d18c
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Mon Aug 10 22:28:20 2015 +0100
Change source format to 3.0 (quilt)
---
.gitignore | 1 +
debian/changelog | 9 +++--
debian/patches/remove-locator.patch | 70 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/source/format | 1 +
wwl.1 | 24 ++++++++++++-
wwl.c | 14 ++++++--
7 files changed, 114 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index c63faee..64d39ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,8 @@ wwl (1.3+db-2) UNRELEASED; urgency=medium
* Team upload.
* Acknowledge NMU.
- * debian/compat:
- - Bump compat level to 9
+ * Bump compat level to 9
+ * Source format changed to "3.0 (quilt)"
* debian/control:
- Bump standards version to 3.9.6
- Change debhelper version to >= 9
@@ -14,7 +14,10 @@ wwl (1.3+db-2) UNRELEASED; urgency=medium
* Patrick Ouellette (never uploaded)
* Hamish Moffatt (by request)
- Added myself to uploaders
-
+ * debian/patches/remove-locator.patch:
+ - Import the old changes into a quilt patch
+ - Update the patch to print version 1.3 instead of version 1.0
+
-- Iain R. Learmonth <irl at fsfe.org> Mon, 10 Aug 2015 22:02:24 +0100
wwl (1.3+db-1.1) unstable; urgency=low
diff --git a/debian/patches/remove-locator.patch b/debian/patches/remove-locator.patch
new file mode 100644
index 0000000..4e85a0c
--- /dev/null
+++ b/debian/patches/remove-locator.patch
@@ -0,0 +1,70 @@
+Description: Remove references to the "locator" symlink which is not installed.
+Last-Update: 2015-08-10
+
+--- wwl.orig/wwl.1
++++ wwl/wwl.1
+@@ -18,32 +18,10 @@
+ wwl jo55 ec41
+ .br
+ qrb: 15996 kilometers, azimuth: 216 degrees
+-.Pp
+-locator FN25di
+-.br
+-Locator : FN25DI
+-.br
+-Coordinates: Long: (W) -75.75 Lat : (N) 45.3333
+-.Pp
+-locator jo55ei
+-.br
+-Locator : JO55EI
+-.br
+-Coordinates: Long: (E) 10.33 Lat : (N) 55.3333
+-.Pp
+-locator ec41
+-.br
+-Locator : EC41AA
+-.br
+-Coordinates: Long: (W) -92.00 Lat : (S) -69.0000
+ .Sh HISTORY
+ .Pp
+ wwl, Originally by IK0ZSN Mirko Caserta <ik0zsn at amsat.org>
+ .Pp
+-locator, originally written by Harald M.
+-Stauss harald.stauss at web.de DO1JHS @ DB0GR.#BLN.DEU.EU
+-.Pp
+-There is no code from the original (dead?) version of wwl or
+-the original (dead?) version of locator in this version.
++There is no code from the original (dead?) version of wwl.
+ .Sh AUTHORS
+ Diane Bruce (VA3DB) db at db.net
+--- wwl.orig/wwl.c
++++ wwl/wwl.c
+@@ -66,26 +66,16 @@
+ char my_wwl[SCRATCH_WWL_LEN], dx_wwl[SCRATCH_WWL_LEN];
+
+ if (argc < 2) {
+- printf("wwl/locator by va3db 1.0\n");
+- printf("wwl home_locator dx_locator or\n");
+- printf("locator locator\n");
++ printf("wwl by va3db 1.3\n");
++ printf("wwl home_locator dx_locator\n");
+ exit(EXIT_FAILURE);
+ }
+
+- if (strcmp(basename(argv[0]), "locator") == 0) {
+- locator = 1;
+- if (argc != 2) {
+- fprintf(stderr,
+- "Usage: locator wwl\n");
+- exit(EXIT_FAILURE);
+- }
+- } else {
+ if (argc != 3) {
+ fprintf(stderr,
+ "Usage: wwl home_locator dx_locator\n");
+ exit(EXIT_FAILURE);
+ }
+- }
+
+ snprintf(my_wwl, sizeof(my_wwl), "%sAA", argv[1]);
+ my_wwl[WWL_LEN] ='\0';
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..74ac258
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-locator.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/wwl.1 b/wwl.1
index a8808a5..e0718eb 100644
--- a/wwl.1
+++ b/wwl.1
@@ -18,10 +18,32 @@ qrb: 5810 kilometers, azimuth: 46 degrees
wwl jo55 ec41
.br
qrb: 15996 kilometers, azimuth: 216 degrees
+.Pp
+locator FN25di
+.br
+Locator : FN25DI
+.br
+Coordinates: Long: (W) -75.75 Lat : (N) 45.3333
+.Pp
+locator jo55ei
+.br
+Locator : JO55EI
+.br
+Coordinates: Long: (E) 10.33 Lat : (N) 55.3333
+.Pp
+locator ec41
+.br
+Locator : EC41AA
+.br
+Coordinates: Long: (W) -92.00 Lat : (S) -69.0000
.Sh HISTORY
.Pp
wwl, Originally by IK0ZSN Mirko Caserta <ik0zsn at amsat.org>
.Pp
-There is no code from the original (dead?) version of wwl.
+locator, originally written by Harald M.
+Stauss harald.stauss at web.de DO1JHS @ DB0GR.#BLN.DEU.EU
+.Pp
+There is no code from the original (dead?) version of wwl or
+the original (dead?) version of locator in this version.
.Sh AUTHORS
Diane Bruce (VA3DB) db at db.net
diff --git a/wwl.c b/wwl.c
index 5a2fec5..c91b78c 100644
--- a/wwl.c
+++ b/wwl.c
@@ -66,16 +66,26 @@ main (int argc, char **argv)
char my_wwl[SCRATCH_WWL_LEN], dx_wwl[SCRATCH_WWL_LEN];
if (argc < 2) {
- printf("wwl by va3db 1.0\n");
- printf("wwl home_locator dx_locator\n");
+ printf("wwl/locator by va3db 1.0\n");
+ printf("wwl home_locator dx_locator or\n");
+ printf("locator locator\n");
exit(EXIT_FAILURE);
}
+ if (strcmp(basename(argv[0]), "locator") == 0) {
+ locator = 1;
+ if (argc != 2) {
+ fprintf(stderr,
+ "Usage: locator wwl\n");
+ exit(EXIT_FAILURE);
+ }
+ } else {
if (argc != 3) {
fprintf(stderr,
"Usage: wwl home_locator dx_locator\n");
exit(EXIT_FAILURE);
}
+ }
snprintf(my_wwl, sizeof(my_wwl), "%sAA", argv[1]);
my_wwl[WWL_LEN] ='\0';
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/wwl.git
More information about the pkg-hamradio-commits
mailing list