r1719: releasing version 4.2.22

3 files changed, 56 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index f9c39f3a..470e3ad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (4.2.22) unstable; urgency=low
+
+  * dh_desktop Spanish man page from Ruben Porras.
+  * dh_desktop: reindent
+  * dh_desktop: only register files in /usr/share/applications
+    with update-desktop-database. Closes: #278353
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 16 Oct 2004 13:42:29 -0400
+
 debhelper (4.2.21) unstable; urgency=low
 
   * Add dh_desktop, from Ross Burton. Closes: #275454
diff --git a/dh_desktop b/dh_desktop
index 8baf6843..3be468b0 100644
--- a/dh_desktop
+++ b/dh_desktop
@@ -25,19 +25,19 @@ fragements to call F<update-desktop-database>.
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
-  my $tmp=tmpdir($package);
-
-  # Only run if there are .desktop files installed
-  if (-d "$tmp/usr/share/applications") {
-    # Get a list of the desktop files
-    my $desktop_files = `find debian/$package/ -type f -name \*.desktop -printf '%p\n'`;
-    # If there actually were some desktop files...
-    if ($desktop_files && ! $dh{NOSCRIPTS}) {
-      # Don't add a dependency on desktop-file-utils as it may not be needed
-      autoscript($package,"postinst","postinst-desktop");
-      autoscript($package,"postrm","postrm-desktop");
-    }
-  }
+	y $tmp=tmpdir($package);
+
+	if (-d "$tmp/usr/share/applications") {
+		# Get a list of the desktop files that are in
+		# usr/share/applications and thus might need
+		# update-desktop-database be called. Other desktop
+		# files don't.
+		my $desktop_files = `find $tmp/usr/share/applications -type f -name \*.desktop -printf '%p\n'`;
+		if ($desktop_files && ! $dh{NOSCRIPTS}) {
+			autoscript($package,"postinst","postinst-desktop");
+			autoscript($package,"postrm","postrm-desktop");
+		}
+	}
 }
 
 =head1 SEE ALSO
diff --git a/man/es/dh_desktop.pod b/man/es/dh_desktop.pod
new file mode 100644
index 00000000..48667c9c
--- /dev/null
+++ b/man/es/dh_desktop.pod
@@ -0,0 +1,34 @@
+# (c) 2003 Software in the Public Interest
+# Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
+# Está basada en la página de manual original:
+# versión 4.2.21 de debhelper
+
+=head1 NOMBRE
+
+dh_desktop - Registra ficheros .desktop
+
+=head1 SINOPSIS
+
+B<dh_desktop> [S<I<opciones debhelper>>] [B<-p<paquete>>]
+
+=head1 DESCRIPCIÓN
+
+dh_desktop es un programa de debhelper que registra ficheros .desktop.  En la
+actualidad no gestiona la instalación de los ficheros, aunque puede que lo haga
+en un futuro. Se preocupa de añadir los fragmentos necesario para llamar a
+F<update-desktop-database> en los scripts del desarrollador.
+
+=head1 VÉASE TAMBIÉN
+
+L<debhelper(7)>
+
+Este programa es parte de debhelper.
+
+=head1 AUTOR
+
+Ross Burton <ross@burtonini.com>
+
+=head1 TRADUCTOR
+
+Traducción de Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>
+