New Upstream Snapshot - asterisk-flite
Ready changes
Summary
Merged new upstream version: 3.0+git20170812.1.569b2f0 (was: 3.0).
Resulting package
Built on 2022-06-07T06:33 (took 8m4s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots asterisk-flite-dbgsymapt install -t fresh-snapshots asterisk-flite
Lintian Result
- asterisk-flite-dbgsym_3.0+git20170812.1.569b2f0-1~jan+nus1_amd64.deb
- asterisk-flite_3.0+git20170812.1.569b2f0-1~jan+nus1.dsc
- asterisk-flite_3.0+git20170812.1.569b2f0-1~jan+nus1_amd64.buildinfo
- asterisk-flite_3.0+git20170812.1.569b2f0-1~jan+nus1_amd64.changes
- asterisk-flite_3.0+git20170812.1.569b2f0-1~jan+nus1_amd64.deb
Diff
diff --git a/Makefile b/Makefile
index 899e2c0..bdfaf6b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,7 @@
# the GNU General Public License Version 2. See the COPYING file
# at the top of the source tree.
-INSTALL:=install
-ASTLIBDIR:=$(shell awk '/moddir/{print $$3}' /etc/asterisk/asterisk.conf)
+ASTLIBDIR:=$(shell awk '/moddir/{print $$3}' /etc/asterisk/asterisk.conf 2> /dev/null)
ifeq ($(strip $(ASTLIBDIR)),)
MODULES_DIR:=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
else
@@ -17,9 +16,10 @@ ASTETCDIR:=$(INSTALL_PREFIX)/etc/asterisk
SAMPLENAME:=flite.conf.sample
CONFNAME:=$(basename $(SAMPLENAME))
-CC=gcc
-OPTIMIZE=-O2
-DEBUG=-g
+INSTALL:=install
+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 -DAST_MODULE_SELF_SYM=__internal_app_flite_self
@@ -33,7 +33,7 @@ all: app_flite.so
@echo " +-------------------------------------------+"
app_flite.o: app_flite.c
- $(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o app_flite.o app_flite.c
+ $(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o $@ $*.c
app_flite.so: app_flite.o
$(CC) -shared -Xlinker -x -o $@ $< $(LIBS)
diff --git a/app_flite.c b/app_flite.c
index 35f86cf..e23c03d 100644
--- a/app_flite.c
+++ b/app_flite.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/debian/changelog b/debian/changelog
index 48e3f37..3127016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+asterisk-flite (3.0+git20170812.1.569b2f0-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Drop patch 020170812~569b2f0.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 07 Jun 2022 06:25:52 -0000
+
asterisk-flite (3.0-4) unstable; urgency=medium
* drop obsolete source file README.source
diff --git a/debian/patches/020170812~569b2f0.patch b/debian/patches/020170812~569b2f0.patch
deleted file mode 100644
index 0f46450..0000000
--- a/debian/patches/020170812~569b2f0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix compilation under Asterisk 15
-Author: Lefteris Zafiris <zaf@fastmail.com>
-Origin: upstream, https://github.com/zaf/Asterisk-Flite/commit/569b2f0
-Last-Update: 2018-10-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/app_flite.c
-+++ b/app_flite.c
-@@ -33,8 +33,6 @@
-
- #include "asterisk.h"
-
--ASTERISK_REGISTER_FILE()
--
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/debian/patches/1001_add_LDFLAGS.patch b/debian/patches/1001_add_LDFLAGS.patch
index 8517ec9..568897d 100644
--- a/debian/patches/1001_add_LDFLAGS.patch
+++ b/debian/patches/1001_add_LDFLAGS.patch
@@ -5,10 +5,12 @@ License: GPL-2+
Last-Update: 2015-05-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@
- $(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o app_flite.o app_flite.c
+Index: asterisk-flite/Makefile
+===================================================================
+--- asterisk-flite.orig/Makefile
++++ asterisk-flite/Makefile
+@@ -36,7 +36,7 @@ app_flite.o: app_flite.c
+ $(CC) $(CFLAGS) $(DEBUG) $(OPTIMIZE) -c -o $@ $*.c
app_flite.so: app_flite.o
- $(CC) -shared -Xlinker -x -o $@ $< $(LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 700a631..6e6e130 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-020170812~569b2f0.patch
1001_add_LDFLAGS.patch
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/e7/04efc0cc7ee3e5fafb0d3f1d85aeb92af5ad18.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/2e/3865b832438fd28a919d002c4cfe6c5348b7f9.debug
No differences were encountered between the control files of package asterisk-flite
Control files of package asterisk-flite-dbgsym: lines which differ (wdiff format)
Build-Ids: 2e3865b832438fd28a919d002c4cfe6c5348b7f9 e704efc0cc7ee3e5fafb0d3f1d85aeb92af5ad18