Remove dh_desktop

Signed-off-by: Niels Thykier <niels@thykier.net>

3 files changed, 10 insertions, 53 deletions

diff --git a/debian/changelog b/debian/changelog
index 56b608c9..94ce5b66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (9.20160313+unreleased) UNRELEASED; urgency=medium
+
+  * Remove dh_desktop.
+  * dh_install: Fix a regression where a non-existing file
+    was ignored if another file was matched for the same
+    destination dir.  Thanks to Ben Hutchings for reporting
+    the issue.  (Closes: #818834)
+
+ -- Niels Thykier <niels@thykier.net>  Thu, 31 Mar 2016 21:09:07 +0000
+
 debhelper (9.20160313) unstable; urgency=medium
 
   * Remove dh_undocumented.
@@ -6,10 +16,6 @@ debhelper (9.20160313) unstable; urgency=medium
   * dh_compress: Gracefully handle absolute paths passed via
     the -P option.  Thanks to Andreas Beckmann for reporting
     the issue.  (Closes: #818049)
-  * dh_install: Fix a regression where a non-existing file
-    was ignored if another file was matched for the same
-    destination dir.  Thanks to Ben Hutchings for reporting
-    the issue.  (Closes: #818834)
 
  -- Niels Thykier <niels@thykier.net>  Sun, 13 Mar 2016 14:21:02 +0000
 
diff --git a/dh_desktop b/dh_desktop
deleted file mode 100755
index 7495eefc..00000000
--- a/dh_desktop
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl
-
-=head1 NAME
-
-dh_desktop - deprecated no-op
-
-=cut
-
-use strict;
-use warnings;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_desktop> [S<I<debhelper options>>]
-
-=head1 DESCRIPTION
-
-B<dh_desktop> was a debhelper program that registers F<.desktop> files.
-However, it no longer does anything, and is now deprecated.
-
-If a package ships F<desktop> files, they just need to be installed in the
-correct location (F</usr/share/applications>) and they will be registered by
-the appropriate tools for the corresponding desktop environments.
-
-=cut
-
-init();
-
-warning("This program is deprecated, and does nothing anymore.");
-
-=head1 SEE ALSO
-
-L<debhelper>
-
-This program is a part of debhelper.
-
-=head1 AUTHOR
-
-Ross Burton <ross@burtonini.com>
-
-=cut
-
-# Local Variables:
-# indent-tabs-mode: t
-# tab-width: 4
-# cperl-indent-level: 4
-# End:
diff --git a/man/po4a/po4a.cfg b/man/po4a/po4a.cfg
index 39e1489d..f16f28f0 100644
--- a/man/po4a/po4a.cfg
+++ b/man/po4a/po4a.cfg
@@ -15,7 +15,6 @@
 [type: pod] dh_builddeb 	$lang:man/$lang/dh_builddeb.pod		add_fr:man/po4a/add.fr	add_es:man/po4a/add1.es  add_de:man/po4a/add.de  add_pt:man/po4a/add.pt
 [type: pod] dh_clean 		$lang:man/$lang/dh_clean.pod		add_fr:man/po4a/add.fr	add_es:man/po4a/add1.es  add_de:man/po4a/add.de  add_pt:man/po4a/add.pt
 [type: pod] dh_compress 	$lang:man/$lang/dh_compress.pod		add_fr:man/po4a/add.fr	add_es:man/po4a/add1.es  add_de:man/po4a/add.de  add_pt:man/po4a/add.pt
-[type: pod] dh_desktop		$lang:man/$lang/dh_desktop.pod		add_fr:man/po4a/add.fr	add_es:man/po4a/add1.es  add_de:man/po4a/add.de  add_pt:man/po4a/add.pt
 [type: pod] dh_fixperms 	$lang:man/$lang/dh_fixperms.pod		add_fr:man/po4a/add.fr	add_es:man/po4a/add1.es  add_de:man/po4a/add.de  add_pt:man/po4a/add.pt
 [type: pod] dh_gconf 		$lang:man/$lang/dh_gconf.pod		add_fr:man/po4a/add.fr	add_es:man/po4a/add1.es  add_de:man/po4a/add.de  add_pt:man/po4a/add.pt
 [type: pod] dh_gencontrol 	$lang:man/$lang/dh_gencontrol.pod	add_fr:man/po4a/add.fr	add_es:man/po4a/add1.es  add_de:man/po4a/add.de  add_pt:man/po4a/add.pt