[Initscripts-ng-commits] r877 - in /trunk/src/insserv/debian: changelog compat control manpages patches/80_manual_warnings.patch patches/90_no_runlevel_spec_for_debian.patch patches/series rules

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Sun Mar 15 12:27:23 UTC 2009


Author: kelmo-guest
Date: Sun Mar 15 12:27:22 2009
New Revision: 877

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=877
Log:
* Add debian/manpages and call dh_installman without specific
  arguments in debian/rules.
* Depend on debhelper >= 6 and use compat level of 6.
* Update to Standards-Version 3.8.1 without any required changes.
* Add Homepage field to debian/control.
* Add debian/patches/80_manual_warnings.patch to correct format,
  spelling and grammar errors in manual page.
* Add debian/patches/90_no_runlevel_spec_for_debian.patch to remove
  reference to known runlevels on Debian systems. These should be
  defined in Debian policy. (Closes: #500542)

Added:
    trunk/src/insserv/debian/manpages
    trunk/src/insserv/debian/patches/80_manual_warnings.patch
    trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/compat
    trunk/src/insserv/debian/control
    trunk/src/insserv/debian/patches/series
    trunk/src/insserv/debian/rules

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=877&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Mar 15 12:27:22 2009
@@ -9,8 +9,18 @@
     Fink for giving us th heads up about this problem and patch.
   * Add Japanese translation. Thanks Hideki Yamane. (Closes: #512858)
   * Add Swedish translation. Thanks Martin Bagge. (Closes: #503603)
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 15 Mar 2009 01:57:38 +1000
+  * Add debian/manpages and call dh_installman without specific
+    arguments in debian/rules.
+  * Depend on debhelper >= 6 and use compat level of 6.
+  * Update to Standards-Version 3.8.1 without any required changes.
+  * Add Homepage field to debian/control.
+  * Add debian/patches/80_manual_warnings.patch to correct format,
+    spelling and grammar errors in manual page.
+  * Add debian/patches/90_no_runlevel_spec_for_debian.patch to remove
+    reference to known runlevels on Debian systems. These should be
+    defined in Debian policy. (Closes: #500542)
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 15 Mar 2009 19:56:45 +1000
 
 insserv (1.12.0-4) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/compat
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/compat?rev=877&op=diff
==============================================================================
--- trunk/src/insserv/debian/compat (original)
+++ trunk/src/insserv/debian/compat Sun Mar 15 12:27:22 2009
@@ -1,1 +1,1 @@
-4
+6

Modified: trunk/src/insserv/debian/control
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/control?rev=877&op=diff
==============================================================================
--- trunk/src/insserv/debian/control (original)
+++ trunk/src/insserv/debian/control Sun Mar 15 12:27:22 2009
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Petter Reinholdtsen <pere at debian.org>
 Uploaders: Kel Modderman <kel at otaku42.de>
-Build-Depends: debhelper (>= 4.0.0), po-debconf, quilt
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 6), po-debconf, quilt
+Standards-Version: 3.8.1
+Homepage: http://ftp.suse.com/pub/projects/init/
 Vcs-Svn: svn://svn.debian.org/initscripts-ng/trunk/src/insserv
 Vcs-Browser: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv
 

Added: trunk/src/insserv/debian/manpages
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/manpages?rev=877&op=file
==============================================================================
--- trunk/src/insserv/debian/manpages (added)
+++ trunk/src/insserv/debian/manpages Sun Mar 15 12:27:22 2009
@@ -1,0 +1,2 @@
+debian/update-bootsystem-insserv.8
+debian/update-rc.d-insserv.8

Added: trunk/src/insserv/debian/patches/80_manual_warnings.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/80_manual_warnings.patch?rev=877&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/80_manual_warnings.patch (added)
+++ trunk/src/insserv/debian/patches/80_manual_warnings.patch Sun Mar 15 12:27:22 2009
@@ -1,0 +1,112 @@
+Purpose: Fix format warnings of manual page
+Fixes:   lintian - manpage-has-errors-from-man
+Status:  Not yet submitted upstream.
+---
+--- a/insserv.8.in
++++ b/insserv.8.in
+@@ -12,11 +12,9 @@
+ @@BEGIN_SUSE@@
+ .TH INSSERV 8 "Jul 29, 2008" "Version 1.11" "The SuSE boot concept"
+ .UC 8
+-.OS SuSE Linux
+ @@ELSE_SUSE@@
+ .TH INSSERV 8 "Jul 29, 2008" "Version 1.11"
+ .UC 8
+-.OS Debian
+ @@END_SUSE@@
+ .SH NAME
+ insserv \- Enable an installed system init script
+@@ -35,9 +33,9 @@ insserv \- Enable an installed system in
+ .RB [ \-c\ <config> ]
+ .RB [ \-p\ <path> ]
+ @@BEGIN_SUSE@@
+-.RI [[ / ] path/to/init.d/ ] script [ ,start=<lvl1> [ ,<lvl2>\ ... ]
++.RI [[ / ] path/to/init.d/ ] script [ ,start=<lvl1,lvl2,...> ]
+ @@ELSE_SUSE@@
+-.RI [[ / ] path/to/init.d/ ] script [ ,start=<lvl1> [ ,<lvl2>\ ... ] ,stop=<lvl1> [ ,<lvl2>\ ... ]]
++.RI [[ / ] path/to/init.d/ ] script [ ,start=<lvl1,lvl2,...> ,stop=<lvl1,lvl2,...> ]
+ @@END_SUSE@@
+ .PP
+ .B insserv
+@@ -123,7 +121,7 @@ keyword implies that the script using th
+ should be started
+ .B before
+ the specified service names.
+-Wereas the optional
++Whereas the optional
+ .B X\-Stop\-After
+ keyword implies that the script using this keyword
+ should be stopped
+@@ -217,7 +215,7 @@ as an interactive one, e.g. a service wh
+ a passphrase or password input during boot
+ or runlevel change.
+ .P
+-Beside the defined
++In addition to the defined
+ .B System Facilities
+ in the configuration file
+ .IR /etc/insserv.conf ,
+@@ -240,8 +238,8 @@ Specify path to the insserv.conf file an
+ directory.  Useful for testing.
+ .TP
+ .BR \-o\ <path> ,\  \-\-override\ <path>
+-Path to replace existing LSB comment headers with the comment
+-headers found in this path (default path is
++LSB comment headers found in this path will override existing
++LSB comment headers of scripts in the init.d directory (default path is
+ .IR /etc/insserv/overrides/ ).
+ .TP
+ .BR \-p\ <path> ,\  \-\-path\ <path>
+@@ -254,7 +252,7 @@ Do not update symlinks.
+ Remove the listed scripts from all runlevels.
+ .TP
+ .BR \-d ,\  \-\-default
+-Use default runlevels a defined in the scripts.
++Use default runlevels as defined in the scripts.
+ This may restore an edited runlevel link scheme.
+ .TP
+ .BR \-f ,\  \-\-force
+@@ -297,17 +295,16 @@ checks for the existence of these script
+ For the runlevels the information found in
+ the script is used.
+ .TP
+-.RI [[ / ] path/to/init.d/ ] script [ ,start=<lvl1> [ ,<lvl2> ]]\ ...
++.RI [[ / ] path/to/init.d/ ] script [ ,start=<lvl1,lvl2,...> ]
+ List of scripts which have to be added to
+ the specified runlevels to be started with.
+ You may use this extension to override the default values
+ for start and stop runlevels of the script.
+ Note that
+-.BR <lvl1> ,\  <lvl2> ,\ ...
++.BR lvl1 ,\  lvl2 ,\ ...
+ are the known runlevels explained above.
+ The extension
+-.IR ,stop=<lvl1> [ ,<lvl2> ]]
+-is possible
++.IR ,stop=<lvl1,lvl2,...>
+ @@BEGIN_SUSE@@
+ is possible but ignored on SuSE Linux.
+ @@ELSE_SUSE@@
+@@ -324,9 +321,9 @@ checks for the existence of these script
+ .\"
+ .SH OVERRIDES
+ Beside using the extensions
+-.IR ,start=<lvl1> [ ,<lvl2> ]]
++.IR ,start=<lvl1,lvl2,...>
+ and
+-.IR ,stop=<lvl1> [ ,<lvl2> ]]
++.IR ,stop=<lvl1,lvl2,...>
+ it is possible to use override files replace a LSB comment header
+ or simple provide a missing LSB comment header.  This can be done
+ by placing a file with the new LSB comment header using the same
+@@ -379,7 +376,9 @@ of the following characters
+ .sp 1
+ will be ignored.
+ .SH BUGS
+-Boot script sometimes misses comments.
++Boot scripts sometimes lack a LSB comment header. Contact a package
++maintainer or developer of the software which provides the script to
++have a LSB comment header added to it.
+ .SH FILES
+ .TP
+ .I /etc/insserv.conf

Added: trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch?rev=877&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch (added)
+++ trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch Sun Mar 15 12:27:22 2009
@@ -1,0 +1,31 @@
+Purpose: Debian runlevels are a bit different to SUSE.
+Fixes:   #500542
+Status:  Not yet submitted upstream.
+---
+--- a/insserv.8.in
++++ b/insserv.8.in
+@@ -137,6 +137,7 @@ directories (see \fI init.d\fR (7)).
+ @@ELSE_SUSE@@
+ directories.
+ @@END_SUSE@@
++@@BEGIN_SUSE@@
+ Known runlevels are:
+ .sp 1
+ .in +1l
+@@ -148,15 +149,12 @@ Known runlevels are:
+  \fB4\fR\   reserved for local use
+  \fB5\fR\   used for full multiuser with network and xdm
+  \fB6\fR\   used for System reboot
+-@@BEGIN_SUSE@@
+  \fBS\fR\   used during boot into single user mode
+  \fBB\fR\   used during boot before any other runlevel
+-@@ELSE_SUSE@@
+- \fBS\fR\   used during boot before any other runlevel
+-@@END_SUSE@@
+ .fi
+ .in -1l
+ .sp 1
++@@END_SUSE@@
+ .PP
+ .B insserv
+ scans for

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=877&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Sun Mar 15 12:27:22 2009
@@ -5,3 +5,5 @@
 50_symlink_in_initddir.patch
 60_all_keyword_start_only.patch
 70_req_start_all_depends.patch 
+80_manual_warnings.patch
+90_no_runlevel_spec_for_debian.patch

Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=877&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Sun Mar 15 12:27:22 2009
@@ -83,7 +83,7 @@
 	dh_installexamples
 	dh_installdebconf
 #	dh_install
-	dh_installman debian/update-bootsystem-insserv.8 debian/update-rc.d-insserv.8
+	dh_installman
 	dh_link
 	dh_strip
 	dh_compress




More information about the Initscripts-ng-commits mailing list