OSSP CVS Master Repository
http://cvs.ossp.org/
____________________________________________________________________________
Server: cvs.ossp.org Name: Ralf S. Engelschall
Root: /v/ossp/cvs Email: rse@ossp.org
Module: ossp-pkg Date: 23-Nov-2009 22:55:24
Branch: HEAD Handle: 2009112321552300
Modified files:
ossp-pkg/shtool ChangeLog sh.platform
Log:
reduce platform version M.N.R to M.N also on Linux platforms (like
Debian 5.0.3)
Summary:
Revision Changes Path
1.244 +4 -0 ossp-pkg/shtool/ChangeLog
1.31 +1 -1 ossp-pkg/shtool/sh.platform
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: ossp-pkg/shtool/ChangeLog
============================================================================
$ cvs diff -u -r1.243 -r1.244 ChangeLog
--- ossp-pkg/shtool/ChangeLog 23 Dec 2008 19:12:05 -0000 1.243
+++ ossp-pkg/shtool/ChangeLog 23 Nov 2009 21:55:23 -0000 1.244
@@ -11,6 +11,10 @@
Changes between 2.0.8 and 2.0.9 (18-Jul-2008 to xx-XXX-2008):
+ *) Reduce "shtool platform" version M.N.R to M.N also on Linux
+ platforms (like Debian 5.0.3)
+ [Ralf S. Engelschall]
+
*) Fix "mkln -s /foo /foo/bar" (achieving a "bar -> ." symlink)
[Ralf S. Engelschall]
@@ .
patch -p0 <<'@@ .'
Index: ossp-pkg/shtool/sh.platform
============================================================================
$ cvs diff -u -r1.30 -r1.31 sh.platform
--- ossp-pkg/shtool/sh.platform 2 Apr 2008 20:13:44 -0000 1.30
+++ ossp-pkg/shtool/sh.platform 23 Nov 2009 21:55:23 -0000 1.31
@@ -239,7 +239,7 @@
n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e 's/[_-]version$//'`
v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep '[0-9]' | sed -e 'q' |\
sed -e 's/^/#/' \
- -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
+ -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\).*$/\1[\2]/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
-e 's/^#.*$//'`
@@ .