[Fai-commit] r5098 - in trunk: debian man

[lange at alioth.debian.org]

Author: lange
Date: 2008-09-05 18:53:24 +0000 (Fri, 05 Sep 2008)
New Revision: 5098

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
   trunk/man/setup-storage.8
Log:
apply lintian fixes from mt


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-05 18:44:49 UTC (rev 5097)
+++ trunk/debian/changelog	2008-09-05 18:53:24 UTC (rev 5098)
@@ -2,7 +2,8 @@
 
   * control: add build-depends-indep (closes: #497683),
     add cfengine2 as recommends to fai-client (closes: #442843),
-    remove mknbi, which is not used
+    remove mknbi, which is not used,
+    update to standards version 3.8.0
   * Init.pm: add bugfix that was only in svn but not in the package
     included in 3.2.9 (closes: #494784), fix wrong variable name
   * Volume.pm: ignore output line of parted containing "Model:"

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-09-05 18:44:49 UTC (rev 5097)
+++ trunk/debian/control	2008-09-05 18:53:24 UTC (rev 5098)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: extra
 Maintainer: Thomas Lange <lange at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 Build-Depends-Indep: debiandoc-sgml, texlive-base-bin, texlive-latex-extra, texlive-fonts-recommended
 Build-Depends: debhelper (>= 4.1.16)
 Vcs-Svn: svn://svn.debian.org/svn/fai/trunk

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-09-05 18:44:49 UTC (rev 5097)
+++ trunk/debian/rules	2008-09-05 18:53:24 UTC (rev 5098)
@@ -25,7 +25,7 @@
 #	dh_testroot
 	rm -f build-stamp
 # Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 	dh_clean
 
 install: build

Modified: trunk/man/setup-storage.8
===================================================================
--- trunk/man/setup-storage.8	2008-09-05 18:44:49 UTC (rev 5097)
+++ trunk/man/setup-storage.8	2008-09-05 18:53:24 UTC (rev 5098)
@@ -158,12 +158,12 @@
 .Pp
 .Bd -literal
 lvmoption ::= /* empty */
-           | preserve_always:[^/,\s\-]+-[^/,\s\-]+(,[^/,\s\-]+-[^/,\s\-]+)*
+           | preserve_always:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
            /* preserve partitions -- always */
-           | preserve_reinstall:[^/,\s\-]+-[^/,\s\-]+(,[^/,\s\-]+-[^/,\s\-]+)*
+           | preserve_reinstall:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
            /* preserve partitions -- unless the system is installed for the 
            first time */
-           | resize:[^/,\s\-]+-[^/,\s\-]+(,[^/,\s\-]+-[^/,\s\-]+)*
+           | resize:[^/,\\s\\-]+-[^/,\\s\\-]+(,[^/,\\s\\-]+-[^/,\\s\\-]+)*
            /* attempt to resize partitions */
            | fstabkey:(device|label|uuid)
            /* when creating the fstab, the key used for defining the device