2.1.99-test1 released

git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-26

diff --git a/ChangeLog b/ChangeLog
index 11ae1e5a186f39be2eaa0993c4a042a00f751216..767e7ce8ef36b7a930beda2aa78405431a3a48e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-12-27  Martin Mares  <mj@ucw.cz>
 
+       * Released as 2.1.99-test1.
+
        * pciutils.h, common.c, lspci.man, setpci.man, lib/internal.h:
        Remove shadows of the syscall access method which was never
        implemented.

diff --git a/Makefile b/Makefile
index 65436dbd3eb9e6f3338657ce747adc6ca8e627c4..159a17914a809db9fe978e6345cb49688e0db0c7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,8 @@
 OPT=-O2 -fomit-frame-pointer
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
 
-VERSION=2.1.12
-SUFFIX=-pre1
-DATE=2003-12-26
+VERSION=2.1.99-test1
+DATE=2003-12-27
 
 PREFIX=/usr/local
 SBINDIR=$(PREFIX)/sbin
@@ -49,7 +48,7 @@ update-pciids: update-pciids.sh
        sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/pci.ids@"
 
 %.8: %.man
-       M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)$(SUFFIX)/;s#@SHAREDIR@#$(SHAREDIR)#"
+       M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@SHAREDIR@#$(SHAREDIR)#"
 
 clean:
        rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core`
@@ -75,21 +74,21 @@ pci.ids:
        @ [ -f pci.ids ] || echo >&2 "The pci.ids file is no longer part of the CVS. Please do run update-ids.sh to download them." && false
 
 release:
-       sed "s/^\\(Version:[    ]*\\)[0-9.]*/\\1$(VERSION)/;s/^\\(Entered-date:[        ]*\\)[0-9]*/\\1`date -d$(DATE) '+%y%m%d'`/;s/\\(pciutils-\\)[0-9.]*/\\1$(VERSION)\\./" <pciutils.lsm >pciutils.lsm.new
-       sed "s/^\\(Version:[    ]*\\)[0-9.]*/\\1$(VERSION)/" <pciutils.spec >pciutils.spec.new
-       sed "s/\\(, version \\).*\./\\1$(VERSION)$(SUFFIX)./" <README >README.new
+       sed "s/^\\(Version:[    ]*\\).*/\\1$(VERSION)/;s/^\\(Entered-date:[     ]*\\)[0-9]*/\\1`date -d$(DATE) '+%y%m%d'`/;s/\\(pciutils-\\)[0-9.]*/\\1$(VERSION)\\./" <pciutils.lsm >pciutils.lsm.new
+       sed "s/^\\(Version:[    ]*\\).*/\\1$(VERSION)/" <pciutils.spec >pciutils.spec.new
+       sed "s/\\(, version \\).*\./\\1$(VERSION)./" <README >README.new
        mv pciutils.lsm.new pciutils.lsm
        mv pciutils.spec.new pciutils.spec
        mv README.new README
 
-REL=pciutils-$(VERSION)$(SUFFIX)
+REL=pciutils-$(VERSION)
 DISTTMP=/tmp/pciutils-dist
 
 dist: clean pci.ids
        rm -rf $(DISTTMP)
        mkdir $(DISTTMP)
        cp -a . $(DISTTMP)/$(REL)
-       rm -rf `find $(DISTTMP)/$(REL) -name CVS -o -name tmp -o -name maint`
+       rm -rf `find $(DISTTMP)/$(REL) -name "{arch}" -o -name CVS -o -name tmp -o -name maint`
        cd $(DISTTMP) ; tar czvvf /tmp/$(REL).tar.gz $(REL)
        rm -rf $(DISTTMP)
 

diff --git a/README b/README
index 7a8b411bc444881dbe85f054af3ddf862378f7d3..59e46ee2c15db62259e645177a6db422b40044f1 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This package contains the PCI Utilities, version 2.1.11.
+This package contains the PCI Utilities, version 2.1.99-test1.
 
 Copyright (c) 1997--2003 Martin Mares <mj@ucw.cz>
 

diff --git a/TODO b/TODO
index cb231c45f466df48ea2a041eebb8bf2c2cfbc46b..b239f633413e1b57d73d97a1740ec0a0c4f76aa6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
-- lspci: don't die when non-root tries to dump cardbus data
+- lspci: don't die when non-root tries to dump cardbus data; mention the
+  "available only to root" things in the man page.
 
 - pci.ids: "Unknown mass storage controller" -> "Mass storage controller".

diff --git a/pciutils.lsm b/pciutils.lsm
index 6cf8c58e9faad26940595b4f28983b81fc386dfa..2c12a0f74401c8c891e4ef042cdf021dcfe8da8e 100644 (file)
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,14 +1,14 @@
 Begin3
 Title:          Linux PCI Utilities
-Version:        2.1.11
-Entered-date:   030104
+Version:        2.1.99-test1
+Entered-date:   031227
 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus.
 Keywords:       kernel, pci, lspci, setpci, libpci
 Author:         mj@ucw.cz (Martin Mares)
 Maintained-by:  mj@ucw.cz (Martin Mares)
-Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.11.tar.gz
-Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-2.1.11.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.11.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.99-test1.tar.gz
+Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-2.1.99-test1.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.99-test1.tar.gz
 Copying-policy: GPL
 End

diff --git a/pciutils.spec b/pciutils.spec
index f1593886c8ef471299e524a2a1738d4b7bf4d4cd..a983b74067de57c84c856a33f9211ff54340a268 100644 (file)
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,5 +1,5 @@
 Name:          pciutils
-Version:       2.1.11
+Version:       2.1.99-test1
 Release:       1
 Source:                ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:     GNU GPL