[hamradio-commits] [qsstv] 01/02: Little tidy up of the debian/* folder
Dave Hibberd
hibby-guest at moszumanska.debian.org
Thu Jun 2 20:54:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository qsstv.
commit 9e1a7c44a48ed85c50be158610a0f24d48294586
Author: Hibby <d at vehibberd.com>
Date: Thu Jun 2 20:10:37 2016 +0100
Little tidy up of the debian/* folder
---
debian/README.debian | 3 +-
debian/changelog | 19 +-
debian/control | 5 +-
debian/copyright | 48 ++-
debian/dirs | 2 -
debian/install | 1 -
debian/missing-sources/jquery.js | 68 ----
debian/qsstv.desktop | 2 +-
debian/{source/include-binaries => qsstv.examples} | 6 +-
debian/qsstv.install | 2 +
debian/qsstv.links | 1 -
debian/qsstv.menu | 4 -
debian/qsstv.xpm | 444 ---------------------
debian/source/include-binaries | 2 +-
.../{simple replay.templ => simple_replay.templ} | Bin
qsstv/widgets/imageviewer.cpp | 4 +-
16 files changed, 72 insertions(+), 539 deletions(-)
diff --git a/debian/README.debian b/debian/README.debian
index 49c57ec..b391296 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -1,7 +1,7 @@
qsstv for Debian
----------------
-qsstv 7.1 is a complete rewrite using QT4.
+qsstv 9.1.5 is a built on QT5 and removes Jasper!
SSTV is a 100% duty cycle mode with high modulation levels. Please refer to
your manual and reduce your transmitter output power to a safe level.
@@ -14,6 +14,7 @@ Sample template files (from http://users.telenet.be/on4qz/qsstv/templates)
have been provided in /usr/share/doc/qsstv/examples.
Steve Kostecke <steve at debian.org> Fri, 01 Jun 2012 12:03:04 -0500
+Dave Hibberd <d at vehibberd.com> Thu, 02 Jun 2016 20:53:00 +0100
This package was originally debianized by Joop Stakenborg pa3aba at debian.org
on Mon, 30 Jul 2001 02:00:06 +0200.
diff --git a/debian/changelog b/debian/changelog
index a5fb553..844f122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
qsstv (9.1.5+repack-1) UNRELEASED; urgency=medium
- * Non Maintainer Upload
-
- -- Dave Hibberd <d at vehibberd.com> Tue, 24 May 2016 21:05:10 +0100
+ * New Upstream Release Closes: #818208
+ * debian/control
+ - Updated Standards Version to 3.9.7
+ - Added VCS-* information
+ - Updated build time depdendencies
+ * debian/copyright
+ - Tidied up to give better attribution and more information
+ - Included Files-Excluded
+ * debian/rules
+ - Simplified as far as possible
+ * debian/qsstv.install
+ - Installs pixmap
+ * debian/qsstv.menu
+ - Removed as per policy updates
+
+ -- Dave Hibberd <d at vehibberd.com> Thu, 2 Jun 2016 20:05:10 +0100
qsstv (8.2.12-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index e629b25..3ace63d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,15 @@ Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
Uploaders: Steve Kostecke <steve at debian.org>, Colin Tuckley <colint at debian.org>, Dave Hibberd <d at vehibberd.com>
Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/qsstv.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/uronode.git
Homepage: http://users.telenet.be/on4qz
Build-Depends: debhelper (>=9), libfftw3-dev, qtbase5-dev, qtchooser, qt5-qmake, qtbase5-dev-tools, libhamlib-dev, libasound2-dev, libopenjp2-7-dev, libv4l-dev, libpulse-dev
Package: qsstv
Architecture: linux-any
-Depends: libjs-jquery, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt-based slow-scan TV and fax
Qsstv is a program for receiving slow-scan television and fax.
These are modes used by hamradio operators. Qsstv uses a
soundcard to send and receive images.
-
diff --git a/debian/copyright b/debian/copyright
index 60d01a7..418be68 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,20 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: QSSTV
-Upstream-Contact: Johan Maes <on1mh at pandora.be>
-Source: http://users.pandora.be/on1mh
+Upstream-Contact: Johan Maes <on4qz at pandora.be>
+Source: http://users.telenet.be/on4qz/
Files-Excluded:
qsstv/documentation/manual/manual/jquery.js
Files: *
-Copyright: 2001 Johan Maes <on1mh at pandora.be>
-License: GPL-2+
+Copyright: 2001-2016 Johan Maes <on4qz at telenet.be>
+License: GPL-3
Files: debian/*
-Copyright: 2012 Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Copyright: 2001-2011 Joop Stakenborg <<pa3aba at debian.org>
+ 2010 Gregor Herrmann <gregoa at debian.org>
+ 2012 Steve Kostecke <steve at debian.org>
+ 2014-2015 Colin Tuckley <colint at debian.org>
+ 2016 Dave Hibberd <d at vehibberd.com>
License: GPL-2+
Files: debian/templates/*
@@ -18,4 +22,36 @@ Copyright: 2012 Johan Maes <on1mh at pandora.be>
License: GPL-2+
License: GPL-2+
- /usr/share/common-licenses/GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ The GPL License which applies to this package can be found on your Debian
+ system at /usr/share/common-licenses/GPL-2.
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The GPL License which applies to this package can be found on your Debian
+ system at /usr/share/common-licenses/GPL-3.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index b85d017..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/pixmaps
diff --git a/debian/install b/debian/install
deleted file mode 100644
index edf33e5..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/qsstv.xpm usr/share/pixmaps
diff --git a/debian/missing-sources/jquery.js b/debian/missing-sources/jquery.js
deleted file mode 100644
index d52a1c7..0000000
--- a/debian/missing-sources/jquery.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * jQuery JavaScript Library v1.7.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Mon Nov 21 21:11:03 2011 -0500
- */
-(function(bb,L){var av=bb.document,bu=bb.navigator,bl=bb.location;var b=(function(){var bF=function(b0,b1){return new bF.fn.init(b0,b1,bD)},bU=bb.jQuery,bH=bb.$,bD,bY=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,bM=/\S/,bI=/^\s+/,bE=/\s+$/,bA=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,bN=/^[\],:{}\s]*$/,bW=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,bP=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,bJ=/(?:^|:|,)(?:\s*\[)+/g,by=/(webkit)[ \/]([\w.]+)/,bR=/(opera)(?:.*version)?[ \/]([\w.]+)/ [...]
-/*
- * Sizzle CSS Selector Engine
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- * More information: http://sizzlejs.com/
- */
-(function(){var bH=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,bC="sizcache"+(Math.random()+"").replace(".",""),bI=0,bL=Object.prototype.toString,bB=false,bA=true,bK=/\\/g,bO=/\r\n/g,bQ=/\W/;[0,0].sort(function(){bA=false;return 0});var by=function(bV,e,bY,bZ){bY=bY||[];e=e||av;var b1=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!bV||typeof bV!=="string"){return bY}var bS,b3,b6,bR,b2,b5,b4,bX,bU [...]
- * jQuery UI 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(a,d){a.ui=a.ui||{};if(a.ui.version){return}a.extend(a.ui,{version:"1.8.18",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});a.fn.extend({propAttr:a.fn [...]
- * jQuery UI Widget 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,d){if(b.cleanData){var c=b.cleanData;b.cleanData=function(f){for(var g=0,h;(h=f[g])!=null;g++){try{b(h).triggerHandler("remove")}catch(j){}}c(f)}}else{var a=b.fn.remove;b.fn.remove=function(e,f){return this.each(function(){if(!f){if(!e||b.filter(e,[this]).length){b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(g){}})}}return a.call(b(this),e,f)})}}b.widget=function(f,h,e){var g=f.split(".")[0],j;f=f.split(".")[1];j=g+"-"+f;if(!e){e=h;h=b.Wid [...]
- * jQuery UI Mouse 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- * jquery.ui.widget.js
- */
-(function(b,c){var a=false;b(document).mouseup(function(d){a=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var d=this;this.element.bind("mousedown."+this.widgetName,function(e){return d._mouseDown(e)}).bind("click."+this.widgetName,function(e){if(true===b.data(e.target,d.widgetName+".preventClickEvent")){b.removeData(e.target,d.widgetName+".preventClickEvent");e.stopImmediatePropagation();return false}});this.started=false},_mouseD [...]
- * jQuery hashchange event - v1.3 - 7/21/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function() [...]
- PowerTip - v1.2.0 - 2013-04-03
- http://stevenbenner.github.com/jquery-powertip/
- Copyright (c) 2013 Steven Benner (http://stevenbenner.com/).
- Released under MIT license.
- https://raw.github.com/stevenbenner/jquery-powertip/master/LICENSE.txt
-*/
-(function(a){if(typeof define==="function"&&define.amd){define(["jquery"],a)}else{a(jQuery)}}(function(k){var A=k(document),s=k(window),w=k("body");var n="displayController",e="hasActiveHover",d="forcedOpen",u="hasMouseMove",f="mouseOnToPopup",g="originalTitle",y="powertip",o="powertipjq",l="powertiptarget",E=180/Math.PI;var c={isTipOpen:false,isFixedTipOpen:false,isClosing:false,tipOpenImminent:false,activeHover:null,currentX:0,currentY:0,previousX:0,previousY:0,desyncTimeout:null,mouse [...]
\ No newline at end of file
diff --git a/debian/qsstv.desktop b/debian/qsstv.desktop
index bb197be..81556ff 100644
--- a/debian/qsstv.desktop
+++ b/debian/qsstv.desktop
@@ -3,7 +3,7 @@ Name=QSSTV
GenericName=Qt-based slow-scan TV and fax
Comment=Qt-based slow-scan TV and fax
Exec=qsstv
-Icon=qsstv
+Icon=/usr/share/qsstv/qsstv.png
Terminal=false
Type=Application
Categories=Network;HamRadio;
diff --git a/debian/source/include-binaries b/debian/qsstv.examples
similarity index 76%
copy from debian/source/include-binaries
copy to debian/qsstv.examples
index e7b8b5f..d571825 100644
--- a/debian/source/include-binaries
+++ b/debian/qsstv.examples
@@ -1,5 +1,5 @@
+debian/templates/comment.templ
debian/templates/CQ_1.templ
-debian/templates/simple replay.templ
-debian/templates/im_reply.templ
debian/templates/CQ_2.templ
-debian/templates/comment.templ
+debian/templates/im_reply.templ
+debian/templates/simple_replay.templ
diff --git a/debian/qsstv.install b/debian/qsstv.install
new file mode 100644
index 0000000..d5638e5
--- /dev/null
+++ b/debian/qsstv.install
@@ -0,0 +1,2 @@
+debian/qsstv.desktop usr/share/applications
+qsstv/icons/qsstv.png usr/share/qsstv
diff --git a/debian/qsstv.links b/debian/qsstv.links
deleted file mode 100644
index 3a2ca8e..0000000
--- a/debian/qsstv.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/qsstv/html/jquery.js
diff --git a/debian/qsstv.menu b/debian/qsstv.menu
deleted file mode 100644
index 0be746c..0000000
--- a/debian/qsstv.menu
+++ /dev/null
@@ -1,4 +0,0 @@
-?package(qsstv):needs="X11" section="Applications/Amateur Radio" \
- title="Qsstv" command="/usr/bin/qsstv" \
- icon="/usr/share/pixmaps/qsstv.xpm" \
- longtitle="Qsstv: Soundcard based slow-scan television and fax"
diff --git a/debian/qsstv.xpm b/debian/qsstv.xpm
deleted file mode 100644
index 2e36727..0000000
--- a/debian/qsstv.xpm
+++ /dev/null
@@ -1,444 +0,0 @@
-/* XPM */
-static char * qsstv_xpm[] = {
-"32 32 409 2",
-" c None",
-". c #A8A8A8",
-"+ c #B2B2B2",
-"@ c #B7B7B7",
-"# c #7B7B7B",
-"$ c #E1DBE1",
-"% c #E5CAE5",
-"& c #E4CAE4",
-"* c #E5CAE4",
-"= c #E3CAE4",
-"- c #E0CAE4",
-"; c #DECAE4",
-"> c #D4CAE4",
-", c #D3CAE4",
-"' c #C8CAE4",
-") c #CACAE4",
-"! c #B7CAE4",
-"~ c #B2CBE4",
-"{ c #B2CFE4",
-"] c #B2D2E4",
-"^ c #B1D2E5",
-"/ c #B5D3E4",
-"( c #C8D9E1",
-"_ c #C3D4E6",
-": c #C6C9CC",
-"< c #BAB9B9",
-"[ c #C9D5DD",
-"} c #CADAE4",
-"| c #CFDBE4",
-"1 c #CDCDCC",
-"2 c #7A7A7A",
-"3 c #FF7AFF",
-"4 c #FF7CFF",
-"5 c #FC7CFF",
-"6 c #F77CFF",
-"7 c #EA7CFF",
-"8 c #B47CFF",
-"9 c #B57CFF",
-"0 c #767CFF",
-"a c #2B7CFF",
-"b c #1A7CFF",
-"c c #077AFF",
-"d c #038FFF",
-"e c #0390FF",
-"f c #00A3FF",
-"g c #3AACF9",
-"h c #5ABDF4",
-"i c #77C8F9",
-"j c #73BBF1",
-"k c #393B3D",
-"l c #535A5F",
-"m c #7CC8FB",
-"n c #7CCBFF",
-"o c #90CFF9",
-"p c #CFCDCB",
-"q c #FB7CFF",
-"r c #F47FFF",
-"s c #E87FFF",
-"t c #D87FFF",
-"u c #B67FFF",
-"v c #A27FFF",
-"w c #787FFF",
-"x c #457FFF",
-"y c #047EFF",
-"z c #0887FF",
-"A c #0895FF",
-"B c #089AFE",
-"C c #04A4FF",
-"D c #2BAAFA",
-"E c #67B7F4",
-"F c #82CFFF",
-"G c #7CC2F0",
-"H c #433932",
-"I c #565E63",
-"J c #83D9FF",
-"K c #7ECBFE",
-"L c #7FCCFF",
-"M c #92CFF8",
-"N c #CECDCB",
-"O c #EC7CFF",
-"P c #E47FFF",
-"Q c #C37FFF",
-"R c #B37FFF",
-"S c #867FFF",
-"T c #617FFF",
-"U c #1B7FFE",
-"V c #088BFE",
-"W c #0894FF",
-"X c #089DFF",
-"Y c #04A3FF",
-"Z c #3EAEF8",
-"` c #3B3B3C",
-" . c #81D2FF",
-".. c #94D6FF",
-"+. c #CECCCB",
-"@. c #E97CFF",
-"#. c #CF7FFF",
-"$. c #A67FFF",
-"%. c #667FFF",
-"&. c #637FFF",
-"*. c #007EFF",
-"=. c #087EFE",
-"-. c #0989FB",
-";. c #0794FF",
-">. c #0794FE",
-",. c #119FFF",
-"'. c #2AAAFA",
-"). c #65B6F2",
-"!. c #83CFFF",
-"~. c #5D656A",
-"{. c #726E6B",
-"]. c #CFD0D0",
-"^. c #E1CAE4",
-"/. c #C37CFF",
-"(. c #6D7FFF",
-"_. c #647FFE",
-":. c #077EFF",
-"<. c #087CFF",
-"[. c #088CFE",
-"}. c #0891FE",
-"|. c #0CA0FF",
-"1. c #58ABF8",
-"2. c #65B7F3",
-"3. c #79C8F9",
-"4. c #5E666B",
-"5. c #1D1C1C",
-"6. c #34302D",
-"7. c #D1D1D1",
-"8. c #A57CFF",
-"9. c #677FFF",
-"0. c #007EFE",
-"a. c #0983FA",
-"b. c #0796FF",
-"c. c #0890FE",
-"d. c #079AFF",
-"e. c #0CA3FF",
-"f. c #65ADFA",
-"g. c #63B6F3",
-"h. c #72C6F4",
-"i. c #7AC1EE",
-"j. c #353434",
-"k. c #4F575C",
-"l. c #9BE2FF",
-"m. c #D5CAE4",
-"n. c #AA7CFF",
-"o. c #607FFE",
-"p. c #0894FE",
-"q. c #088FFE",
-"r. c #0996FC",
-"s. c #10A6FD",
-"t. c #5CAEF5",
-"u. c #62BCFC",
-"v. c #7ACAFC",
-"w. c #191818",
-"x. c #50575C",
-"y. c #C7CAE4",
-"z. c #5C7CFF",
-"A. c #007FFD",
-"B. c #0795FF",
-"C. c #09A5FF",
-"D. c #14A5FE",
-"E. c #6CB7F3",
-"F. c #68B2DD",
-"G. c #7C7068",
-"H. c #69A3C3",
-"I. c #443933",
-"J. c #067EFC",
-"K. c #0A83FA",
-"L. c #00A4FE",
-"M. c #48A0FD",
-"N. c #62B2F4",
-"O. c #70C3F5",
-"P. c #70BDEA",
-"Q. c #676260",
-"R. c #403F3E",
-"S. c #57646D",
-"T. c #80CEFF",
-"U. c #7ECCFF",
-"V. c #94CEF8",
-"W. c #B2CAE4",
-"X. c #0481FC",
-"Y. c #08A5FE",
-"Z. c #439BFF",
-"`. c #52A5FA",
-" + c #6FC2F3",
-".+ c #81CDFF",
-"++ c #565D62",
-"@+ c #4C4B4A",
-"#+ c #7C7C7C",
-"$+ c #7B7977",
-"%+ c #6F9DBC",
-"&+ c #80D0FF",
-"*+ c #7AC2FF",
-"=+ c #70E6F8",
-"-+ c #CFCCCB",
-";+ c #B3CBE3",
-">+ c #59ABF8",
-",+ c #65B7F4",
-"'+ c #443A34",
-")+ c #69ADD9",
-"!+ c #5A6267",
-"~+ c #686869",
-"{+ c #7C7977",
-"]+ c #628195",
-"^+ c #181817",
-"/+ c #80CBFF",
-"(+ c #60D3FF",
-"_+ c #75E3F8",
-":+ c #0582FA",
-"<+ c #07A6FF",
-"[+ c #7ECBFD",
-"}+ c #5A6166",
-"|+ c #6F6E6E",
-"1+ c #7FCDFF",
-"2+ c #5F666B",
-"3+ c #343434",
-"4+ c #7ECBFF",
-"5+ c #80CCFF",
-"6+ c #70D5FF",
-"7+ c #58E4FE",
-"8+ c #74E2F8",
-"9+ c #B2D0E4",
-"0+ c #00A2FF",
-"a+ c #469FFD",
-"b+ c #61B3F4",
-"c+ c #525F68",
-"d+ c #0F0E0E",
-"e+ c #67B8FF",
-"f+ c #58E7FE",
-"g+ c #5AE0FF",
-"h+ c #74F5EE",
-"i+ c #CFCCCC",
-"j+ c #B4D2E4",
-"k+ c #3D99FF",
-"l+ c #64B8F2",
-"m+ c #6FC3F3",
-"n+ c #84DDFF",
-"o+ c #504A47",
-"p+ c #696969",
-"q+ c #979797",
-"r+ c #5B5551",
-"s+ c #80CFFF",
-"t+ c #6D9BBA",
-"u+ c #523E34",
-"v+ c #5AEEFF",
-"w+ c #5AFCF2",
-"x+ c #74F8ED",
-"y+ c #CFCBCC",
-"z+ c #C2D1E5",
-"A+ c #58ABF9",
-"B+ c #65B8F4",
-"C+ c #7290A4",
-"D+ c #100F0E",
-"E+ c #514C49",
-"F+ c #686969",
-"G+ c #969595",
-"H+ c #5E7D91",
-"I+ c #7190A4",
-"J+ c #040000",
-"K+ c #4595AA",
-"L+ c #59FEF4",
-"M+ c #5CFFFC",
-"N+ c #74F7EC",
-"O+ c #C8D9E2",
-"P+ c #65BAF4",
-"Q+ c #6E9DBB",
-"R+ c #0F0C0B",
-"S+ c #626262",
-"T+ c #7DC7F8",
-"U+ c #6B6A6A",
-"V+ c #969391",
-"W+ c #70A0BF",
-"X+ c #6E9EBD",
-"Y+ c #040200",
-"Z+ c #243E45",
-"`+ c #5DFFFC",
-" @ c #59FEF0",
-".@ c #37383A",
-"+@ c #77FFF2",
-"@@ c #CAD9E4",
-"#@ c #81D9FF",
-"$@ c #7290A5",
-"%@ c #524943",
-"&@ c #7BC0EE",
-"*@ c #969594",
-"=@ c #393837",
-"-@ c #32221F",
-";@ c #5CDBEF",
-">@ c #5FFFFF",
-",@ c #374142",
-"'@ c #59BA94",
-")@ c #6CFACE",
-"!@ c #D0CBCD",
-"~@ c #CAD8E1",
-"{@ c #545D63",
-"]@ c #514B47",
-"^@ c #676564",
-"/@ c #989392",
-"(@ c #5BB6CC",
-"_@ c #59FFF0",
-":@ c #5DA087",
-"<@ c #4CFFD0",
-"[@ c #F3F84E",
-"}@ c #CCCBD0",
-"|@ c #C2C0BF",
-"1@ c #473C35",
-"2@ c #4399A9",
-"3@ c #69C1D2",
-"4@ c #9E9696",
-"5@ c #2F4847",
-"6@ c #59BD95",
-"7@ c #65FFB6",
-"8@ c #B7ED54",
-"9@ c #E4F95D",
-"0@ c #CBDCE7",
-"a@ c #7FD4FF",
-"b@ c #75B1D8",
-"c@ c #030000",
-"d@ c #245A65",
-"e@ c #5DF0FF",
-"f@ c #59AEBF",
-"g@ c #2D2728",
-"h@ c #9E9B9C",
-"i@ c #50C1A2",
-"j@ c #E2ED29",
-"k@ c #CEE939",
-"l@ c #E2F95F",
-"m@ c #81CEFF",
-"n@ c #4681C1",
-"o@ c #338493",
-"p@ c #6097A1",
-"q@ c #14090A",
-"r@ c #59C99E",
-"s@ c #615664",
-"t@ c #959295",
-"u@ c #7E8943",
-"v@ c #D3EE38",
-"w@ c #7BD1FF",
-"x@ c #57BFFF",
-"y@ c #5BE9FF",
-"z@ c #58ACBC",
-"A@ c #372C2D",
-"B@ c #5CA28D",
-"C@ c #C9DA34",
-"D@ c #6C6C6C",
-"E@ c #939298",
-"F@ c #9FAF45",
-"G@ c #E7FF5F",
-"H@ c #7FCEFF",
-"I@ c #718EA2",
-"J@ c #544B43",
-"K@ c #7AC0EE",
-"L@ c #81CAFF",
-"M@ c #83C8FF",
-"N@ c #5FE0FF",
-"O@ c #5AE3FE",
-"P@ c #5AE7FD",
-"Q@ c #5CFFFF",
-"R@ c #37191C",
-"S@ c #52BD9E",
-"T@ c #BCF251",
-"U@ c #CCE93C",
-"V@ c #CFEB39",
-"W@ c #C1DA3B",
-"X@ c #59566B",
-"Y@ c #858A68",
-"Z@ c #D1D1D2",
-"`@ c #94D3FD",
-" # c #37434B",
-".# c #7E7C7A",
-"+# c #71A8E7",
-"@# c #94D1F7",
-"## c #72E4F8",
-"$# c #75E2F8",
-"%# c #74E1F9",
-"&# c #74FBEB",
-"*# c #6DFACD",
-"=# c #EAF958",
-"-# c #E7F864",
-";# c #E6F764",
-"># c #D1E660",
-",# c #858488",
-"'# c #A3A3A3",
-")# c #B3B3B3",
-"!# c #D1D1D0",
-"~# c #CFCFCF",
-"{# c #CFCECC",
-"]# c #D7C8DB",
-"^# c #21FA25",
-"/# c #D8C9DB",
-"(# c #CECECE",
-"_# c #797979",
-":# c #6D6D6D",
-"<# c #6B6B6B",
-"[# c #716371",
-"}# c #02DC02",
-"|# c #6A6A6A",
-"1# c #808080",
-"2# c #232323",
-"3# c #262626",
-"4# c #292329",
-"5# c #A5A5A5",
-"6# c #A7A7A7",
-"7# c #ACACAC",
-"8# c #5F5F5F",
-"9# c #BCBCBC",
-"0# c #9F9F9F",
-"a# c #A0A0A0",
-"b# c #919191",
-" ",
-" . + + + + + + + + + + + + + + + + + + + + + + + + + + + @ # ",
-" + $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } } } } | 1 2 ",
-" + % 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n n n n o p 2 ",
-" + & q r s t u v w x y z A B C D E F G H I J K L L L L M N 2 ",
-" + & O P Q R S T U y V W X Y Z E K G ` I L K L L L K ...+.2 ",
-" + = @.#.$.%.&.*.=.-.;.>.,.'.).!.G H I J K L L L K K ~.{.].2 ",
-" + ^./.$.(._.:.<.[.;.}.|.1.2.3.G ` I L K L L L K J 4.5.6.7.2 ",
-" + > 8.9._.0.a.b.c.d.e.f.g.h.i.H I J K L L L K K 4.j.k.l.+.2 ",
-" + m.n.o.:.a.p.q.r.s.t.u.v.i.` I L K L L L K J 4.w.x.L M N 2 ",
-" + y.z.A.a.B.p.C.D.E.F.G.H.I.I J K L L L K K 4.j.x.J K M N 2 ",
-" + ! J.K.p.p.L.M.N.O.P.Q.R.S.T.K L L L K J 4.w.x.L K U.V.N 2 ",
-" + W.X.B.p.Y.Z.`. +.+++ at +#+$+%+&+K L K K 4.j.x.J K L *+=+-+2 ",
-" + ;+d p.L.Z.>+,+J I '+)+!+~+{+]+&+K J 4.^+x.L K L /+(+_+-+2 ",
-" + ;+:+<+M.`.,+F I ` G [+J }+|+{+%+1+2+3+x.J K 4+5+6+7+8+-+2 ",
-" + 9+0+a+b+ +J I H G 1+L K K }+~+{+c+d+x.L K L T.e+f+g+h+i+2 ",
-" + j+k+l+m+.+I ` G K L L L K n+o+p+q+r+n+K K s+t+u+v+w+x+y+2 ",
-" + z+A+B+J I H G 1+L L L L s+C+D+E+F+G+H+&+s+I+J+K+L+M+N+y+2 ",
-" + O+P+F I ` G K L L L K s+Q+R+S+T+}+U+V+W+X+Y+Z+`+ @. at +@y+2 ",
-" + @@#@I H G 1+L L L L s+$@R+%@&@L K }+F+*@=@-@;@>@,@'@)@!@2 ",
-" + ~@{@` G K L L L K s+Q+R+S+&@K L K n+]@^@/@(@_@,@:@<@[@}@2 ",
-" + |@1 at G 1+L L L L s+$@R+%@&@1+L L s+I+J+2 at 3@4 at 5@6 at 7@8 at 9@}@2 ",
-" + 0 at a@K L L L K s+Q+R+S+&@K L L 4+b at c@d at e@f at g@h at i@j at k@l@}@2 ",
-" + } n L L L L s+$@R+%@&@1+L L L m at n@o at e@p at q@r at s@t at u@v at l@}@2 ",
-" + } n L L K s+Q+R+S+&@K L L U./+w at x@y at z@A at B@7 at C@D at E@F at G@}@2 ",
-" + } n L L H at I@R+J at K@1+L U.L at M@N at O@P at Q@R at S@T at U@V at W@X at E@Y at Z@2 ",
-" + | o M M `@ #.#+#@#M M V.=+##$#%#&#N++@*#=#l at -#;#>#,#'#)#2 ",
-" @ 1 p N N N !#~#{#N N N N -+-+-+-+y+y+y+!@}@]#^#^#/#~#(#(#_# ",
-" # 2 :#<#<#<#<#<#<#<#<#<#<#<#<#<#<#<#<#<#<#<#[#}#}#[#|## _#1# ",
-" 2#3#3#3#3#3#3#3#3#3#3#3#3#3#3#3#3#3#3#3#3#4#4#3#3# ",
-" 5#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#7#8# ",
-" 9#0#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#a#0#b# "};
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index e7b8b5f..e5c9b0a 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,5 +1,5 @@
debian/templates/CQ_1.templ
-debian/templates/simple replay.templ
+debian/templates/simple_replay.templ
debian/templates/im_reply.templ
debian/templates/CQ_2.templ
debian/templates/comment.templ
diff --git a/debian/templates/simple replay.templ b/debian/templates/simple_replay.templ
similarity index 100%
rename from debian/templates/simple replay.templ
rename to debian/templates/simple_replay.templ
diff --git a/qsstv/widgets/imageviewer.cpp b/qsstv/widgets/imageviewer.cpp
index 289c503..54b8a13 100644
--- a/qsstv/widgets/imageviewer.cpp
+++ b/qsstv/widgets/imageviewer.cpp
@@ -518,7 +518,7 @@ void imageViewer::slotProperties()
"File: " + imageFileName
+ "\n File size: " + QString::number(fi.size())
+ "\n Image width: " + QString::number(orgWidth)
- + "\n Image heigth: " + QString::number(orgHeight)
+ + "\n Image height: " + QString::number(orgHeight)
+ "\n Last Modified: " + fi.lastModified().toString()
,QMessageBox::Ok);
}
@@ -526,7 +526,7 @@ void imageViewer::slotProperties()
{
QMessageBox::information(this,"Image Properties",
" Image width: " + QString::number(orgWidth)
- + "\n Image heigth: " + QString::number(orgHeight)
+ + "\n Image height: " + QString::number(orgHeight)
,QMessageBox::Ok);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/qsstv.git
More information about the pkg-hamradio-commits
mailing list