From 685738adc2500d3a94cf90f047e5c34b3a198905 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 10 Apr 2012 12:51:06 -0400
Subject: reorder

---
 dh_installinit | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'dh_installinit')

diff --git a/dh_installinit b/dh_installinit
index 4daff14a..9c8c1550 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_installinit - install upstart jobs and/or init scripts into package build directories
+dh_installinit - install init scripts and/or upstart jobs into package build directories
 
 =cut
 
@@ -16,22 +16,17 @@ B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-R>]
 =head1 DESCRIPTION
 
 B<dh_installinit> is a debhelper program that is responsible for installing
-upstart job files and init scripts with associated defaults files into
-package build directories.
+init scripts with associated defaults files, as well as upstart job files
+into package build directories.
 
-It also automatically generates the F<postinst> and F<postrm> and F<prerm> commands
-needed to set up the symlinks in F</etc/rc*.d/> to start and stop the init
-scripts.
+It also automatically generates the F<postinst> and F<postrm> and F<prerm>
+commands needed to set up the symlinks in F</etc/rc*.d/> to start and stop
+the init scripts.
 
 =head1 FILES
 
 =over 4
 
-=item debian/I<package>.upstart
-
-If this exists, it is installed into etc/init/I<package>.conf in the package
-build directory.
-
 =item debian/I<package>.init
 
 If this exists, it is installed into etc/init.d/I<package> in the package
@@ -42,6 +37,11 @@ build directory.
 If this exists, it is installed into etc/default/I<package> in the package
 build directory.
 
+=item debian/I<package>.upstart
+
+If this exists, it is installed into etc/init/I<package>.conf in the package
+build directory.
+
 =back
 
 =head1 OPTIONS
@@ -97,12 +97,13 @@ passed to L<update-rc.d(8)>.
 
 =item B<--name=>I<name>
 
-Install the upstart job file and init script (and default file) using the
-filename I<name> instead of the default filename, which is the package name.
-When this parameter is used, B<dh_installinit> looks for and installs files
-named F<debian/package.name.upstart>, F<debian/package.name.init> and
-F<debian/package.name.default>, instead of the usual F<debian/package.upstart>,
-F<debian/package.init> and F<debian/package.default>.
+Install the init script (and default file) as well as upstart job file
+using the filename I<name> instead of the default filename, which is
+the package name. When this parameter is used, B<dh_installinit> looks
+for and installs files named F<debian/package.name.init>,
+F<debian/package.name.default> and F<debian/package.name.upstart>
+instead of the usual F<debian/package.init>, F<debian/package.default> and
+F<debian/package.upstart>.
 
 =item B<--init-script=>I<scriptname>
 
-- 
cgit v1.2.3