--- trustedqsl-1.10.orig/qsodatadialog.cpp +++ trustedqsl-1.10/qsodatadialog.cpp @@ -291,13 +291,13 @@ sizer = new wxBoxSizer(wxHORIZONTAL); _recbottom_ctrl = new wxBitmapButton(this, QD_RECBOTTOM, wxBitmap(bottom), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)), sizer->Add(_recbottom_ctrl, 0, wxTOP|wxBOTTOM, 5); - _recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(left), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)); + _recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(leftxpm), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)); sizer->Add(_recdown_ctrl, 0, wxTOP|wxBOTTOM, 5); _recno_ctrl = new wxTextCtrl(this, QD_RECNO, "1", wxDefaultPosition, wxSize(4*TEXT_WIDTH,TEXT_HEIGHT)); _recno_ctrl->Enable(FALSE); sizer->Add(_recno_ctrl, 0, wxALL, 5); - _recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(right), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)); + _recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(rightxpm), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)); sizer->Add(_recup_ctrl, 0, wxTOP|wxBOTTOM, 5); _rectop_ctrl = new wxBitmapButton(this, QD_RECTOP, wxBitmap(top), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)), sizer->Add(_rectop_ctrl, 0, wxTOP|wxBOTTOM, 5); --- trustedqsl-1.10.orig/left.xpm +++ trustedqsl-1.10/left.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *left[]={ +static char *leftxpm[]={ "10 10 29 1", ". c None", "d c #000000", --- trustedqsl-1.10.orig/right.xpm +++ trustedqsl-1.10/right.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *right[]={ +static char *rightxpm[]={ "10 10 30 1", "a c None", "g c #000000", --- trustedqsl-1.10.orig/Makefile.in +++ trustedqsl-1.10/Makefile.in @@ -11,7 +11,6 @@ WXLIBS=`wx-config --libs` CXXFLAGS = -O0 -g3 -Wall $(INCDIR) @DEFS@ $(WXFLAGS) LDLIBS = -L$(OPENSSL)/lib -L$(TQSLLIB) -ltqsllib $(LIBS) $(WXLIBS) -TQSLLIBFILE=$(TQSLLIB)/libtqsllib.a prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -30,10 +29,10 @@ TQSL_OBJ = tqsl.o extwizard.o tqslwiz.o dxcc.o stationdial.o qsodatadialog.o \ tqslvalidator.o tqsl_prefs.o wxutil.o -tqslcert: $(TQSLCERT_OBJ) $(TQSLLIBFILE) +tqslcert: $(TQSLCERT_OBJ) $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TQSLCERT_OBJ) $(LDLIBS) -lstdc++ -tqsl: $(TQSL_OBJ) $(TQSLLIBFILE) +tqsl: $(TQSL_OBJ) $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TQSL_OBJ) $(LDLIBS) -lstdc++ include apps.depends @@ -61,18 +60,18 @@ distclean: $(MAKE) clean rm -f config.status config.cache config.log \ - Makefile Makefile.g95 + Makefile Makefile.g95 tqslbuild.h tqslcertbuild.h install: strip $(TARGETS) - $(INSTALL) -d $(BINDIR) $(DOCDIR)/tqslcert $(DOCDIR)/tqslapp $(ETCDIR)/tqsl - $(INSTALL) -C $(TARGETS) $(BINDIR) - $(INSTALL) -C tqslcert_help/*.* $(DOCDIR)/tqslcert - $(INSTALL) -C tqsl_help/*.* $(DOCDIR)/tqslapp - $(INSTALL) -C ../licenses/* $(DOCDIR)/tqslapp - $(INSTALL) -C ../lotwdb/config.xml $(ETCDIR)/tqsl + $(INSTALL) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(DOCDIR)/tqslcert $(DESTDIR)$(DOCDIR)/tqslapp + $(INSTALL) $(TARGETS) $(DESTDIR)$(BINDIR) + $(INSTALL) tqslcert_help/*.* $(DESTDIR)$(DOCDIR)/tqslcert + $(INSTALL) tqsl_help/*.* $(DESTDIR)$(DOCDIR)/tqslapp + # $(INSTALL) -C ../licenses/* $(DESTDIR)$(DOCDIR)/tqslapp + # $(INSTALL) -C ../lotwdb/config.xml $(DESTDIR)$(ETCDIR)/tqsl uninstall: cd $(BINDIR) rm -f $(TARGETS) - rm -rf $(DOCDIR)/tqslcert $(DOCDIR)/tqslapp $(ETCDIR)/tqsl + rm -rf $(DESTDIR)$(DOCDIR)/tqslcert $(DESTDIR)$(DOCDIR)/tqslapp --- trustedqsl-1.10.orig/configure +++ trustedqsl-1.10/configure @@ -1092,7 +1092,7 @@ checktqsllib(){ if test -z "$TQSLLIB"; then - if test -e "$1/libtqsllib.a"; then + if test -e "$1/libtqsllib.so"; then TQSLLIB="$1" fi fi --- trustedqsl-1.10.orig/LICENSE +++ trustedqsl-1.10/LICENSE @@ -4,53 +4,48 @@ reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +modification, are permitted provided that the following conditions +are met: 1. Any redistribution of source code must retain the above copyright -notice, this list of conditions and the disclaimer shown in Paragraph 7 -(below). +notice, this list of conditions and the disclaimer shown in +Paragraph 6 (below). 2. Redistribution in binary form must reproduce the above copyright -notice, this list of conditions and the disclaimer shown in Paragraph 7 -(below) in the documentation and/or other materials provided with the -distribution. +notice, this list of conditions and the disclaimer shown in +Paragraph 6 (below) in the documentation and/or other materials +provided with the distribution. 3. Products derived from or including this software must include the -following acknowledgment: "This product includes software developed by -the American Radio Relay League, Incorporated for use in the Logbook of -the World project." - -4. All advertising materials mentioning features or use of this software -must display the following acknowledgment: "This product includes -software developed by the American Radio Relay League, Incorporated for -use in the ARRL Logbook of the World project." - -5. Products derived from or including this software may not use "Logbook -of the World" or "LoTW" or any other American Radio Relay League, -Incorporated trademarks or servicemarks in their names without prior -written permission of the ARRL. See Paragraph 8 (below) for contact -information. - -6. Use of this software does not imply endorsement by ARRL of products -derived from or including this software and vendors may not claim such -endorsement. - -7. Disclaimer: This software is provided "as-is" without representation, -guarantee or warranty of any kind, either express or implied, including -but not limited to the implied warranties of merchantability or of -fitness for a particular purpose. The entire risk as to the quality and -performance of the software is solely with you. Should the software -prove defective, you (and not the American Radio Relay League, its -officers, directors, employees or agents) assume the entire cost of all -necessary servicing, repair or correction. In no event will ARRL be -liable to you or to any third party for any damages, whether direct or -indirect, including lost profits, lost savings, or other incidental or -consequential damages arising out of the use or inability to use such -software, regardless of whether ARRL has been advised of the possibility -of such damages. +following acknowledgment: "This product includes software developed +by the American Radio Relay League, Incorporated for use in the +Logbook of the World project." + +4. Products derived from or including this software may not use +"Logbook of the World" or "LoTW" or any other American Radio Relay +League, Incorporated trademarks or servicemarks in their names +without prior written permission of the ARRL. See Paragraph 7 +(below) for contact information. + +5. Use of this software does not imply endorsement by ARRL of +products derived from or including this software and vendors may not +claim such endorsement. + +6. Disclaimer: This software is provided "as-is" without +representation, guarantee or warranty of any kind, either express or +implied, including but not limited to the implied warranties of +merchantability or of fitness for a particular purpose. The entire +risk as to the quality and performance of the software is solely +with you. Should the software prove defective, you (and not the +American Radio Relay League, its officers, directors, employees or +agents) assume the entire cost of all necessary servicing, repair or +correction. In no event will ARRL be liable to you or to any third +party for any damages, whether direct or indirect, including lost +profits, lost savings, or other incidental or consequential damages +arising out of the use or inability to use such software, regardless +of whether ARRL has been advised of the possibility of such damages. -8. Contact information: +7. Contact information: American Radio Relay League, Inc. Attn: Logbook of the World Manager @@ -59,10 +54,10 @@ voice: 860-594-0200 fax: 860-594-0259 email: logbook@arrl.org -Worldwide Web: www.arrl.org/lotw +Worldwide Web: www.arrl.org This software consists of voluntary contributions made by many -individuals on behalf of the ARRL. More information on the "Logbook of -The World" project and the ARRL is available from the ARRL Web site at -www.arrl.org/lotw. +individuals on behalf of the ARRL. More information on the "Logbook +of The World" project and the ARRL is available from the ARRL Web +site at www.arrl.org. --- trustedqsl-1.10.orig/debian/changelog +++ trustedqsl-1.10/debian/changelog @@ -0,0 +1,14 @@ +trustedqsl (1.10-2) unstable; urgency=low + + * Add build-dep for zlib1g-dev (closes: #219058) + * Renamed left and right xpms to resolve ambiguity problem + at compile time (closes: #221538) + + -- Hamish Moffatt Sat, 31 Jan 2004 13:47:15 +1100 + +trustedqsl (1.10-1) unstable; urgency=low + + * First upload + + -- Hamish Moffatt Wed, 22 Oct 2003 00:41:54 +1000 + --- trustedqsl-1.10.orig/debian/copyright +++ trustedqsl-1.10/debian/copyright @@ -0,0 +1,73 @@ +This is the debian package of trustedqsl. The sources were downloaded +from http://www.arrl.org/lotw/#download . +The package was created by Hamish Moffatt on October 19, 2003. +The upstream authors can be reached at TrustedQSL@yahoogroups.com. + +This software is released under a revised BSD-like license. +The full text of the license is contained below. + + + +License Terms and Conditions + +Copyright (C) 2001-2003 American Radio Relay League, Inc. All rights +reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Any redistribution of source code must retain the above copyright +notice, this list of conditions and the disclaimer shown in +Paragraph 6 (below). + +2. Redistribution in binary form must reproduce the above copyright +notice, this list of conditions and the disclaimer shown in +Paragraph 6 (below) in the documentation and/or other materials +provided with the distribution. + +3. Products derived from or including this software must include the +following acknowledgment: "This product includes software developed +by the American Radio Relay League, Incorporated for use in the +Logbook of the World project." + +4. Products derived from or including this software may not use +"Logbook of the World" or "LoTW" or any other American Radio Relay +League, Incorporated trademarks or servicemarks in their names +without prior written permission of the ARRL. See Paragraph 7 +(below) for contact information. + +5. Use of this software does not imply endorsement by ARRL of +products derived from or including this software and vendors may not +claim such endorsement. + +6. Disclaimer: This software is provided "as-is" without +representation, guarantee or warranty of any kind, either express or +implied, including but not limited to the implied warranties of +merchantability or of fitness for a particular purpose. The entire +risk as to the quality and performance of the software is solely +with you. Should the software prove defective, you (and not the +American Radio Relay League, its officers, directors, employees or +agents) assume the entire cost of all necessary servicing, repair or +correction. In no event will ARRL be liable to you or to any third +party for any damages, whether direct or indirect, including lost +profits, lost savings, or other incidental or consequential damages +arising out of the use or inability to use such software, regardless +of whether ARRL has been advised of the possibility of such damages. + +7. Contact information: + +American Radio Relay League, Inc. +Attn: Logbook of the World Manager +225 Main St +Newington, CT 06111 +voice: 860-594-0200 +fax: 860-594-0259 +email: logbook@arrl.org +Worldwide Web: www.arrl.org + +This software consists of voluntary contributions made by many +individuals on behalf of the ARRL. More information on the "Logbook +of The World" project and the ARRL is available from the ARRL Web +site at www.arrl.org. + --- trustedqsl-1.10.orig/debian/control +++ trustedqsl-1.10/debian/control @@ -0,0 +1,18 @@ +Source: trustedqsl +Section: libs +Priority: optional +Maintainer: Hamish Moffatt +Standards-Version: 3.5.8 +Build-Depends: debhelper (>= 4), tqsllib-dev, libexpat-dev, libssl-dev, libwxgtk2.4-dev, zlib1g-dev + +Package: trustedqsl +Architecture: any +Depends: ${shlibs:Depends} +Description: QSL log signing for the Logbook of the World (LoTW) + A QSL is a confirmation of contact between two amateur radio stations. + The ARRL Logbook of the World project is a database which collects + data about contacts between amateur stations (QSOs). This package + provides programs for maintaining your digital certificates for + LOTW and for signing QSO log files in ADIF and Cabrillo format + for upload. + --- trustedqsl-1.10.orig/debian/rules +++ trustedqsl-1.10/debian/rules @@ -0,0 +1,52 @@ +#!/usr/bin/make -f + +build: build-stamp +build-stamp: + dh_testdir + ./configure --prefix=/usr + make + touch build-stamp + +clean: + dh_testdir + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean + + dh_clean + +# Build architecture-independent files here. +binary-indep: build +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build +# dh_testversion + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + make install DESTDIR=`pwd`/debian/trustedqsl + mv debian/trustedqsl/usr/share/doc/tqslapp debian/trustedqsl/usr/share/doc/trustedqsl + mv debian/trustedqsl/usr/share/doc/tqslcert debian/trustedqsl/usr/share/doc/trustedqsl + + dh_installdocs + #dh_installexamples + #dh_installmanpages + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_makeshlibs -V + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- trustedqsl-1.10.orig/debian/trustedqsl.dirs +++ trustedqsl-1.10/debian/trustedqsl.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/doc/trustedqsl --- trustedqsl-1.10.orig/debian/compat +++ trustedqsl-1.10/debian/compat @@ -0,0 +1 @@ +4