New Upstream Release - twinkle
Ready changes
Summary
Merged new upstream version: 1.10.3+dfsg (was: 1.10.2+dfsg).
Resulting package
Built on 2023-05-20T16:37 (took 14m22s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases twinkle-commonapt install -t fresh-releases twinkle-console-dbgsymapt install -t fresh-releases twinkle-consoleapt install -t fresh-releases twinkle-dbgsymapt install -t fresh-releases twinkle
Lintian Result
- twinkle-common_1.10.3+dfsg-1~jan+nur1_all.deb
- twinkle-console-dbgsym_1.10.3+dfsg-1~jan+nur1_amd64.deb
- twinkle-console_1.10.3+dfsg-1~jan+nur1_amd64.deb
- twinkle-dbgsym_1.10.3+dfsg-1~jan+nur1_amd64.deb
- twinkle_1.10.3+dfsg-1~jan+nur1.dsc
- twinkle_1.10.3+dfsg-1~jan+nur1_amd64.buildinfo
- twinkle_1.10.3+dfsg-1~jan+nur1_amd64.deb
- twinkle_1.10.3+dfsg-1~jan+nur1_amd64.changes
Diff
diff --git a/AUTHORS b/AUTHORS
index 88cbead..ec1ad55 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,4 +33,4 @@ Russian Michail Chodorenko
Swedish Daniel Nylander
Michel de Boer
-www.twinklephone.com
+https://mfnboer.home.xs4all.nl/twinkle/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5315383..59a8b08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ project(twinkle)
cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
-set(PRODUCT_VERSION "1.10.2")
-set(PRODUCT_DATE "February 14, 2018")
+set(PRODUCT_VERSION "1.10.3")
+set(PRODUCT_DATE "February 18, 2022")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
OPTION(WITH_ZRTP "Enable ZRTP encrypted calls" OFF)
diff --git a/NEWS b/NEWS
index 0ced74e..7f6712d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+18 February 2022 - 1.10.3
+=========================
+- Replace manual URL.
+
14 February 2018 - 1.10.2
=======================
- Fix sound not working with ALSA 1.1.7.
diff --git a/debian/changelog b/debian/changelog
index ac12242..e5c5ec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+twinkle (1:1.10.3+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Drop patch remove-malicious-homepage.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sat, 20 May 2023 16:24:35 -0000
+
twinkle (1:1.10.2+dfsg-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/remove-malicious-homepage.patch b/debian/patches/remove-malicious-homepage.patch
deleted file mode 100644
index c452214..0000000
--- a/debian/patches/remove-malicious-homepage.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From da274607aa835a2735dcf9b9a7ba550910f9d03e Mon Sep 17 00:00:00 2001
-From: matchi <hansi77@yandex.com>
-Date: Wed, 1 Dec 2021 09:54:39 +0100
-Subject: [PATCH] changed references to http(s)://twinklephone.com to
- https://mfnboer.home.xs4all.nl/twinkle/
-
-(cherry picked from commit 165c43d8a1574946e7704c639c56cea3d5264606)
----
- AUTHORS | 2 +-
- src/gui/lang/twinkle_de.ts | 2 +-
- src/gui/mphoneform.cpp | 2 +-
- twinkle.spec.in | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 88cbeadb..ec1ad55c 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -33,4 +33,4 @@ Russian Michail Chodorenko
- Swedish Daniel Nylander
-
- Michel de Boer
--www.twinklephone.com
-+https://mfnboer.home.xs4all.nl/twinkle/
-diff --git a/src/gui/lang/twinkle_de.ts b/src/gui/lang/twinkle_de.ts
-index 8ab0b014..a5b38916 100644
---- a/src/gui/lang/twinkle_de.ts
-+++ b/src/gui/lang/twinkle_de.ts
-@@ -5620,7 +5620,7 @@ The values of all SIP headers in the incoming INVITE message are passed in envir
- TWINKLE_TRIGGER=in_call. SIPREQUEST_METHOD=INVITE. The request-URI of the INVITE will be passed in <b>SIPREQUEST_URI</b>. The name of the user profile will be passed in <b>TWINKLE_USER_PROFILE</b>.</source>
- <translation><p>
- Dieses Script wird gerufen, wenn ein INVITE (Anruf) ankommt. <br>
--Bitte lesen Sie im Handbuch unter "/usr/share/doc/packages/twinkle/..." oder "http://twinklephone.com" die ausführliche Beschreibung!
-+Bitte lesen Sie im Handbuch unter "/usr/share/doc/packages/twinkle/..." oder "https://mfnboer.home.xs4all.nl/twinkle/" die ausführliche Beschreibung!
- </p>
- <h3>Rückgabewerte</h3> - print nach STDOUT (z.B. `echo "action=dnd"`), ein Wert pro Zeile: <br>
- <tt>action=[ continue | reject | dnd | redirect | autoanswer ]<br></tt>
-diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp
-index c4e3c1d9..abca70d0 100644
---- a/src/gui/mphoneform.cpp
-+++ b/src/gui/mphoneform.cpp
-@@ -2290,7 +2290,7 @@ void MphoneForm::aboutQt()
-
- void MphoneForm::manual()
- {
-- ((t_gui *)ui)->open_url_in_browser("http://www.twinklephone.com");
-+ ((t_gui *)ui)->open_url_in_browser("https://mfnboer.home.xs4all.nl/twinkle/");
- }
-
- void MphoneForm::editUserProfile()
-diff --git a/twinkle.spec.in b/twinkle.spec.in
-index 989c4514..7c014167 100644
---- a/twinkle.spec.in
-+++ b/twinkle.spec.in
-@@ -10,7 +10,7 @@ BuildArch: i586
- #BuildArch: x86_64
- BuildRoot: %{_tmppath}/making_of_%{name}_%{version}
- Packager:
--URL: http://www.twinklephone.com
-+URL: https://mfnboer.home.xs4all.nl/twinkle/
- Requires: alsa
- Requires: ucommon
- Requires: ccrtp >= 1.6.0
diff --git a/debian/patches/series b/debian/patches/series
index 23f7680..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-remove-malicious-homepage.patch
diff --git a/src/gui/lang/twinkle_de.ts b/src/gui/lang/twinkle_de.ts
index 8ab0b01..a5b3891 100644
--- a/src/gui/lang/twinkle_de.ts
+++ b/src/gui/lang/twinkle_de.ts
@@ -5620,7 +5620,7 @@ The values of all SIP headers in the incoming INVITE message are passed in envir
TWINKLE_TRIGGER=in_call. SIPREQUEST_METHOD=INVITE. The request-URI of the INVITE will be passed in <b>SIPREQUEST_URI</b>. The name of the user profile will be passed in <b>TWINKLE_USER_PROFILE</b>.</source>
<translation><p>
Dieses Script wird gerufen, wenn ein INVITE (Anruf) ankommt. <br>
-Bitte lesen Sie im Handbuch unter "/usr/share/doc/packages/twinkle/..." oder "http://twinklephone.com" die ausführliche Beschreibung!
+Bitte lesen Sie im Handbuch unter "/usr/share/doc/packages/twinkle/..." oder "https://mfnboer.home.xs4all.nl/twinkle/" die ausführliche Beschreibung!
</p>
<h3>Rückgabewerte</h3> - print nach STDOUT (z.B. `echo "action=dnd"`), ein Wert pro Zeile: <br>
<tt>action=[ continue | reject | dnd | redirect | autoanswer ]<br></tt>
diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp
index c4e3c1d..abca70d 100644
--- a/src/gui/mphoneform.cpp
+++ b/src/gui/mphoneform.cpp
@@ -2290,7 +2290,7 @@ void MphoneForm::aboutQt()
void MphoneForm::manual()
{
- ((t_gui *)ui)->open_url_in_browser("http://www.twinklephone.com");
+ ((t_gui *)ui)->open_url_in_browser("https://mfnboer.home.xs4all.nl/twinkle/");
}
void MphoneForm::editUserProfile()
diff --git a/twinkle.spec.in b/twinkle.spec.in
index 989c451..7c01416 100644
--- a/twinkle.spec.in
+++ b/twinkle.spec.in
@@ -10,7 +10,7 @@ BuildArch: i586
#BuildArch: x86_64
BuildRoot: %{_tmppath}/making_of_%{name}_%{version}
Packager:
-URL: http://www.twinklephone.com
+URL: https://mfnboer.home.xs4all.nl/twinkle/
Requires: alsa
Requires: ucommon
Requires: ccrtp >= 1.6.0
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/14/0ab36ae5791651459abe1ff8419de401cfd1f9.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/e7/78ae04abe554e23a52f07ee2f3d4f93b73be66.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/63/7be11a5745b31ba5330a5105647721d73e89a3.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/dc/cbc7f407d0ed478ab38cd8d72a6d6eb085a695.debug
No differences were encountered between the control files of package twinkle
No differences were encountered between the control files of package twinkle-common
No differences were encountered between the control files of package twinkle-console
Control files of package twinkle-console-dbgsym: lines which differ (wdiff format)
Build-Ids: 637be11a5745b31ba5330a5105647721d73e89a3 140ab36ae5791651459abe1ff8419de401cfd1f9
Control files of package twinkle-dbgsym: lines which differ (wdiff format)
Build-Ids: dccbc7f407d0ed478ab38cd8d72a6d6eb085a695 e778ae04abe554e23a52f07ee2f3d4f93b73be66