[hamradio-commits] [wwl] 01/01: Debian release 1.3+db-2.
Iain Learmonth
irl-guest at moszumanska.debian.org
Tue Oct 14 14:49:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository wwl.
commit ad2e56ad5b37ed7d04e00aa618a40e7d615d29ae
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Tue Oct 14 01:20:47 2014 +0100
Debian release 1.3+db-2.
* Switched to Debian Standards Version 3.9.6
* Switched source format to 3.0 (quilt)
* Switched to debhelper version 9
* Simplified debian/rules
* Imported into Debian Hamradio Maintainer's git
* Added Homepage link to debian/control
* Shortened package synopsis
* Improved description slightly
* Copyright to DEP-5
* Added watch file
* Included LDFLAGS from dpkg-buildflags in Makefile
* Patched wwl.c to have correct version number
---
.gitignore | 1 +
Makefile | 10 ++--
debian/changelog | 16 ++++++
debian/compat | 2 +-
debian/control | 19 ++++---
debian/copyright | 58 +++++++++++++---------
debian/patches/fix-makefile-paths.patch | 16 ++++++
debian/patches/fix-version-number.patch | 14 ++++++
debian/patches/hardening-no-relro.patch | 14 ++++++
debian/patches/remove-locator-link.patch | 85 ++++++++++++++++++++++++++++++++
debian/patches/series | 4 ++
debian/rules | 41 ++-------------
debian/source/format | 1 +
debian/watch | 5 ++
debian/wwl.dirs | 1 -
debian/wwl.lintian-overrides | 4 ++
wwl.c | 2 +-
17 files changed, 218 insertions(+), 75 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/Makefile b/Makefile
index 4160fee..4e8a49f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
# September 2007
# Diane Bruce <va3db at amsat.org>
-PREFIX?= /usr/local
-MANPREFIX?= /usr/local/man
+PREFIX?= debian/wwl/usr
+MANPREFIX?= ${PREFIX}/share/man
MAN1PREFIX?= ${MANPREFIX}/man1
LN?= ln
INSTALL?= install
@@ -16,7 +16,7 @@ RELEASE= wwl+db-1.3
all: wwl locator
wwl: wwl.c
- $(CC) $(CFLAGS) -o wwl wwl.c -lm
+ $(CC) $(CFLAGS) $(LDFLAGS) -o wwl wwl.c -lm
locator: wwl
${RM} -f locator
@@ -26,10 +26,10 @@ install: all
${RM} -f ${PREFIX}/bin/locator
${RM} -f ${PREFIX}/bin/wwl
${INSTALL} wwl ${PREFIX}/bin/wwl
- ${LN} -s ${PREFIX}/bin/wwl ${PREFIX}/bin/locator
+ #${LN} -s ${PREFIX}/bin/wwl ${PREFIX}/bin/locator
${INSTALL} wwl.1 ${MAN1PREFIX}/wwl.1
${GZIP} -f ${MAN1PREFIX}/wwl.1
- ${LN} -s ${MAN1PREFIX}/wwl.1.gz ${MAN1PREFIX}/locator.1.gz
+ #${LN} -s ${MAN1PREFIX}/wwl.1.gz ${MAN1PREFIX}/locator.1.gz
deinstall:
${RM} -f ${PREFIX}/bin/wwl
diff --git a/debian/changelog b/debian/changelog
index d1a802d..76094ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+wwl (1.3+db-2) unstable; urgency=medium
+
+ * Switched to Debian Standards Version 3.9.6
+ * Switched source format to 3.0 (quilt)
+ * Switched to debhelper version 9
+ * Simplified debian/rules
+ * Imported into Debian Hamradio Maintainer's git
+ * Added Homepage link to debian/control
+ * Shortened package synopsis
+ * Improved description slightly
+ * Copyright to DEP-5
+ * Added watch file
+ * Included LDFLAGS from dpkg-buildflags in Makefile
+
+ -- Iain R. Learmonth <irl at fsfe.org> Tue, 14 Oct 2014 01:20:37 +0100
+
wwl (1.3+db-1.1) unstable; urgency=low
* Retiring - remove myself from the uploaders list
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 4b7ea0f..c4d6226 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,19 @@
Source: wwl
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Iain R. Learmonth <irl at fsfe.org>,
+ Hamish Moffat <hamish at debian.org>
Section: hamradio
Priority: optional
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4)
-Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
-Uploaders: Jaime Robles <jaime at debian.org>, Patrick Ouellette <pouelle at debian.org>, Hamish Moffatt <hamish at debian.org>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.6
+Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/wwl.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/wwl.git/
+Homepage: http://www.db.net/downloads/
Package: wwl
Architecture: any
-Depends: ${shlibs:Depends}
-Description: Calculates distance and azimuth between two Maidenhead locators
- Given two Maidenhead locators, wwl calculates distance (qrb) and azimuth.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Distance and azimuth calculator for Maidenhead locators
+ A simple command line utility that given two Maidenhead locators calculates
+ distance (qrb) in kilometers and azimuth in degrees.
diff --git a/debian/copyright b/debian/copyright
index 5994c40..cde53c6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,40 @@
-This is the Debian GNU/Linux package of wwl.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: wwl+db
+Source: http://www.db.net/downloads
-wwl was downloaded from http://www.db.net/downloads, the program was
-originally written by Mirko Caserta <ik0zsn at amsat.org>, there is no code
-from the original (dead?) version of wwl.
+Files: *
+Copyright: © Diane Bruce VA3DB <db at FreeBSD.ORG>
+License: Permissive
-This version comes with a new license, taken from wwl.c:
+Files: debian/*
+Copyright: © 2014 Iain R. Learmonth <irl at fsfe.org>
+License: BSD-2-clause
-/* This version by va3db db at db.net db at FreeBSD.org Oct 1 2007
- * rewritten completely. There were equator crossing bugs in the original
- * (dead) version of wwl on sunsite, so I rewrote it from scratch.
- *
- * wwl -- Originally by IK0ZSN Mirko Caserta <ik0zsn at amsat.org>
- * There is no code from the original (dead?) version of wwl.
- *
- * The bearing/distance code is from Amateur Radio Software by John
- * Morris, GM4ANB.
- *
- * <db at FreeBSD.ORG> wrote this file. As long as you retain this notice you
- * can do whatever you want with this code, except you may not
- * license it under any form of the GPL.
- * A postcard or QSL card showing me you appreciate
- * this code would be nice. Diane Bruce va3db
- */
+License: Permissive
+ <db at FreeBSD.ORG> wrote this file. As long as you retain this notice you can
+ do whatever you want with this code, except you may not license it under any
+ form of the GPL. A postcard or QSL card showing me you appreciate this code
+ would be nice. Diane Bruce va3db
-The Debian packaging is (C) 2007, Joop Stakenborg <pa3aba at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/patches/fix-makefile-paths.patch b/debian/patches/fix-makefile-paths.patch
new file mode 100644
index 0000000..d6404fb
--- /dev/null
+++ b/debian/patches/fix-makefile-paths.patch
@@ -0,0 +1,16 @@
+Description: Have files installed ready for dh_install to do magic
+Author: Iain R. Learmonth <irl at fsfe.org>
+
+--- wwl.orig/Makefile
++++ wwl/Makefile
+@@ -1,8 +1,8 @@
+ # September 2007
+ # Diane Bruce <va3db at amsat.org>
+
+-PREFIX?= /usr/local
+-MANPREFIX?= /usr/local/man
++PREFIX?= debian/wwl/usr
++MANPREFIX?= ${PREFIX}/share/man
+ MAN1PREFIX?= ${MANPREFIX}/man1
+ LN?= ln
+ INSTALL?= install
diff --git a/debian/patches/fix-version-number.patch b/debian/patches/fix-version-number.patch
new file mode 100644
index 0000000..1555735
--- /dev/null
+++ b/debian/patches/fix-version-number.patch
@@ -0,0 +1,14 @@
+Description: Source code had incorrect version number
+Author: Iain R. Learmonth <irl at fsfe.org>
+
+--- wwl.orig/wwl.c
++++ wwl/wwl.c
+@@ -66,7 +66,7 @@
+ char my_wwl[SCRATCH_WWL_LEN], dx_wwl[SCRATCH_WWL_LEN];
+
+ if (argc < 2) {
+- printf("wwl by va3db 1.0\n");
++ printf("wwl by va3db 1.3\n");
+ printf("wwl home_locator dx_locator\n");
+ exit(EXIT_FAILURE);
+ }
diff --git a/debian/patches/hardening-no-relro.patch b/debian/patches/hardening-no-relro.patch
new file mode 100644
index 0000000..77d2c19
--- /dev/null
+++ b/debian/patches/hardening-no-relro.patch
@@ -0,0 +1,14 @@
+Description: Use LDFLAGS from dpkg-buildflags in Makefile
+Author: Iain R. Learmonth <irl at fsfe.org>
+
+--- wwl.orig/Makefile
++++ wwl/Makefile
+@@ -16,7 +16,7 @@
+ all: wwl locator
+
+ wwl: wwl.c
+- $(CC) $(CFLAGS) -o wwl wwl.c -lm
++ $(CC) $(CFLAGS) $(LDFLAGS) -o wwl wwl.c -lm
+
+ locator: wwl
+ ${RM} -f locator
diff --git a/debian/patches/remove-locator-link.patch b/debian/patches/remove-locator-link.patch
new file mode 100644
index 0000000..4bf9174
--- /dev/null
+++ b/debian/patches/remove-locator-link.patch
@@ -0,0 +1,85 @@
+Description: Remove references to "locator" binary
+Author: Hamish Moffatt <hamish at debian.org>
+
+--- 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.0\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';
+--- wwl.orig/Makefile
++++ wwl/Makefile
+@@ -26,10 +26,10 @@
+ ${RM} -f ${PREFIX}/bin/locator
+ ${RM} -f ${PREFIX}/bin/wwl
+ ${INSTALL} wwl ${PREFIX}/bin/wwl
+- ${LN} -s ${PREFIX}/bin/wwl ${PREFIX}/bin/locator
++ #${LN} -s ${PREFIX}/bin/wwl ${PREFIX}/bin/locator
+ ${INSTALL} wwl.1 ${MAN1PREFIX}/wwl.1
+ ${GZIP} -f ${MAN1PREFIX}/wwl.1
+- ${LN} -s ${MAN1PREFIX}/wwl.1.gz ${MAN1PREFIX}/locator.1.gz
++ #${LN} -s ${MAN1PREFIX}/wwl.1.gz ${MAN1PREFIX}/locator.1.gz
+
+ deinstall:
+ ${RM} -f ${PREFIX}/bin/wwl
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1cac8ef
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+remove-locator-link.patch
+fix-makefile-paths.patch
+hardening-no-relro.patch
+fix-version-number.patch
diff --git a/debian/rules b/debian/rules
index 20e6b39..55bb237 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,9 @@
#!/usr/bin/make -f
-build:
- dh_testdir
- $(MAKE)
- touch build
+%:
+ dh $@
-clean:
- dh_testdir
- -rm -f build
- $(MAKE) clean
+override_dh_auto_clean:
+ dh_auto_clean
-rm -f `find . -name "*~"`
- dh_clean
-
-binary-indep: build
-# nothing else to do
-
-binary-arch: build
- dh_clean
- dh_installdirs
-
- install wwl `pwd`/debian/wwl/usr/bin
-
- dh_installdocs
- dh_installman wwl.1
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_makeshlibs
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-checkroot:
- dh_testdir
- dh_testroot
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/debian/watch b/debian/watch
new file mode 100644
index 0000000..240373a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+version=3
+
+opts=dversionmangle=s/\+db[0-9]*// \
+ http://www.db.net/downloads/ wwl\+db-(.*)\.tgz
+
diff --git a/debian/wwl.dirs b/debian/wwl.dirs
index 9046445..98d1583 100644
--- a/debian/wwl.dirs
+++ b/debian/wwl.dirs
@@ -1,3 +1,2 @@
usr/bin
usr/share/man/man1
-usr/share/doc/wwl
diff --git a/debian/wwl.lintian-overrides b/debian/wwl.lintian-overrides
new file mode 100644
index 0000000..eaaa005
--- /dev/null
+++ b/debian/wwl.lintian-overrides
@@ -0,0 +1,4 @@
+# The permissive license refers to the GPL, but actually explicitly forbids
+# the code being licensed under the GPL, so there's no need to refer to the
+# full license text for it.
+wwl binary: copyright-should-refer-to-common-license-file-for-gpl
diff --git a/wwl.c b/wwl.c
index 5a2fec5..6090f67 100644
--- a/wwl.c
+++ b/wwl.c
@@ -66,7 +66,7 @@ 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 by va3db 1.3\n");
printf("wwl home_locator dx_locator\n");
exit(EXIT_FAILURE);
}
--
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