[neon/extras/krusader/Neon/release] debian: merge salsa

[Jonathan Esk-Riddell]

Git commit aa9284bc6386c96e61fba69efd0a6681bb16706c by Jonathan Esk-Riddell.
Committed on 08/09/2022 at 14:46.
Pushed by jriddell into branch 'Neon/release'.

merge salsa

M  +24   -1    debian/changelog
M  +7    -5    debian/control
M  +0    -1    debian/copyright
M  +2    -7    debian/upstream/metadata

https://invent.kde.org/neon/extras/krusader/commit/aa9284bc6386c96e61fba69efd0a6681bb16706c

diff --cc debian/copyright
index fe99ed5,242ae53..aa47b6d
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,13 -1,40 +1,12 @@@
  Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
  Upstream-Name: krusader
- Source: https://cgit.kde.org/krusader.git
  
  Files: *
 -Copyright: 2003-2009, + by Csaba Karai
 -           2003, + by Shie Erlich & Rafi Yanai & Csaba Karai
 -           2000-2008, Csaba Karai
 -           2005-2009, Csaba Karai <cskarai at freemail.hu>
 -           2000, David Faure <faure at kde.org>
 -           2005, Dirk Eschler <deschler at users.sourceforge.net>
 -           2009, Fathi Boudra <fboudra at gmail.com>
 -           1997-1998, Free Software Foundation, Inc
 -           2009-2010, Jan Lepper
 -           2010, Jan Lepper <dehtris at yahoo.de>
 -           2011, Jan Lepper <jan_lepper at gmx.de>
 -           2004-2008, Jonas Bähr <jonas.baehr at web.de>
 -           2004, Jonas B�hr
 -           2004, Jonas B�r
 -           2003, Leo Savernik <l.savernik at aon.at>
 -           2003-2004, Max Howell <max.howell at methylblue.com>
 -           2000, Rafi Yanai
 -           2003, Rafi Yanai & Shie Erlich
 -           2000-2006, Rafi Yanai <yanai at users.sourceforge.net>
 -           2000-2004, Shie Erlich & Rafi Yanai
 -           2000-2007, Shie Erlich & Rafi Yanai & Csaba Karai
 -           2000-2006, Shie Erlich <erlich at users.sourceforge.net>
 -           2002, Szombathelyi György <gyurco at users.sourceforge.net>
 -           2006-2008, Václav Juza <vaclavjuza at gmail.com>
 -           1989-1991, Free Software Foundation, Inc
 -           2001, Martin R. Jones <mjones at kde.org>
 -    Richard Holt <richard.holt at gmail.com>
 -    Heiner Eichmann <h.eichmann at gmx.de>
 -    Frank Schoolmeesters <frank.schoolmeesters at gmail.com>
 -    Matej Urbancic <matej at amis.net>
 -    Dawit Alemayehu <adawit at kde.org>
 -    Sebastian Trueg <trueg at k3b.org>
 -    2001 Carsten Pfeiffer <pfeiffer at kde.org>
 +Copyright: 1989, 1991, 2000, Free Software Foundation, Inc
 +License: GPL-2+
 +
 +Files: CREDITS
 +Copyright: 2000-2003, Shie Erlich and Rafi Yanai, 2004-2016, Krusader Krew (krusader * users sourceforge net)
  License: GPL-2+
  
  Files: doc/*
diff --cc debian/upstream/metadata
index dd8f1fa,71d388b..7cc7e2e
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@@ -1,7 -1,3 +1,2 @@@
- Name: krusader
- Changelog: https://quickgit.kde.org/?p=krusader.git&a=log
- Contact: krusader at users.sourceforge.net
- Donation: https://www.kde.org/community/donations/index.php
- Repository: https://anongit.kde.org/krusader.git
- Repository-Browse: https://quickgit.kde.org/?p=krusader.git
- Security-Contact: security at kde.org
 ----
+ Repository: https://invent.kde.org/utilities/krusader.git
+ Repository-Browse: https://invent.kde.org/utilities/krusader