Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

2 files changed, 11 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 75b29ac3..34cb71fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.3.16) UNRELEASED; urgency=low
+
+  * dh_desktop: Clarify in man page why it's a no-op.
+    Closes: #543364
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 24 Aug 2009 12:59:02 -0400
+
 debhelper (7.3.15) unstable; urgency=low
 
   * dh_installudev: Install rules files into new location
diff --git a/dh_desktop b/dh_desktop
index 6fb7d021..f0488c56 100755
--- a/dh_desktop
+++ b/dh_desktop
@@ -18,6 +18,10 @@ B<dh_desktop> [S<I<debhelper options>>]
 dh_desktop was a debhelper program that registers .desktop files.
 However, it no longer does anything, and is now deprecated.
 
+If a package ships desktop files, they just need to be installed in the
+correct location (/usr/share/applications) and they will be registered by
+the appropriate tools for the corresponding desktop environments.
+
 =cut
 
 init();