Bug#865971: stable-pu: package tbdialout/1.7.2-2
Control: tags -1 - moreinfo
On 26/06/17 11:31, Adam D. Barratt wrote:
>
> The debdiff is obviously not what you're proposing uploading to stable:
>
> +tbdialout (1.7.2-2) unstable; urgency=low
>
> Please can we have a debdiff of what you're actually proposing to
> upload, as built and tested on stable?
>
Please find the revised debdiff attached
diff -Nru tbdialout-1.7.2/debian/changelog tbdialout-1.7.2/debian/changelog
--- tbdialout-1.7.2/debian/changelog 2014-05-02 18:58:02.000000000 +0200
+++ tbdialout-1.7.2/debian/changelog 2017-06-26 08:51:10.000000000 +0200
@@ -1,3 +1,9 @@
+tbdialout (1.7.2-1+deb9u1) stable; urgency=medium
+
+ * Include leading plus symbol with tel: URI scheme. (Closes: #865961)
+
+ -- Daniel Pocock <daniel@pocock.pro> Mon, 26 Jun 2017 08:51:10 +0200
+
tbdialout (1.7.2-1) unstable; urgency=low
* Initial packaging. (Closes: #746687)
diff -Nru tbdialout-1.7.2/debian/control tbdialout-1.7.2/debian/control
--- tbdialout-1.7.2/debian/control 2014-05-02 18:58:02.000000000 +0200
+++ tbdialout-1.7.2/debian/control 2017-06-26 08:51:10.000000000 +0200
@@ -5,7 +5,6 @@
Uploaders: Daniel Pocock <daniel@pocock.pro>
Build-Depends: debhelper (>= 9), mozilla-devscripts (>= 0.19~)
Build-Depends-Indep: zip
-DM-Upload-Allowed: yes
Standards-Version: 3.9.5
Vcs-Git: git://git.debian.org/pkg-mozext/tbdialout.git
Vcs-Browser: http://git.debian.org/?p=pkg-mozext/tbdialout.git;a=summary
diff -Nru tbdialout-1.7.2/debian/copyright tbdialout-1.7.2/debian/copyright
--- tbdialout-1.7.2/debian/copyright 2014-05-02 18:58:02.000000000 +0200
+++ tbdialout-1.7.2/debian/copyright 2014-06-12 17:29:46.000000000 +0200
@@ -10,6 +10,17 @@
Copyright: 2010, Nickolay Ponomarev <asqueella@gmail.com>
License: MPL-1.1
+Files: content/options.js content/options.xul content/overlay.js content/thunderbirdOverlay.xul
+Copyright: 2010-2011, Chris Hastie <chris@oak-wood.co.uk>
+License: MPL-1.1 or GPL-2.0 or LGPL-2.1
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
Files: debian/*
Copyright: 2014, Daniel Pocock http://danielpocock.com
License: MPL-1.1
diff -Nru tbdialout-1.7.2/debian/patches/0002_default_proto_tel_uri.patch tbdialout-1.7.2/debian/patches/0002_default_proto_tel_uri.patch
--- tbdialout-1.7.2/debian/patches/0002_default_proto_tel_uri.patch 2014-05-02 18:58:02.000000000 +0200
+++ tbdialout-1.7.2/debian/patches/0002_default_proto_tel_uri.patch 2017-06-26 08:43:20.000000000 +0200
@@ -1,13 +1,16 @@
diff --git a/defaults/preferences/tbdialout.js b/defaults/preferences/tbdialout.js
-index af5c78f..9e509f1 100644
+index af5c78f..2ec3bcd 100644
--- a/defaults/preferences/tbdialout.js
+++ b/defaults/preferences/tbdialout.js
-@@ -1,4 +1,4 @@
+@@ -1,6 +1,6 @@
-pref( "extensions.tbdialout.proto", "callto:" );
+pref( "extensions.tbdialout.proto", "tel:" );
pref( "extensions.tbdialout.prefix", "" );
- pref( "extensions.tbdialout.plus", "" );
+-pref( "extensions.tbdialout.plus", "" );
++pref( "extensions.tbdialout.plus", "+" );
pref( "extensions.tbdialout.tbbuttonadded", false );
+ pref( "extensions.tbdialout.customurl", "" );
+ pref( "extensions.tbdialout.customuser", "" );
@@ -15,4 +15,4 @@ pref( "extensions.tbdialout.ami.host", "" );
pref( "extensions.tbdialout.ami.port", 5038 );
pref( "extensions.tbdialout.ami.user", "" );
diff -Nru tbdialout-1.7.2/debian/watch tbdialout-1.7.2/debian/watch
--- tbdialout-1.7.2/debian/watch 2014-05-02 18:58:02.000000000 +0200
+++ tbdialout-1.7.2/debian/watch 2015-10-01 21:26:13.000000000 +0200
@@ -1,3 +1,4 @@
version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/TBDialOut-$1\.tar\.gz/ \
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/TBDialOut-$1\.tar\.gz/,\
+uversionmangle=s/pre/~/ \
https://github.com/tipichris/TBDialOut/tags .*/v?(\d\S*)\.tar\.gz
Reply to: