[csw-devel] SF.net SVN: gar:[5159] csw/mgar/pkg/cswutils/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5159
          http://gar.svn.sourceforge.net/gar/?rev=5159&view=rev
Author:   dmichelsen
Date:     2009-06-04 20:39:42 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
cswutils: Minor fixes from Phil

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/Makefile
    csw/mgar/pkg/cswutils/trunk/checksums
    csw/mgar/pkg/cswutils/trunk/files/checkpkg
    csw/mgar/pkg/cswutils/trunk/files/createpkg

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2009-06-04 20:34:09 UTC (rev 5158)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2009-06-04 20:39:42 UTC (rev 5159)
@@ -1,5 +1,5 @@
 GARNAME = cswutils
-GARVERSION = 1.14.1
+GARVERSION = 1.14.2
 CATEGORIES = utils
 
 DESCRIPTION = Utilities for CSW maintainers

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2009-06-04 20:34:09 UTC (rev 5158)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2009-06-04 20:39:42 UTC (rev 5159)
@@ -1,8 +1,8 @@
 091b12575ebc0e45cf8c3d8b43d8b638  download/COPYING
-0b9aeb7ab703b45e0961020bc4587f61  download/checkpkg
+94fc299b1be5cc4c20f92721ef43573b  download/checkpkg
 6ec3b6597e04714430987ccc199db3c4  download/checkpkg.8
 9a637f6546cc50974159a987302d91c0  download/cpan2pkg
-2349d876bada6ee1bf025e576ec2c465  download/createpkg
+44e944a12a8691068de0c95e1052a922  download/createpkg
 a605598f30195f9ab1b29fc3944d3b31  download/createpkg.8
 cd4496ee27bf86d5c8bc656c9c5974be  download/stagepkg
 8908a0a898aa07a7a928b2b8bd8384f0  download/stagepkg.8

Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg
===================================================================
--- csw/mgar/pkg/cswutils/trunk/files/checkpkg	2009-06-04 20:34:09 UTC (rev 5158)
+++ csw/mgar/pkg/cswutils/trunk/files/checkpkg	2009-06-04 20:39:42 UTC (rev 5159)
@@ -1,6 +1,6 @@
 #!/bin/ksh -p
 
-# checkpkg 2.7
+# checkpkg 2.8
 # This script examines a package that has been put together
 # for submittal to the CSW archive at opencsw.org
 #
@@ -326,15 +326,15 @@
 	if [[ $? -eq 0 ]] ; then
 	errmsg You must have execute permission set on directories
 	fi
-	egrep '/opt/csw/man|d none man' $EXTRACTDIR/$pkgname/pkgmap
+	egrep '/opt/csw/man/|d none man' $EXTRACTDIR/$pkgname/pkgmap
 	if [[ $? -eq 0 ]] ; then
 	errmsg /opt/csw/man should not have a directory entry in prototype
 	fi
-	egrep '/opt/csw/doc|d none doc' $EXTRACTDIR/$pkgname/pkgmap
+	egrep '/opt/csw/doc/|d none doc' $EXTRACTDIR/$pkgname/pkgmap
 	if [[ $? -eq 0 ]] ; then
 	errmsg /opt/csw/doc should not have a directory entry in prototype
 	fi
-	egrep '/opt/csw/info|d none info' $EXTRACTDIR/$pkgname/pkgmap
+	egrep '/opt/csw/info/|d none info' $EXTRACTDIR/$pkgname/pkgmap
 	if [[ $? -eq 0 ]] ; then
 	errmsg /opt/csw/info should not have a directory entry in prototype
 	fi

Modified: csw/mgar/pkg/cswutils/trunk/files/createpkg
===================================================================
--- csw/mgar/pkg/cswutils/trunk/files/createpkg	2009-06-04 20:34:09 UTC (rev 5158)
+++ csw/mgar/pkg/cswutils/trunk/files/createpkg	2009-06-04 20:39:42 UTC (rev 5159)
@@ -1,6 +1,6 @@
 #!/bin/ksh -p
 
-# createpkg 1.6 
+# createpkg 
 # This script actually builds the package.. once you have already
 # put together the pkginfo and prototype file.
 # See the makeproto script for a way to make a prototype file.
@@ -64,13 +64,13 @@
 fi
 
 grep 'i copyright' $PROTO || die need copyright in $PROTO
-grep 'root other' $PROTO && die fix $PROTO file
-grep 'csw/man' $PROTO && die fix csw/man entry in $PROTO file
-grep 'none man' $PROTO && die fix csw/man entry in $PROTO file
-grep 'csw/info' $PROTO && die fix csw/info entry in $PROTO file
-grep 'none info' $PROTO && die fix csw/info entry in $PROTO file
-grep 'csw/doc' $PROTO && die fix csw/doc entry in $PROTO file
-grep 'none doc' $PROTO && die fix csw/doc entry in $PROTO file
+grep 'root other' $PROTO && die fix $PROTO file: root other ownership
+grep 'csw/man/' $PROTO && die fix csw/man entry in $PROTO file
+grep 'none man/' $PROTO && die fix csw/man entry in $PROTO file
+grep 'csw/info/' $PROTO && die fix csw/info entry in $PROTO file
+grep 'none info/' $PROTO && die fix csw/info entry in $PROTO file
+grep 'csw/doc/' $PROTO && die fix csw/doc entry in $PROTO file
+grep 'none doc/' $PROTO && die fix csw/doc entry in $PROTO file
 
 grep 'Replace this file' copyright && die fix copyright file
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.