From: John Wright Date: Thu, 29 Dec 2011 00:50:50 +0000 (-0800) Subject: Merge commit '0.99.2' X-Git-Tag: 0.99.2-1~4 X-Git-Url: http://git.johnwright.org/?p=fmit.git;a=commitdiff_plain;h=49947d1cd4506f5574b3be62ee90e9f00227d9fd;hp=a8fb82288feb6b258f2c04312f0c36ba8d79b494 Merge commit '0.99.2' --- diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..052c2ed --- /dev/null +++ b/debian/changelog @@ -0,0 +1,91 @@ +fmit (0.97.7-3) unstable; urgency=low + + * Change Build-Depends on fftw3-dev to libfftw3-dev, to avoid depending + on a virtual package + * Upgrade to "3.0 (quilt)" source format + * Update debhelper compatibility level to 7 and use dh + * Update Standards-Version to 3.8.4 + * Correct build and runtime issues with jackd2. Thanks to Adrian + Knoth for the patch. (Closes: #561415, #581276) + * debian/menu: Fix syntax errors (thanks, lintian) + + -- John Wright Mon, 17 May 2010 00:18:26 -0600 + +fmit (0.97.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS on GNU/kFreeBSD (Closes: #542540): + - Add a include (for exit) to src/main.cc. + + -- Cyril Brulebois Mon, 21 Dec 2009 09:36:33 +0100 + +fmit (0.97.7-2) unstable; urgency=low + + * Update Standards-Version to 3.7.3 (no changes needed to be made) + * Promote XS-Vcs-* fields to Vcs-* fields, since they are now natively + supported by dpkg. + * Use a Homepage field instead of a pseudo-field in the Description + * Remove dpatch dependency and references in debian/rules (no upstream + patches right now, and when I need some, I'll probably be using quilt) + * Don't ignore a make clean error (check for the existance of Makefile + instead) + + -- John Wright Wed, 02 Jan 2008 13:29:01 -0700 + +fmit (0.97.7-1) unstable; urgency=low + + * New upstream version + + -- John Wright Fri, 23 Nov 2007 13:56:36 -0700 + +fmit (0.97.6-3) unstable; urgency=low + + * debian/control: + - Update my email address + - Update the XS-Vcs-* fields to indicate my new revision control system and + URIs + - Clarify the Description field a bit + * debian/rules: + - Add some hg cleanup stuff to the 'clean' target + + -- John Wright Tue, 18 Sep 2007 00:41:36 -0600 + +fmit (0.97.6-2) unstable; urgency=low + + * New maintainer. (Closes: 429756) + * Allow building on platforms without ALSA, thanks to Cyril Brulebois. + (Closes: 414391) + * Add XS-Vcs-Svn and XS-Vcs-Browser fields. + + -- John Wright Fri, 22 Jun 2007 17:03:48 +0100 + +fmit (0.97.6-1) unstable; urgency=low + + * New upstream version. Closes: #421099. + * upstream-fix: Immediate segfault problem. Closes: #403567. + * debian/patches/01_Upstream_TODO.dpatch: Update for new TODO file. + + -- Ludovic RESLINGER Sat, 16 Jun 2007 23:52:33 +0200 + +fmit (0.96.7-1) unstable; urgency=high + + * New upstream version. + * upstream-fix: Alsa bug in case of multiple channels. Closes: #400483. + * debian/control: Add Build-Dependency on fftw3-dev, required with new + version. + * debian/rules: Change QTDIR by --with-Qt-dir for ./configure. + * debian/patches/01_Upstream_TODO.dpatch: Update for new TODO file. + + -- Ludovic RESLINGER Sat, 09 Dec 2006 14:50:20 +0100 + +fmit (0.96.5-1) unstable; urgency=low + + * Initial release: Closes: #280876 Closes: #380500. + * debian/docs: Remove README and NEWS because upstream's files are empty. + * debian/rules: Add QTDIR=/usr/share/qt3 to ./configure. + * Add debian/fmit.1: Manpage for fmit. + * Add dpatch packaging system. + * Add patches/01_Upstream_TODO.dpatch: Traducting some parts of TODO in + english. + + -- Ludovic RESLINGER Sun, 13 Aug 2006 15:28:57 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c8abc7c --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: fmit +Section: sound +Priority: optional +Maintainer: John Wright +Build-Depends: debhelper (>= 7.0.50), autotools-dev, libqt3-mt-dev, libfftw3-dev, freeglut3-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev +Standards-Version: 3.8.4 +Homepage: http://home.gna.org/fmit/ +Vcs-Git: git://git.johnwright.org/git/fmit.git +Vcs-Browser: http://git.johnwright.org/?p=fmit.git + +Package: fmit +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Free Music Instrument Tuner + fmit is a graphical utility for tuning your musical instruments, with + error and volume history and advanced features like waveform shape, + harmonics ratio (formants), and microtonal tuning. + . + fmit uses Qt for its GUI and ALSA (where available) or JACK as its + sound input library. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7adf631 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,144 @@ +This package was debianized by Ludovic RESLINGER on +Sun, 13 Aug 2006 15:28:57 +0200. + +It was downloaded from http://download.gna.org/fmit/ + +Upstream Author: Gilles DEGOTTEX + +License: + + This package 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 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +Other Licenses: + + - LGPL v2 or higher + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + + The following files are licensed under LGPL: + - libs/CppAddons/Singleton.h + - libs/CppAddons/Random.{h,cpp} + - libs/CppAddons/Math.{h,cpp} + - libs/CppAddons/StringAddons.h + - libs/CppAddons/Observer.h + - libs/Music/FreqAnalysis.{h,cpp} + - libs/Music/Correlation.{h,cpp} + - libs/Music/TimeAnalysis.{h,cpp} + - libs/Music/AutocorrelationAlgo.{h,cpp} + - libs/Music/MultiCorrelationAlgo.{h,cpp} + - libs/Music/Algorithm.{h,cpp} + - libs/Music/BubbleAlgo.{h,cpp} + - libs/Music/Convolution.{h,cpp} + - libs/Music/Music.{h,cpp} + - src/CaptureThread.{h,cpp} + - src/GLGraph.{h,cpp} + - src/View.{h,cpp} + + - MIT/X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + The following file is licensed under MIT Licence: + - install-sh + +All others files are licenced under GPLv2 Licence. + +Debian packaging is (C) 2006, Ludovic RESLINGER and +is licensed under the GPLv2, see above. + +Copyright notices: + + - libs/CppAddons/Singleton.h + libs/CppAddons/Random.{h,cpp} + libs/CppAddons/Math.{h,cpp} + libs/CppAddons/StringAddons.h + libs/CppAddons/Observer.h + libs/Music/FreqAnalysis.{h,cpp} + libs/Music/Correlation.{h,cpp} + libs/Music/TimeAnalysis.{h,cpp} + libs/Music/AutocorrelationAlgo.{h,cpp} + libs/Music/MultiCorrelationAlgo.{h,cpp} + libs/Music/Algorithm.{h,cpp} + libs/Music/BubbleAlgo.{h,cpp} + libs/Music/Convolution.{h,cpp} + libs/Music/Music.{h,cpp}: + Copyright (C) 2004 Gilles DEGOTTEX + - src/CaptureThread.{h,cpp} + Copyright (C) 2004 Gilles DEGOTTEX + - src/GLGraph.{h,cpp}: + Copyright (C) 2004-2005 Gilles DEGOTTEX + - src/View.{h,cpp}: + Copyright (C) 2005 Gilles DEGOTTEX + - src/CustomInstrumentTunerForm.{h,cpp} + src/main.cpp + src/GLErrorHistory.{h,cpp} + src/GLSample.{h,cpp} + src/GLVolumeHistory.{h,cpp} + src/DialView.h + src/GLFormants.{h,cpp} + src/MicrotonalView.{h,cpp}: + Copyright (C) 2004 Gilles DEGOTTEX + - m4/Makefile.in + tr/Makefile.in + ui/Makefile.in + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + - aclocal.m4: + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + - configure: + Copyright (C) 2003 Free Software Foundation, Inc. + - COPYING: + Copyright (C) 1989-1991 Free Software Foundation, Inc. + - INSTALL: + Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + - Makefile.in: + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + - depcomp + Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. + - missing: + Copyright (C) 1996 Fran,cois Pinard + Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + - install-sh: + Copyright (C) 1994 X Consortium diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..1333ed7 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +TODO diff --git a/debian/fmit.1 b/debian/fmit.1 new file mode 100644 index 0000000..b14ccdd --- /dev/null +++ b/debian/fmit.1 @@ -0,0 +1,88 @@ +.\" Copyright (C) 2006 Ludovic RESLINGER +.\" +.\" This is free documentation; 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. +.\" +.\" The GNU General Public License's references to "object code" +.\" and "executables" are to be interpreted as the output of any +.\" document formatting or typesetting system, including +.\" intermediate and printed output. +.\" +.\" This manual 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 manual; if not, write to the Free +.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, +.\" USA. +.\" +.TH fmit 1 "August 13, 2006" +.SH NAME +fmit \- Free Music Instrument Tuner +.SH SYNOPSIS +.B fmit +.br +There are no command line options. +.SH DESCRIPTION +The +.B Free Music Instrument Tuner (fmit) +is a graphical sofware for tuning your music instrument using +QT as gui library. +.br +For the sound input library you can choise to use ALSA or JACK. +.br +.B fmit +contain all features of a standard hardware instrument tuner. +.PP +You choise the tuning frequency corresponding at your tuning note, +and when you play it, fmit display your error margin. +.PP +Other views are availables, corresponding to more advanced +and specific features like a microtonal tuning with more precision about +you error margin, and a view of the harmonics ratio. +.br +Currently 6 views are availables: +.TS +tab (@); +l l. +1@A small view of the captured sound. +2@An history of the pitch error. +3@An history of the sound volume. +4@The shape of the wave-length. +5@Harmonics ratio (the formants). +6@A microtonal tuning view. +.TE +.SH BUGS +Please send bug reports or any other feedback to the fmit mailing-lists: +.br +.B \& +: For bug reports and other problems. +.br +.B \& +: For CVS commits. +.br +Or contact Gilles DEGOTTEX +.B . +.SH AUTHOR +.B fmit +is written and maintained by Gilles DEGOTTEX +.B . +.SH HOME PAGE +.B fmit +can be found at: +.br +.B \& +.SH COPYRIGHT +Copyright (C) 2004-2006 Gilles DEGOTTEX +.B +.br +Licensed under the +.B GNU Public License V2. +.PP +This manual page was written by Ludovic RESLINGER +.B , +for the Debian project (but may be used by others). diff --git a/debian/fmit.manpages b/debian/fmit.manpages new file mode 100644 index 0000000..f2a8884 --- /dev/null +++ b/debian/fmit.manpages @@ -0,0 +1 @@ +debian/fmit.1 diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..8d55f97 --- /dev/null +++ b/debian/menu @@ -0,0 +1 @@ +?package(fmit):needs="X11" section="Applications/Sound" title="fmit" command="/usr/bin/fmit" diff --git a/debian/patches/include-cstdlib.patch b/debian/patches/include-cstdlib.patch new file mode 100644 index 0000000..2ec7a01 --- /dev/null +++ b/debian/patches/include-cstdlib.patch @@ -0,0 +1,15 @@ +Fix FTBFS on GNU/kFreeBSD (Closes: #542540): + +Add a include (for exit) to src/main.cc. Patch from +Cyril Brulebois . + +--- fmit-0.97.7.orig/src/main.cpp ++++ fmit-0.97.7/src/main.cpp +@@ -20,6 +20,7 @@ + #include "config.h" + + #include ++#include + using namespace std; + #include + #include diff --git a/debian/patches/jackd2.patch b/debian/patches/jackd2.patch new file mode 100644 index 0000000..ea60374 --- /dev/null +++ b/debian/patches/jackd2.patch @@ -0,0 +1,18 @@ +The use of jack_error_callback in current fmit code is... erm, useless, +as it just says "Use the default", which is also used if nothing is +specified. + +Patch from Adrian Knoth . + +diff --git a/src/CaptureThread.cpp b/src/CaptureThread.cpp +index 5c6f86b..6eae124 100644 +--- a/src/CaptureThread.cpp ++++ b/src/CaptureThread.cpp +@@ -877,7 +877,6 @@ void CaptureThreadImplJACK::capture_init() + + jack_set_process_callback(m_jack_client, JackProcess, (void*)this); + jack_on_shutdown(m_jack_client, JackShutdown, (void*)this); +- jack_set_error_function(jack_error_callback); + jack_set_sample_rate_callback(m_jack_client, JackSampleRate, (void*)this); + + int err=0; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3fdfb3a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +include-cstdlib.patch +jackd2.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..c7ce458 --- /dev/null +++ b/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +# Disable Alsa on non-Linux architectures +ifneq (,$(findstring $(DEB_HOST_ARCH_OS), kfreebsd hurd)) + DEB_CONFIGURE_ALSA = --disable-alsa +else + DEB_CONFIGURE_ALSA = --enable-alsa +endif + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- --with-Qt-dir=/usr/share/qt3 $(DEB_CONFIGURE_ALSA) + +override_dh_auto_build: + # This file gets regenerated. Make sure we can end up with the + # original copy of it in place after the clean target. + [ -f tr/fmit_fr.ts.orig ] || cp tr/fmit_fr.ts tr/fmit_fr.ts.orig + dh_auto_build + +override_dh_auto_clean: + dh_auto_clean + # Restore the original version of the regenerated .ts file + [ -f tr/fmit_fr.ts.orig ] && mv tr/fmit_fr.ts{.orig,} || true 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/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..afd05a8 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +--unapply-patches diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..0ffbb7c --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.gna.org/fmit/ fmit-(.*)\.tar\.bz2 debian uupdate