Bug#927380: unblock: libfm-qt/0.14.1-5
diff --git a/debian/changelog b/debian/changelog
index 76ab27e..2124e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libfm-qt (0.14.1-5) unstable; urgency=medium
+
+ * Fixed license for vfs-search.c and vfs-menu.c - was forgotten upstream.
+ * Fixed d/copyright that way.
+
+ -- Alf Gaida <agaida@siduction.org> Thu, 18 Apr 2019 20:52:30 +0200
+
libfm-qt (0.14.1-4) unstable; urgency=medium
* Fix recursive copy to smb shares (and possible other remote filesystems)
@@ -7,13 +14,13 @@ libfm-qt (0.14.1-4) unstable; urgency=medium
libfm-qt (0.14.1-3) unstable; urgency=medium
- * Fixed the remaining symbols
+ * Fixed the remaining symbols
-- Alf Gaida <agaida@siduction.org> Fri, 01 Mar 2019 01:34:43 +0100
libfm-qt (0.14.1-2) unstable; urgency=medium
- * Fixed new and optional symbols
+ * Fixed new and optional symbols
-- Alf Gaida <agaida@siduction.org> Tue, 26 Feb 2019 22:07:40 +0100
diff --git a/debian/copyright b/debian/copyright
index f040a2c..f7f9d49 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,20 +5,10 @@ Source: https://github.com/lxqt/libfm-qt
Files: *
Copyright: 2013-2019 LXQt team
2013-2019 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
- 2012-2013 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+ 2012-2014 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
2014 Kuzma Shapran <kuzma.shapran@gmail.com>
License: LGPL-2.1+
-Files: src/core/vfs/vfs-search.c
-Copyright: 2012-2014 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-License: GPL-2.0+
-
-Files:src/core/vfs/vfs-menu.c
-Copyright: 2012 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
- 2010 Shae Smittle <starfall87@gmail.com>
-License: GPL-2.0+
-
-
Files: cmake/fm-qt-config.cmake.in
Copyright: 2015 LuÃs Pereira <luis.artur.pereira@gmail.com>
License: BSD-3-Clause
@@ -70,19 +60,3 @@ License: LGPL-2.1+
Public License version 2.1 can be found in
"/usr/share/common-licenses/LGPL-2.1".
-License: GPL-2.0+
- This package 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 2 of the License, or
- (at your option) any later version.
- .
- This package 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 <https://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/fix-license-headers.patch b/debian/patches/fix-license-headers.patch
new file mode 100644
index 0000000..f7e6045
--- /dev/null
+++ b/debian/patches/fix-license-headers.patch
@@ -0,0 +1,97 @@
+From 3d23ec7f0857cbc1ae8e42bdd27ab179a7e8344f Mon Sep 17 00:00:00 2001
+From: "Hong Jen Yee (PCMan)" <pcman.tw@gmail.com>
+Date: Fri, 19 Apr 2019 01:19:08 +0800
+Subject: [PATCH] Fix the license header of code we took from libfm (they
+ should use LGPL2 instead of GPL2). - src/core/vfs/vfs-menu.c -
+ src/core/vfs/vfs-search.c These files are taken from libfm which has been
+ relicensed to LGPL 2 on 2014-09-05 by Andrey N. Gritsenko after consulting
+ other contributors.
+
+---
+ src/core/vfs/vfs-menu.c | 21 ++++++++++-----------
+ src/core/vfs/vfs-search.c | 37 +++++++++++++++++--------------------
+ 2 files changed, 27 insertions(+), 31 deletions(-)
+
+diff --git a/src/core/vfs/vfs-menu.c b/src/core/vfs/vfs-menu.c
+index c541159..069b1bc 100644
+--- a/src/core/vfs/vfs-menu.c
++++ b/src/core/vfs/vfs-menu.c
+@@ -4,20 +4,19 @@
+ *
+ * Copyright 2012-2014 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+ *
+- * 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 2 of the License, or
+- * (at your option) any later version.
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
+ *
+- * This program is distributed in the hope that it will be useful,
++ * This library 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.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
+ *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+- * MA 02110-1301, USA.
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ #ifdef HAVE_CONFIG_H
+diff --git a/src/core/vfs/vfs-search.c b/src/core/vfs/vfs-search.c
+index 0a64fb6..92b932c 100644
+--- a/src/core/vfs/vfs-search.c
++++ b/src/core/vfs/vfs-search.c
+@@ -1,25 +1,22 @@
+ /*
+- * fm-vfs-search.c
+- *
+- * Copyright 2012 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+- * Copyright 2010 Shae Smittle <starfall87@gmail.com>
+- *
+- * 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 2 of the License, 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, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+- * MA 02110-1301, USA.
+- *
++ * fm-vfs-search.c
+ *
++ * Copyright 2012 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
++ * Copyright 2010 Shae Smittle <starfall87@gmail.com>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ #ifdef HAVE_CONFIG_H
+
diff --git a/debian/patches/series b/debian/patches/series
index 717e9b4..30052cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-smb-recursive-copy.patch
+fix-license-headers.patch
Reply to: