From dfb05211d32675faebac6fd76ef58d9e303a90e7 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Thu, 27 Aug 2020 07:39:43 +0200 Subject: Switch upstream to htop-dev Hisham Muhammad, the original author, has not maintained htop since Feb 2019 and many tries to contact him have failed: https://github.com/hishamhm/htop/issues/992 A new group of developers has - reluctantly - formed to take over the upstream development. Debian is switching to this upstream. --- debian/control | 2 +- debian/copyright | 11 +++---- debian/upstream/metadata | 8 ++--- debian/upstream/signing-key.asc | 65 ----------------------------------------- debian/watch | 5 ++-- 5 files changed, 13 insertions(+), 78 deletions(-) delete mode 100644 debian/upstream/signing-key.asc diff --git a/debian/control b/debian/control index 0df960f..445a20f 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: debhelper-compat (= 13), python3-minimal:native Standards-Version: 4.5.0 Rules-Requires-Root: no -Homepage: https://hisham.hm/htop/ +Homepage: https://htop.dev/ Vcs-Browser: https://salsa.debian.org/debian/htop Vcs-Git: https://salsa.debian.org/debian/htop.git diff --git a/debian/copyright b/debian/copyright index bc6662e..6656ff4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,16 +1,17 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: htop -Upstream-Contact: Hisham Muhammad -Source: http://hisham.hm/htop/releases/ +Upstream-Contact: htop dev team +Source: https://github.com/htop-dev/htop/releases Files: * License: GPL-2+ -Copyright: 2004-2018 Hisham Muhammad +Copyright: 2004-2019 Hisham Muhammad + 2020 htop dev team Files: debian/* License: GPL-2+ -Copyright: 2016 Daniel Lange - 2018 Graham Inggs +Copyright: 2016-2020 Daniel Lange + 2018-2020 Graham Inggs 2008-2016 Eugene V. Lyubimkin 2004-2008 Bartosz Fenski diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 2d8feed..6113602 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,4 +1,4 @@ -Bug-Database: https://github.com/hishamhm/htop/issues -Bug-Submit: https://github.com/hishamhm/htop/issues/new -Repository: https://github.com/hishamhm/htop.git -Repository-Browse: https://github.com/hishamhm/htop +Bug-Database: https://github.com/htop-dev/htop/issues +Bug-Submit: https://github.com/hop-dev/htop/issues/new +Repository: https://github.com/htop-dev/htop.git +Repository-Browse: https://github.com/htop-dev/htop diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc deleted file mode 100644 index 0a418fa..0000000 --- a/debian/upstream/signing-key.asc +++ /dev/null @@ -1,65 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) -Comment: from http://hisham.hm/public_key - -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 -=2P/4 ------END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index b3c2edf..2afb33d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=4 -opts=dversionmangle=s/\+svn(.*)//,\ -pgpsigurlmangle=s/$/.asc/ \ -https://hisham.hm/htop/releases/([\d\.]+)/htop-([\d\.]+)\.tar\.gz +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/-$1\.tar\.gz/ \ + https://github.com/htop-dev/htop/tags .*/archive/(\d{1,2}\.\d.\d)\.tar\.gz \ No newline at end of file -- cgit v1.2.3