From: The PCI ID Mail Robot <pciids@ucw.cz>
Date: Fri, 3 Oct 2008 17:54:43 +0000 (+0200)
Subject: Merge branch 'master' of /home/vorner/pciids
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=6bee93a95d2c5feac17dd687f1bab5f653bff280;p=pciids.git

Merge branch 'master' of /home/vorner/pciids

Conflicts:

	scripts/pciids-export
---

6bee93a95d2c5feac17dd687f1bab5f653bff280
diff --cc scripts/pciids-export
index b8ac82b,695a0c3..53a4477
--- a/scripts/pciids-export
+++ b/scripts/pciids-export
@@@ -27,8 -26,13 +26,13 @@@ cat cf/class_head.ids >> ../pci.ids.ne
  ./scripts/export.pl PD >> ../pci.ids.new
  cd ..
  if ! [ -f docs/pci.ids ] || ! cmp docs/pci.ids pci.ids.new >/dev/null ; then
- #	ln -f pci.ids.new ~/origs/00-current
- 	ln -f pci.ids.new docs/pci.ids
+ 	cp perl/cf/head.ids pci.ids.final
+ 	echo '# Current to date: '`date +%Y%m%d` >> pci.ids.final
+ 	echo >> pci.ids.final
+ 	cat pci.ids.new >> pci.ids.final
 -	ln -f pci.ids.final ~/origs/00-current
++#	ln -f pci.ids.final ~/origs/00-current
+ 	ln -f pci.ids.final docs/pci.ids
+ 	rm pci.ids.final
  	bzip2 -9c <docs/pci.ids >docs/pci.ids.bz2
  	gzip -9c <docs/pci.ids >docs/pci.ids.gz
  fi