From cd565a61e7266415f701c46dc0d3857afdee388d Mon Sep 17 00:00:00 2001 From: Colin Tuckley Date: Wed, 29 Jan 2014 19:50:05 +0000 Subject: [PATCH] 1.7.1-2 Update watch file - fix long desc lines - don't write to ~/ --- debian/changelog | 8 ++++++++ debian/control | 10 +++++----- debian/patches/makefile-no-homedir-use | 18 ++++++++++++++++++ debian/patches/series | 1 + debian/watch | 5 +++-- 5 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 debian/patches/makefile-no-homedir-use create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 7f57bab..bd35790 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cqrlog (1.7.1-2) unstable; urgency=medium + + * Really fix #713516 by stopping lazbuild trying to write to ~/ + * Fix long description to remove lines longer than 80 + * Update watch file + + -- Colin Tuckley Mon, 27 Jan 2014 11:10:15 +0000 + cqrlog (1.7.1-1) unstable; urgency=low * "When TRX control is not active, use frequency and mode from NewQSO window" option to Preferences->Band map added diff --git a/debian/control b/debian/control index 12642ec..d1a301e 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libssl-dev, mariadb-server | mysql- Description: Advanced logging program for hamradio operators CQRLOG is an advanced ham radio logger based on MySQL embedded database. Provides radio control based on hamlib libraries (currently support of 140+ - radio types and models), DX cluster connection, HamQTH/QRZ callbook (XML access), - a grayliner, internal QSL manager database support and a most accurate country - resolution algorithm based on country tables developed by OK1RR. - CQRLOG is intended for daily general logging of HF, CW & SSB contacts and - strongly focused on easy operation and maintenance. + radio types and models), DX cluster connection, HamQTH/QRZ callbook + (XML access), a grayliner, internal QSL manager database support and a most + accurate country resolution algorithm based on country tables developed by + OK1RR. CQRLOG is intended for daily general logging of HF, CW & SSB contacts + and strongly focused on easy operation and maintenance. diff --git a/debian/patches/makefile-no-homedir-use b/debian/patches/makefile-no-homedir-use new file mode 100644 index 0000000..3c50ea4 --- /dev/null +++ b/debian/patches/makefile-no-homedir-use @@ -0,0 +1,18 @@ +Description: Stop lazbuild from using homedir + Lazbuild tries to write it's config file to ~/.lazarus + this moves it to /tmp + +--- cqrlog-1.7.1.orig/Makefile ++++ cqrlog-1.7.1/Makefile +@@ -3,9 +3,10 @@ ST=strip + datadir = $(DESTDIR)/usr/share/cqrlog + bindir = $(DESTDIR)/usr/bin + sharedir = $(DESTDIR)/usr/share ++tmpdir = /tmp + + cqrlog: src/cqrlog.lpi +- $(CC) --ws=gtk2 src/cqrlog.lpi ++ $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi + $(ST) src/cqrlog + gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0b01f65 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +makefile-no-homedir-use diff --git a/debian/watch b/debian/watch index b24a828..640355d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ version=3 - -http://www.cqrlog.com/deb_src/index.php cqrlog_(.+).tar.gz +opts=uversionmangle=s/(\d)[\._](mac|win32|i386|amd64)$/$1~$2/;s/(\d)\.deb\.src/$1/ \ +http://www.cqrlog.com/download \ +(?:.*[/=]|)cqrlog[_\-](\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)).*