Bug#864318: unblock: filetea/0.1.16-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package filetea
The version of Filetea currently in testing (0.1.16-3) does not
work at all because of an API change in one of its dependencies
(libjs-jquery).
See https://bugs.debian.org/862742 for more details.
In addition to that, 0.1.16-4 contains the following changes, all of
them trivial:
- Replace the build dependency on the libgcrypt11-dev transition
package (#864101).
- Correct the homepage URL.
- Add the missing dependency on lsb-base (fixes a lintian error).
- Update Standards-Version to 3.9.8 (no changes to the package).
- Add the name of the manpage to the systemd service file.
The debdiff comparing both versions is attached.
Regards,
Berto
unblock filetea/0.1.16-4
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64
(x86_64)
Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru filetea-0.1.16/debian/changelog filetea-0.1.16/debian/changelog
--- filetea-0.1.16/debian/changelog 2014-08-27 16:15:15.000000000 +0300
+++ filetea-0.1.16/debian/changelog 2017-06-06 12:01:04.000000000 +0300
@@ -1,3 +1,20 @@
+filetea (0.1.16-4) unstable; urgency=high
+
+ * debian/control:
+ - Replace build dependency on libgcrypt11-dev with libgcrypt20-dev
+ (Closes: #864101).
+ - Update Homepage URL.
+ - Update Standards-Version to 3.9.8 (no changes).
+ - Depend on lsb-base (>= 3.0-6).
+ * debian/patches/jquery-compat.patch:
+ - Make Filetea work with libjs-jquery 3.x (Closes: #862742).
+ * debian/patches/systemd.patch:
+ - Add missing Documentation key.
+ * debian/copyright:
+ - Update copyright years.
+
+ -- Alberto Garcia <berto@igalia.com> Tue, 06 Jun 2017 12:01:04 +0300
+
filetea (0.1.16-3) unstable; urgency=medium
* Add systemd service file.
diff -Nru filetea-0.1.16/debian/control filetea-0.1.16/debian/control
--- filetea-0.1.16/debian/control 2014-08-27 16:15:15.000000000 +0300
+++ filetea-0.1.16/debian/control 2017-06-06 12:01:04.000000000 +0300
@@ -6,11 +6,11 @@
dh-autoreconf,
dh-systemd,
uuid-dev,
- libgcrypt11-dev,
+ libgcrypt20-dev,
libevd-0.1-dev (>= 0.1.18),
libjson-glib-dev (>= 0.10.0)
-Standards-Version: 3.9.5
-Homepage: https://gitorious.org/filetea
+Standards-Version: 3.9.8
+Homepage: https://github.com/elima/FileTea
Package: filetea
Architecture: any
@@ -18,6 +18,7 @@
adduser,
shared-mime-info,
libjs-jquery,
+ lsb-base (>= 3.0-6),
${misc:Depends}
Suggests: ssl-cert
Description: Web-based file sharing system
diff -Nru filetea-0.1.16/debian/copyright filetea-0.1.16/debian/copyright
--- filetea-0.1.16/debian/copyright 2014-08-27 16:15:15.000000000 +0300
+++ filetea-0.1.16/debian/copyright 2017-06-06 12:01:04.000000000 +0300
@@ -15,7 +15,7 @@
License: Expat or GPL-2
Files: debian/*
-Copyright: 2011-2013 Alberto Garcia <berto@igalia.com>
+Copyright: 2011-2013,2017 Alberto Garcia <berto@igalia.com>
License: AGPL-3+
License: GPL-2
diff -Nru filetea-0.1.16/debian/patches/jquery-compat.patch filetea-0.1.16/debian/patches/jquery-compat.patch
--- filetea-0.1.16/debian/patches/jquery-compat.patch 1970-01-01 02:00:00.000000000 +0200
+++ filetea-0.1.16/debian/patches/jquery-compat.patch 2017-06-06 12:01:04.000000000 +0300
@@ -0,0 +1,140 @@
+From: harikrishnakanchi <harikrishnakanchi@gmail.com>
+Subject: Make Filetea work with jQuery 3
+Bug-Debian: https://bugs.debian.org/862742
+Index: filetea/html/default/transfersView.js
+===================================================================
+--- filetea.orig/html/default/transfersView.js
++++ filetea/html/default/transfersView.js
+@@ -73,6 +73,24 @@ Evd.Object.extend (TransfersView.prototy
+ "aborted",
+ "aborted"
+ ];
++ this._cancelDialog = $ ("#transfer-list-confirm-cancel");
++ this._cancelDialog.dialog({
++ modal: true,
++ title: "Cancel transfer",
++ autoOpen: false,
++ buttons: {
++ "Yes": function () {
++ var id = $ (this).dialog("option", "transferId");
++ self._transfers.cancel ([id]);
++
++ $ (this).dialog ("close");
++ },
++ "No": function () {
++ $ (this).dialog ("close");
++ }
++ }
++ });
++
+ },
+
+ _newContainer: function (parent, inner, className) {
+@@ -167,20 +185,8 @@ Evd.Object.extend (TransfersView.prototy
+
+ var self = this;
+ if (item.status == TransferManager.Status.ACTIVE) {
+- $ ("#transfer-list-confirm-cancel").dialog({
+- modal: true,
+- title: "Cancel transfer",
+- buttons: {
+- "Yes": function () {
+- self._transfers.cancel ([id]);
+-
+- $ (this).dialog ("close");
+- },
+- "No": function () {
+- $ (this).dialog ("close");
+- }
+- }
+- });
++ self._cancelDialog.dialog("option", "transferId", id);
++ self._cancelDialog.dialog('open');
+ }
+ else {
+ delete (this._items[id]);
+@@ -228,7 +234,7 @@ Evd.Object.extend (TransfersView.prototy
+ },
+
+ _onTransferFinished: function (transfer) {
+- $ ("#transfer-list-confirm-cancel").dialog ("close");
++ this._cancelDialog.dialog("close");
+
+ this._onTransferStatus (transfer);
+
+Index: filetea/html/default/ux.js
+===================================================================
+--- filetea.orig/html/default/ux.js
++++ filetea/html/default/ux.js
+@@ -43,8 +43,6 @@ Evd.Object.extend (UxManager.prototype,
+ this._content.addEventListener ("show",
+ function (id, name) {
+ document.title = name + " - " + self._baseTitle;
+- self._tabs.tabs ("select", "#" + id);
+-
+ self.setHighlight (id, false);
+ });
+ this._content.addEventListener ("loading",
+@@ -112,20 +110,11 @@ Evd.Object.extend (UxManager.prototype,
+ remove: function (event, ui) {
+ self._content.invalidate (ui.panel.id);
+ },
+- select: window.location.hash
++ beforeActivate: function (event, ui) {
++ window.location.hash = ui.newPanel[0].id;
++ }
+ });
+
+- self._tabs.bind ("tabsselect",
+- function (event, ui) {
+- window.location.hash = ui.tab.hash;
+- });
+-
+- $ ("#tabs span.ui-icon-close").live ("click",
+- function (event, ui) {
+- var index = $ ("li", self._tabs).index ($ (this).parent ());
+- self._tabs.tabs ("remove", index);
+- });
+-
+ self._content.start ();
+
+ setTimeout (function () {
+@@ -143,7 +132,18 @@ Evd.Object.extend (UxManager.prototype,
+ div = document.createElement ("div");
+ div.id = id;
+ document.getElementById ("tabs").appendChild (div);
+- self._tabs.tabs ("add", "#" + id, name, index);
++ var closeButton = $ ("<span class='ui-icon ui-icon-close'>Remove Tab</span>");
++ closeButton.on ("click", function (event, ui) {
++ var tab = $ (this).parent ().remove();
++ var panelId = tab.attr( "aria-controls" );
++ $( "#" + panelId ).remove();
++ self._tabs.tabs ("refresh");
++ });
++
++ $ ("<li>").append($ ("<a>", {href: "#" + id}).html(name))
++ .append(closeButton)
++ .appendTo($ ("#tabs .ui-tabs-nav"));
++ self._tabs.tabs("refresh");
+ }
+
+ return div;
+@@ -156,7 +156,8 @@ Evd.Object.extend (UxManager.prototype,
+ _loading: function (id) {
+ var div = document.getElementById (id);
+ if (div) {
+- this._tabs.tabs ("select", "#" + id);
++ var index = $('#tabs a[href="#' + id + '"]').parent().index();
++ this._tabs.tabs ("option", "active", index);
+ div.innerHTML = '<div id="content-loading"></div>';
+ }
+ },
+@@ -166,6 +167,8 @@ Evd.Object.extend (UxManager.prototype,
+
+ this._addContent (id, "Download");
+ this._loading (id);
++ var index = $('#tabs a[href="#' + id + '"]').parent().index();
++ this._tabs.tabs('option', 'active', index);
+
+ var el = $ ("#" + id).get(0);
+
diff -Nru filetea-0.1.16/debian/patches/series filetea-0.1.16/debian/patches/series
--- filetea-0.1.16/debian/patches/series 2014-08-27 16:15:15.000000000 +0300
+++ filetea-0.1.16/debian/patches/series 2017-06-06 12:01:04.000000000 +0300
@@ -1,2 +1,3 @@
systemd.patch
config-file.patch
+jquery-compat.patch
diff -Nru filetea-0.1.16/debian/patches/systemd.patch filetea-0.1.16/debian/patches/systemd.patch
--- filetea-0.1.16/debian/patches/systemd.patch 2014-08-27 16:15:15.000000000 +0300
+++ filetea-0.1.16/debian/patches/systemd.patch 2017-06-06 12:01:04.000000000 +0300
@@ -19,9 +19,10 @@
===================================================================
--- /dev/null
+++ filetea/filetea.service
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
+[Unit]
+Description=FileTea file sharing daemon
++Documentation=man:filetea(8)
+After=network.target
+
+[Service]
Reply to: