diff -Nru asterisk-flite-2.3/app_flite.c asterisk-flite-3.0/app_flite.c --- asterisk-flite-2.3/app_flite.c 2016-03-20 14:01:21.000000000 +0000 +++ asterisk-flite-3.0/app_flite.c 2016-09-12 20:39:22.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (C) 2009 - 2015, Lefteris Zafiris * - * Lefteris Zafiris + * Lefteris Zafiris * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact @@ -20,7 +20,7 @@ * * \brief Say text to the user, using Flite TTS engine. * - * \author\verbatim Lefteris Zafiris \endverbatim + * \author\verbatim Lefteris Zafiris \endverbatim * * \extref Flite text to speech Synthesis System - http://www.speech.cs.cmu.edu/flite/ * @@ -33,7 +33,8 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision: 00 $") +ASTERISK_REGISTER_FILE() + #include #include #include diff -Nru asterisk-flite-2.3/authors asterisk-flite-3.0/authors --- asterisk-flite-2.3/authors 2016-03-20 14:01:21.000000000 +0000 +++ asterisk-flite-3.0/authors 2016-09-12 20:39:22.000000000 +0000 @@ -1 +1 @@ -Lefteris Zafiris +Lefteris Zafiris diff -Nru asterisk-flite-2.3/ChangeLog asterisk-flite-3.0/ChangeLog --- asterisk-flite-2.3/ChangeLog 2016-03-20 14:01:21.000000000 +0000 +++ asterisk-flite-3.0/ChangeLog 2016-09-12 20:39:22.000000000 +0000 @@ -1,41 +1,41 @@ -2016-03-20 Lefteris Zafiris - 2.3 +2016-03-20 Lefteris Zafiris - 2.3 Proper temp file generation and handling - Security Fix - -2015-05-17 Lefteris Zafiris - 2.2 +2015-05-17 Lefteris Zafiris - 2.2 Released as stable version 2.2 Fixed compatibility with asterisk 11. Code cleanups. Better error handling in config file parsing. Fixed unresolved symbol issues with ubuntu based distros. -2012-08-19 Lefteris Zafiris - 2.2-rc1 +2012-08-19 Lefteris Zafiris - 2.2-rc1 Fixed compatibility with asterisk 11 Minor code cleanups and fixes. -2011-11-11 Lefteris Zafiris - 2.1 +2011-11-11 Lefteris Zafiris - 2.1 Released as stable version 2.1 -2011-10-21 Lefteris Zafiris - 2.1-rc3 +2011-10-21 Lefteris Zafiris - 2.1-rc3 Changed config file handling. Config values are read once during module loading. Added option for module reload that re-reads the config values. -2011-09-20 Lefteris Zafiris - 2.1-rc2 +2011-09-20 Lefteris Zafiris - 2.1-rc2 Changed output file format to sln16 (16bit signed linear PCM at 16000Hz). Added back support for asterisk 1.6 and 8000Hz sound files. -2011-08-26 Lefteris Zafiris - 2.1-rc1 +2011-08-26 Lefteris Zafiris - 2.1-rc1 Added option to choose between available flite voices. Dropped support for asterisk 1.6 and 8000Hz sound files -2011-08-20 Lefteris Zafiris - 2.0 +2011-08-20 Lefteris Zafiris - 2.0 Added option for generating 16kHz sound files Labelled as stable -2009-09-01 Lefteris Zafiris - 1.6-0.1-beta2 +2009-09-01 Lefteris Zafiris - 1.6-0.1-beta2 Re-licensed under Gnu GPL version 2 for compatibility with asterisk. -2009-08-28 Lefteris Zafiris - 1.6-0.1-beta +2009-08-28 Lefteris Zafiris - 1.6-0.1-beta Initial release 1.6-0.1-beta diff -Nru asterisk-flite-2.3/debian/changelog asterisk-flite-3.0/debian/changelog --- asterisk-flite-2.3/debian/changelog 2017-08-21 11:10:58.000000000 +0000 +++ asterisk-flite-3.0/debian/changelog 2017-08-28 08:45:09.000000000 +0000 @@ -1,8 +1,22 @@ -asterisk-flite (2.3-1build1) artful; urgency=medium +asterisk-flite (3.0-1) unstable; urgency=medium - * Rebuild against new asterisk 13.17. + [ upstream ] + * Nre release. - -- Gianfranco Costamagna Mon, 21 Aug 2017 13:10:58 +0200 + [ Jonas Smedegaard ] + * Ease git-based maintenance: Add git-buildpackage configuration. + * Modernize cdbs: + + Do copyright-check in maintainer script (not during build). + * Modernize Vcs-* fields: Use git (not cgit) in path. + * Declare compliance with Debian Policy 4.1.0. + * Update copyright info: + + Use https protocol in file format URL. + + Extend coverage for myself. + + Extend coverage for main upstream author. + * Advertise DEP-3 format in patch header. + * Unfuzz patch. + + -- Jonas Smedegaard Mon, 28 Aug 2017 10:45:09 +0200 asterisk-flite (2.3-1) unstable; urgency=medium diff -Nru asterisk-flite-2.3/debian/control asterisk-flite-3.0/debian/control --- asterisk-flite-2.3/debian/control 2016-12-17 19:37:00.000000000 +0000 +++ asterisk-flite-3.0/debian/control 2017-08-28 08:44:33.000000000 +0000 @@ -4,14 +4,13 @@ Maintainer: Debian VoIP Team Uploaders: Jonas Smedegaard Build-Depends: cdbs, - licensecheck, debhelper, dh-buildinfo, asterisk-dev, flite-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/asterisk-flite.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/asterisk-flite.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-voip/asterisk-flite.git Homepage: http://zaf.github.com/Asterisk-Flite/ Package: asterisk-flite diff -Nru asterisk-flite-2.3/debian/control.in asterisk-flite-3.0/debian/control.in --- asterisk-flite-2.3/debian/control.in 2016-12-17 19:23:06.000000000 +0000 +++ asterisk-flite-3.0/debian/control.in 2017-08-28 08:42:27.000000000 +0000 @@ -4,9 +4,9 @@ Maintainer: Debian VoIP Team Uploaders: Jonas Smedegaard Build-Depends: @cdbs@ -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/asterisk-flite.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/asterisk-flite.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-voip/asterisk-flite.git Homepage: http://zaf.github.com/Asterisk-Flite/ Package: asterisk-flite diff -Nru asterisk-flite-2.3/debian/copyright asterisk-flite-3.0/debian/copyright --- asterisk-flite-2.3/debian/copyright 2016-12-17 19:22:43.000000000 +0000 +++ asterisk-flite-3.0/debian/copyright 2017-08-28 08:44:51.000000000 +0000 @@ -1,11 +1,11 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Asterisk-Flite Upstream-Contact: http://github.com/zaf/Asterisk-Flite/issues/ Source: https://github.com/zaf/Asterisk-Flite/downloads git://github.com/zaf/Asterisk-Flite Files: * -Copyright: 2009-2015, Lefteris Zafiris +Copyright: 2009-2016, Lefteris Zafiris License-Grant: This program is free software, distributed under the terms of the GNU General Public License Version 2. See the COPYING file at the top of @@ -13,7 +13,7 @@ License: GPL-2 Files: debian/* -Copyright: 2010-2013,2015-2016, Jonas Smedegaard +Copyright: 2010-2013,2015-2017, Jonas Smedegaard License-Grant: This file is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -Nru asterisk-flite-2.3/debian/copyright-check asterisk-flite-3.0/debian/copyright-check --- asterisk-flite-2.3/debian/copyright-check 1970-01-01 00:00:00.000000000 +0000 +++ asterisk-flite-3.0/debian/copyright-check 2017-08-28 08:26:21.000000000 +0000 @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright © 2016-2017 Jonas Smedegaard +# Description: helper script to update copyright_hints +# +# 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, 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 . + +set -eu + +make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true +make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1 + +# unconditionally merge changes - safe to do with git-tracked package +[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints diff -Nru asterisk-flite-2.3/debian/copyright_hints asterisk-flite-3.0/debian/copyright_hints --- asterisk-flite-2.3/debian/copyright_hints 2016-12-17 19:33:31.000000000 +0000 +++ asterisk-flite-3.0/debian/copyright_hints 2017-08-28 08:44:30.000000000 +0000 @@ -10,6 +10,7 @@ debian/compat debian/control debian/control.in + debian/gbp.conf debian/patches/1001_add_LDFLAGS.patch debian/patches/README debian/patches/series @@ -24,9 +25,17 @@ Files: Makefile app_flite.c Copyright: 2009-2015, Lefteris Zafiris + 2009-2016, Lefteris Zafiris License: GPL-2 FIXME +Files: debian/copyright-check + debian/rules +Copyright: 2010-2013, 2015-2016, Jonas Smedegaard + 2016-2017, Jonas Smedegaard +License: GPL-3+ + FIXME + Files: README Copyright: NONE License: GPL-2 @@ -44,8 +53,3 @@ License: GPL-2+ FIXME -Files: debian/rules -Copyright: 2010-2013, 2015-2016, Jonas Smedegaard -License: GPL-3+ - FIXME - diff -Nru asterisk-flite-2.3/debian/gbp.conf asterisk-flite-3.0/debian/gbp.conf --- asterisk-flite-2.3/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ asterisk-flite-3.0/debian/gbp.conf 2016-12-21 14:14:12.000000000 +0000 @@ -0,0 +1,6 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +pristine-tar = True +sign-tags = True +filter = */.git* diff -Nru asterisk-flite-2.3/debian/patches/1001_add_LDFLAGS.patch asterisk-flite-3.0/debian/patches/1001_add_LDFLAGS.patch --- asterisk-flite-2.3/debian/patches/1001_add_LDFLAGS.patch 2015-10-06 20:15:17.000000000 +0000 +++ asterisk-flite-3.0/debian/patches/1001_add_LDFLAGS.patch 2017-08-28 08:45:09.000000000 +0000 @@ -1,12 +1,13 @@ Description: Apply LDFLAGS to linker Author: Jonas Smedegaard Forwarded: no -Last-Update: 2015-05-18 License: GPL-2+ - +Last-Update: 2015-05-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Makefile +++ b/Makefile -@@ -38,7 +38,7 @@ +@@ -36,7 +36,7 @@ $(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o app_flite.o app_flite.c app_flite.so: app_flite.o @@ -14,4 +15,4 @@ + $(CC) -shared $(LDFLAGS) -Xlinker -x -o $@ $< $(LIBS) clean: - rm -f app_flite.o app_flite.so .*.d + rm -f app_flite.o app_flite.so diff -Nru asterisk-flite-2.3/debian/rules asterisk-flite-3.0/debian/rules --- asterisk-flite-2.3/debian/rules 2016-12-17 19:26:18.000000000 +0000 +++ asterisk-flite-3.0/debian/rules 2017-08-28 08:41:50.000000000 +0000 @@ -18,7 +18,6 @@ pkg = $(DEB_SOURCE_PACKAGE) -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/debhelper.mk diff -Nru asterisk-flite-2.3/Makefile asterisk-flite-3.0/Makefile --- asterisk-flite-2.3/Makefile 2016-03-20 14:01:21.000000000 +0000 +++ asterisk-flite-3.0/Makefile 2016-09-12 20:39:22.000000000 +0000 @@ -1,30 +1,30 @@ # # Makefile for Asterisk flite application -# Copyright (C) 2009 - 2015, Lefteris Zafiris +# Copyright (C) 2009 - 2016, Lefteris Zafiris # # This program is free software, distributed under the terms of # the GNU General Public License Version 2. See the COPYING file # at the top of the source tree. -INSTALL=install +INSTALL:=install ASTLIBDIR:=$(shell awk '/moddir/{print $$3}' /etc/asterisk/asterisk.conf) ifeq ($(strip $(ASTLIBDIR)),) - MODULES_DIR=$(INSTALL_PREFIX)/usr/lib/asterisk/modules + MODULES_DIR:=$(INSTALL_PREFIX)/usr/lib/asterisk/modules else - MODULES_DIR=$(INSTALL_PREFIX)$(ASTLIBDIR) + MODULES_DIR:=$(INSTALL_PREFIX)$(ASTLIBDIR) endif -ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -SAMPLENAME=flite.conf.sample -CONFNAME=$(basename $(SAMPLENAME)) +ASTETCDIR:=$(INSTALL_PREFIX)/etc/asterisk +SAMPLENAME:=flite.conf.sample +CONFNAME:=$(basename $(SAMPLENAME)) CC=gcc OPTIMIZE=-O2 DEBUG=-g LIBS+=-lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_awb -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite -CFLAGS+=-pipe -fPIC -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE +CFLAGS+=-pipe -fPIC -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE -DAST_MODULE_SELF_SYM=__internal_app_flite_self -all: _all +all: app_flite.so @echo " +--------- app_flite Build Complete --------+" @echo " + app_flite has successfully been built, +" @echo " + and can be installed by running: +" @@ -32,8 +32,6 @@ @echo " + make install +" @echo " +-------------------------------------------+" -_all: app_flite.so - app_flite.o: app_flite.c $(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o app_flite.o app_flite.c @@ -41,9 +39,9 @@ $(CC) -shared -Xlinker -x -o $@ $< $(LIBS) clean: - rm -f app_flite.o app_flite.so .*.d + rm -f app_flite.o app_flite.so -install: _all +install: all $(INSTALL) -m 755 -d $(DESTDIR)$(MODULES_DIR) $(INSTALL) -m 755 app_flite.so $(DESTDIR)$(MODULES_DIR) @echo " +---- app_flite Installation Complete ------+"