[or-cvs] r13127: Minor clean up in documentation and catalyst spec files. Fix (in incognito/trunk: arch/x86 root_overlay/usr/sbin root_overlay/usr/share/incognito)

Mon Jan 14 05:49:02 UTC 2008

Author: anonym
Date: 2008-01-14 00:49:02 -0500 (Mon, 14 Jan 2008)
New Revision: 13127

Modified:
   incognito/trunk/arch/x86/livecd-stage2.spec
   incognito/trunk/root_overlay/usr/sbin/replace-versions.pl
   incognito/trunk/root_overlay/usr/share/incognito/readme.html
Log:
Minor clean up in documentation and catalyst spec files.
Fixed a bug where package names couldn't include _ in replace-versions.pl.


Modified: incognito/trunk/arch/x86/livecd-stage2.spec
===================================================================

--- incognito/trunk/arch/x86/livecd-stage2.spec	2008-01-14 03:24:47 UTC (rev 13126)
+++ incognito/trunk/arch/x86/livecd-stage2.spec	2008-01-14 05:49:02 UTC (rev 13127)
@@ -357,7 +357,6 @@
 	/etc/splash/livecd-2006.1/images/verbose-6*
 	/etc/splash/livecd-2006.1/images/verbose-8*
 	/lib*/*.a
-#	/lib*/*.la
 	/lib*/cpp
 #	/lib*/security/pam_access.so
 #	/lib*/security/pam_chroot.so
@@ -420,7 +419,6 @@
 	/usr/bin/xpak
 	/usr/bin/yacc
 	/usr/lib*/*.a
-#	/usr/lib*/*.la
 	/usr/lib*/gcc-lib/*/*/libgcj*
 	/usr/sbin/archive-conf
 	/usr/sbin/bootsplash*
@@ -428,7 +426,6 @@
 	/usr/sbin/emaint
 	/usr/sbin/emerge-webrsync
 	/usr/sbin/env-update
-#	/usr/sbin/fb*
 	/usr/sbin/fixpackages
 	/usr/sbin/quickpkg
 	/usr/sbin/regenworld
@@ -464,8 +461,6 @@
 	/usr/lib*/python2.4/test
 	/usr/bin/Xnest
 	/usr/bin/Xvfb
-#	/usr/lib/*python*
-#	/usr/bin/*python*
 	/var/log/*.log
 	/usr/lib/gcc/i686-pc-linux-gnu/*/include
 	/usr/lib/gcc/i686-pc-linux-gnu/*/libgfortran*

Modified: incognito/trunk/root_overlay/usr/sbin/replace-versions.pl
===================================================================
--- incognito/trunk/root_overlay/usr/sbin/replace-versions.pl	2008-01-14 03:24:47 UTC (rev 13126)
+++ incognito/trunk/root_overlay/usr/sbin/replace-versions.pl	2008-01-14 05:49:02 UTC (rev 13127)
@@ -19,7 +19,7 @@
 	open PKG, $packages;
 	while (<PKG>)
 	{
-		if (m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-]+)-([0-9pr\-.]+)/) {
+		if (m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-_]+)-([0-9pr\-.]+)/) {
 			$versions{$1} = $2;
 		}
 	}
@@ -33,7 +33,7 @@
 		chomp($_);
 		local $pkg = $_;
 		$pkg =~ s:/var/db/pkg/::;
-		if ($pkg =~ m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-]+)-([0-9pr\-.]+)/) {
+		if ($pkg =~ m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-_]+)-([0-9pr\-.]+)/) {
 			$versions{$1} = $2;
 			chomp($desc{$1} = `cat $_/DESCRIPTION`);
 			chomp($homepage{$1} = `cat $_/HOMEPAGE`);

Modified: incognito/trunk/root_overlay/usr/share/incognito/readme.html
===================================================================
--- incognito/trunk/root_overlay/usr/share/incognito/readme.html	2008-01-14 03:24:47 UTC (rev 13126)
+++ incognito/trunk/root_overlay/usr/share/incognito/readme.html	2008-01-14 05:49:02 UTC (rev 13127)
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>__INCOGNITO_TITLE__</title>
+<title>__INCOGNITO_TITLE__ Documentation</title>
 </head>
 
 <body>

