diff --git a/dist/debian/changelog b/dist/debian/changelog index b32c39c..1001f22 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,3 +1,52 @@ +spek (0.8.5+dfsg-2) unstable; urgency=high + + * debian/patches/: + - Add temporary fix to build on arm64 and mips64el + architectures (01_arm64-mips64el.patch). + + -- Matteo Bini Fri, 27 Jan 2023 12:32:59 +0100 + +spek (0.8.5+dfsg-1) unstable; urgency=low + + * New upstream release (Closes: #1007814). + * debian/compat: + - Replace compat file with debhelper-compat virtual package. + * debian/control: + - Change maintainer. + - Remove autotools-dev from Build-Depends. + - Update Build-Depends debhelper (>= 9) to debhelper-compat (= 13). + - Update Build-Depends libwxgtk3.0-dev to libwxgtk3.2-dev + (Closes: #933438). + - Update Build-Depends libavcodec-dev, libavformat-dev and libavutil-dev + min version to 7:5.0.1. + - Bump Standards-Version to 4.6.2. + - Add Rules-Requires-Root field (no). + * debian/copyright: + - Rewrite file to be machine-readable. + * debian/docs: + - Add LICENCE.md, MANUAL.md and README.md as doc files to be installed. + * debian/patches/: + - Delete old patches since there is no more need for them, and add new + DFSG one. + * debian/rules: + - Add hardening flags. + - Remove verbose variable. + * debian/spek.install: + - Delete install file due to xpm file removal: the xpm line was the only + one of the file. + * debian/spek.menu: + - Delete menu file due to Technical Committee decision. + * debian/spek.xpm: + - Delete xpm file due to menu file removal. + * debian/upstream/metadata: + - Add basic upstream meta-information. + * debian/watch: + - Bump version to 4. + - Change link to the new GitHub repository since Google Code has closed + down. + + -- Matteo Bini Mon, 16 Jan 2023 21:59:10 +0100 + spek (0.8.2-4) unstable; urgency=low * Fix build with FFmpeg 2.9 (Closes: #803861) diff --git a/dist/debian/compat b/dist/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/dist/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dist/debian/control b/dist/debian/control index aff358e..126cd39 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -1,19 +1,18 @@ Source: spek Section: sound Priority: optional -Maintainer: Alexander Kojevnikov -Build-Depends: debhelper (>= 9), - autotools-dev, +Maintainer: Matteo Bini +Build-Depends: debhelper-compat (= 13), + gettext, pkg-config, - libavcodec-dev (>= 6:0.8), - libavformat-dev (>= 6:0.8), - libavutil-dev (>= 6:0.8), - libwxgtk3.0-dev, + libavcodec-dev (>= 7:5.0.1), + libavformat-dev (>= 7:5.0.1), + libavutil-dev (>= 7:5.0.1), + libwxgtk3.2-dev, wx-common -Standards-Version: 3.9.6 +Standards-Version: 4.6.2 Homepage: http://spek.cc/ -Vcs-Git: git://github.com/alexkay/spek.git -Vcs-Browser: https://github.com/alexkay/spek +Rules-Requires-Root: no Package: spek Architecture: any diff --git a/dist/debian/copyright b/dist/debian/copyright index e8426be..dc37e68 100644 --- a/dist/debian/copyright +++ b/dist/debian/copyright @@ -1,47 +1,57 @@ -This work was packaged for Debian by: +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Spek +Upstream-Contact: Alexander Kojevnikov +Source: http://spek.cc/ +Files-Excluded: dist lic web +Comment: Non-source files and files where the license is not clear. - Alexander Kojevnikov on Mon, 14 Mar 2011 21:05:52 +0800 +Files: * +Copyright: © 2010-2013 Alexander Kojevnikov and contributors +License: GPL-3+ -It was downloaded from: +Files: po/bs.po + po/ca.po + po/cs.po + po/da.po + po/de.po + po/el.po + po/eo.po + po/es.po + po/fi.po + po/fr.po + po/gl.po + po/he.po + po/hr.po + po/hu.po + po/id.po + po/it.po + po/ja.po + po/ko.po + po/lv.po + po/nb.po + po/nl.po + po/nn.po + po/pl.po + po/pt_BR.po + po/ru.po + po/sk.po + po/spek.pot + po/sr@latin.po + po/sv.po + po/th.po + po/tr.po + po/uk.po + po/vi.po + po/zh_CN.po + po/zh_TW.po +Copyright: © YEAR The Spek authors +License: GPL-3+ - http://spek.cc/ - -Upstream Author: - - Alexander Kojevnikov - -Copyright: - - For everything not noted below: - Copyright (C) 2010-2013 Alexander Kojevnikov - - For src/spek-pipeline.c: - Copyright (C) 2010-2012 Alexander Kojevnikov - Copyright (C) 2007-2009 Sebastian Dröge - Copyright (C) 2006 Stefan Kost - Copyright (C) 1999 Erik Walthinsen - -License: - - 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 package 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 . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -The Debian packaging is: - - Copyright (C) 2011-2012 Alexander Kojevnikov - -and is licensed under the GPL version 3 or any later version, see above. +Files: debian/* +Copyright: © 2011-2012 Alexander Kojevnikov + © 2023 Matteo Bini +License: GPL-3+ +License: GPL-3+ + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/dist/debian/docs b/dist/debian/docs new file mode 100644 index 0000000..25693a1 --- /dev/null +++ b/dist/debian/docs @@ -0,0 +1,3 @@ +LICENCE.md +MANUAL.md +README.md diff --git a/dist/debian/patches/00_dfsg.patch b/dist/debian/patches/00_dfsg.patch new file mode 100644 index 0000000..4384fc1 --- /dev/null +++ b/dist/debian/patches/00_dfsg.patch @@ -0,0 +1,19 @@ +Author: Matteo Bini +Description: Remove DFSG excluded files for Autoconf +Forwarded: not-needed +--- a/configure.ac ++++ b/configure.ac +@@ -81,13 +81,10 @@ AC_CONFIG_FILES([ + data/icons/32x32/Makefile + data/icons/48x48/Makefile + data/icons/scalable/Makefile +- dist/osx/Info.plist +- dist/win/spek.wxs + man/Makefile + po/Makefile.in + src/Makefile + tests/Makefile +- web/version + ]) + AC_OUTPUT + diff --git a/dist/debian/patches/01_arm64-mips64el.patch b/dist/debian/patches/01_arm64-mips64el.patch new file mode 100644 index 0000000..1ad6647 --- /dev/null +++ b/dist/debian/patches/01_arm64-mips64el.patch @@ -0,0 +1,15 @@ +Author: MikeWang000000 https://github.com/MikeWang000000 +Bug: https://github.com/alexkay/spek/issues/262 +Description: Build on arm64 and mips64el +Forwarded: https://github.com/alexkay/spek/pull/232#issuecomment-1399878689 +--- a/tests/test-fft.cc ++++ b/tests/test-fft.cc +@@ -62,7 +62,7 @@ static void test_sine() + if (i == k) { + continue; + } +- if (plan->get_output(i) > -150.0f) { ++ if (plan->get_output(i) > -149.0f) { + silence = false; + break; + } diff --git a/dist/debian/patches/ffmpeg_2.9.patch b/dist/debian/patches/ffmpeg_2.9.patch deleted file mode 100755 index e5c493a..0000000 --- a/dist/debian/patches/ffmpeg_2.9.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun -Last-Update: <2015-11-02> - ---- spek-0.8.2.orig/src/spek-audio.cc -+++ spek-0.8.2/src/spek-audio.cc -@@ -199,7 +199,7 @@ AudioFileImpl::AudioFileImpl( - this->packet.data = nullptr; - this->packet.size = 0; - this->offset = 0; -- this->frame = avcodec_alloc_frame(); -+ this->frame = av_frame_alloc(); - this->buffer_size = 0; - this->buffer = nullptr; - this->frames_per_interval = 0; -@@ -215,7 +215,7 @@ AudioFileImpl::~AudioFileImpl() - if (this->frame) { - // TODO: Remove this check after Debian switches to libav 9. - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) -- avcodec_free_frame(&this->frame); -+ av_frame_free(&this->frame); - #else - av_freep(&this->frame); - #endif -@@ -255,7 +255,7 @@ int AudioFileImpl::read() - - for (;;) { - while (this->packet.size > 0) { -- avcodec_get_frame_defaults(this->frame); -+ av_frame_unref(this->frame); - auto codec_context = this->format_context->streams[this->audio_stream]->codec; - int got_frame = 0; - int len = avcodec_decode_audio4(codec_context, this->frame, &got_frame, &this->packet); - diff --git a/dist/debian/patches/fix-compilation-with-libav-8.patch b/dist/debian/patches/fix-compilation-with-libav-8.patch deleted file mode 100644 index 429c214..0000000 --- a/dist/debian/patches/fix-compilation-with-libav-8.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Alexander Kojevnikov -Description: Fix compilation with Libav 8 -Bug-Debian: http://bugs.debian.org/721025 - ---- a/src/spek-fft.cc -+++ b/src/spek-fft.cc -@@ -17,6 +17,7 @@ - */ - - #include -+#include - - #define __STDC_CONSTANT_MACROS - extern "C" { diff --git a/dist/debian/patches/series b/dist/debian/patches/series index a1e29d9..0df07af 100644 --- a/dist/debian/patches/series +++ b/dist/debian/patches/series @@ -1,3 +1,2 @@ -fix-compilation-with-libav-8.patch -ffmpeg_2.9.patch - +00_dfsg.patch +01_arm64-mips64el.patch diff --git a/dist/debian/rules b/dist/debian/rules index 4d16f26..3f3eb6b 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export V=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ diff --git a/dist/debian/spek.install b/dist/debian/spek.install deleted file mode 100644 index 244e2b9..0000000 --- a/dist/debian/spek.install +++ /dev/null @@ -1 +0,0 @@ -debian/spek.xpm usr/share/pixmaps diff --git a/dist/debian/spek.menu b/dist/debian/spek.menu deleted file mode 100644 index 3aaa672..0000000 --- a/dist/debian/spek.menu +++ /dev/null @@ -1,7 +0,0 @@ -?package(spek):\ -needs="X11"\ -section="Applications/Sound"\ -title="Spek"\ -longtitle="Spectrum analyser"\ -icon="/usr/share/pixmaps/spek.xpm"\ -command="/usr/bin/spek" diff --git a/dist/debian/spek.xpm b/dist/debian/spek.xpm deleted file mode 100644 index 6717293..0000000 --- a/dist/debian/spek.xpm +++ /dev/null @@ -1,233 +0,0 @@ -/* XPM */ -static char * spek_xpm[] = { -"32 32 198 2", -" c None", -". c #000000", -"+ c #D4887B", -"@ c #D4877A", -"# c #C56A61", -"$ c #EAB4A1", -"% c #F1C2AD", -"& c #FEDEC5", -"* c #FFE1C8", -"= c #FDDCC4", -"- c #F0C1AC", -"; c #E9B29F", -"> c #EDBBA7", -", c #FFE2C9", -"' c #FFDFC6", -") c #FFE0C7", -"! c #EBB8A4", -"~ c #DC9888", -"{ c #FDDBC2", -"] c #FBD7BF", -"^ c #D78F81", -"/ c #85695E", -"( c #FFE3C9", -"_ c #70574E", -": c #191513", -"< c #FFE5CB", -"[ c #FFE1C7", -"} c #0E0D0B", -"| c #D2B7A3", -"1 c #FCDCC3", -"2 c #F8D9C1", -"3 c #C1A895", -"4 c #483F38", -"5 c #FFDEC5", -"6 c #FFDDC4", -"7 c #DDC0AB", -"8 c #D6BBA6", -"9 c #FFE2C8", -"0 c #C8B09C", -"a c #E9CBB4", -"b c #FFE8CE", -"c c #362F2A", -"d c #A69181", -"e c #FEDDC4", -"f c #FFDCC3", -"g c #FFDAC3", -"h c #FFDBC3", -"i c #FEDCC4", -"j c #EDCEB7", -"k c #FFDAC2", -"l c #FFDEC4", -"m c #958273", -"n c #D1B6A2", -"o c #FFD6BF", -"p c #FFD2BC", -"q c #FFD2BB", -"r c #FFD4BD", -"s c #5D4E45", -"t c #EBCDB6", -"u c #D6BAA5", -"v c #766459", -"w c #FFD9C1", -"x c #FFD3BD", -"y c #FFD3BC", -"z c #C0A794", -"A c #FFCCB7", -"B c #FFC6B3", -"C c #FFC5B2", -"D c #FFC8B4", -"E c #897064", -"F c #0E0908", -"G c #F9DCC3", -"H c #FEE0C7", -"I c #FEDFC6", -"J c #EACFB7", -"K c #070303", -"L c #A08476", -"M c #FFD0BA", -"N c #FFCCB8", -"O c #C5AB98", -"P c #B9A08E", -"Q c #FFD7C0", -"R c #FFCEB8", -"S c #FFC1AF", -"T c #FFB9A9", -"U c #FFB7A8", -"V c #FFBDAC", -"W c #FEC7B3", -"X c #FFD9C2", -"Y c #FEC5B1", -"Z c #F0A094", -"` c #F39A90", -" . c #F49A91", -".. c #F19F94", -"+. c #FEC0AD", -"@. c #FFC7B3", -"#. c #FFBBAB", -"$. c #FFC2B0", -"%. c #FFCEB9", -"&. c #FED8C1", -"*. c #A89182", -"=. c #7A695D", -"-. c #FFC9B5", -";. c #FFB0A4", -">. c #FFAFA2", -",. c #FFB5A6", -"'. c #F2AA9B", -"). c #FEA89D", -"!. c #FEADA1", -"~. c #FFAEA2", -"{. c #FFABA0", -"]. c #F0A395", -"^. c #FFB4A5", -"/. c #FFBBAA", -"(. c #FFD8C1", -"_. c #6A5A51", -":. c #010000", -"<. c #AF665D", -"[. c #FFBAAB", -"}. c #FFB1A3", -"|. c #FFB4A6", -"1. c #FDC0AE", -"2. c #F6978F", -"3. c #FEAA9F", -"4. c #FDAB9F", -"5. c #FFB0A3", -"6. c #FEACA0", -"7. c #FA9C93", -"8. c #F9B7A6", -"9. c #FFAEA1", -"0. c #FFBAAA", -"a. c #FFCAB6", -"b. c #9B4B45", -"c. c #EEB3A0", -"d. c #FFCDB9", -"e. c #FFC0AF", -"f. c #FFB8A8", -"g. c #FFB6A7", -"h. c #F3B0A0", -"i. c #FFA89D", -"j. c #FFB2A6", -"k. c #9F1C1D", -"l. c #D8746D", -"m. c #CC605B", -"n. c #AB2F2E", -"o. c #FFB1A5", -"p. c #FFA79C", -"q. c #F4AC9D", -"r. c #FFB5A7", -"s. c #EBAC9A", -"t. c #F8C6B1", -"u. c #FECBB6", -"v. c #FFC4B2", -"w. c #FFC3B1", -"x. c #FFC7B4", -"y. c #FDCDB8", -"z. c #F59A90", -"A. c #FFACA1", -"B. c #F29A90", -"C. c #FCA99E", -"D. c #F49E93", -"E. c #FFACA0", -"F. c #FA9F95", -"G. c #F8C3AF", -"H. c #F6C1AD", -"I. c #F8C7B2", -"J. c #FFD1BB", -"K. c #FFD8C0", -"L. c #F0B1A0", -"M. c #FEAB9F", -"N. c #EEA89A", -"O. c #FFD1BA", -"P. c #F6C2AF", -"Q. c #EDB6A3", -"R. c #FFDEC6", -"S. c #FEDAC2", -"T. c #FFDCC4", -"U. c #F1BBA7", -"V. c #F1A095", -"W. c #F49C91", -"X. c #F59C93", -"Y. c #F19F93", -"Z. c #F0B5A3", -"`. c #FFDDC5", -" + c #EBB09E", -".+ c #D7887B", -"++ c #EEBCA8", -"@+ c #FFE0C6", -"#+ c #FDDEC5", -"$+ c #FCDDC3", -"%+ c #EDBAA6", -"&+ c #D17D71", -"*+ c #E3A796", -"=+ c #ECB9A5", -"-+ c #EFC0AB", -";+ c #EFBFAA", -">+ c #ECB8A4", -",+ c #E3A493", -" ", -" ", -" ", -" ", -" . . . . . . ", -" . . . . . . . . . ", -" . . . . . . ", -" . . . . ", -" . + @ . ", -" . # $ % & * * * * = - ; . ", -" . > , ' ' ' ' ' ' ' ' ' ' ) ! . ", -" . . ~ { & ' ' ' ' ' ' ' ' ' ' ' ' ' ] ^ . . ", -" . . . . . / ( & ' ' ' ' ' ' ' ' ' ' ' ' ' ' & * _ . . . . ", -" . . . . : < & ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' & [ } . . . . ", -". . . . . | & ' ' ' ' & & 1 & ' ' & 2 * ' ' ' ' ' & 3 . . . . . ", -". . . . 4 < 5 6 5 5 5 5 7 8 ) ' ' 9 0 a 5 5 5 5 6 5 b c . . . . ", -". . . . d e 6 f g g h i ) j ' ' ' ) a , i h k g f l e m . . . . ", -". . . . n 6 k o p q r h s . t ' ' u . v w x p y o k 6 z . . . . ", -". . . . u k r A B C D q E F G H I J K L M D C B N r h O . . . . ", -" . . . P Q R S T U V W X Y Z ` ...+.X @.#.U T $.%.&.*.. . . ", -" . . =.o -.#.;.>.,.$.'.).!.~.~.!.{.].$.^.~.;./.-.(._.:.. ", -" <.g -.[.}.~.|.1.2.3.4.;.5.6.3.7.8.^.9.5.0.a.Q b. ", -" c.d.e.f.g.#.h.i.j.k.l.m.n.o.p.q.[.r.f.S %.s. ", -" t.u.v.w.x.y.z.A.B.!.C.D.E.F.G.@.w.v.u.H. ", -" I.q J.p K.L.M.!.~.~.!.~.N.w p O.p P. ", -" Q.R.S.T.[ U.V.W.X.Y.Z.9 T.S.`. + ", -" .+++@+[ I ( #+$+( ' [ `.%+&+ ", -" *+=+-+% % ;+>+,+ ", -" ", -" ", -" ", -" "}; diff --git a/dist/debian/upstream/metadata b/dist/debian/upstream/metadata new file mode 100644 index 0000000..af23a15 --- /dev/null +++ b/dist/debian/upstream/metadata @@ -0,0 +1,7 @@ +Name: Spek +Bug-Database: https://github.com/alexkay/spek/issues +Contact: Alexander Kojevnikov +Donation: Upstream would appreciate a donation to Ukraine's defenders, see https://war.ukraine.ua/donate/ +Repository: https://github.com/alexkay/spek.git +Repository-Browse: https://github.com/alexkay/spek +Screenshots: http://spek.cc/#screenshots diff --git a/dist/debian/watch b/dist/debian/watch index 4a3ebf1..ba29963 100644 --- a/dist/debian/watch +++ b/dist/debian/watch @@ -1,3 +1,3 @@ -version=3 -http://code.google.com/p/spek/downloads/list \ - .*/spek-([0-9.]+)\.tar\.xz +version=4 +opts=repack,repacksuffix=+dfsg,compression=xz,dversionmangle=auto \ + https://github.com/alexkay/spek/tags .*/v?(\d\S+)\.tar\.gz