OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   01-Oct-2003 10:29:14
  Branch: HEAD                             Handle: 2003100109291301

  Modified files:
    openpkg-src/zebra       zebra.spec
    openpkg-web             news.txt

  Log:
    conflict with forthcoming Quagga package

  Summary:
    Revision    Changes     Path
    1.44        +2  -1      openpkg-src/zebra/zebra.spec
    1.6797      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/zebra/zebra.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 zebra.spec
  --- openpkg-src/zebra/zebra.spec      25 Jul 2003 09:23:36 -0000      1.43
  +++ openpkg-src/zebra/zebra.spec      1 Oct 2003 08:29:14 -0000       1.44
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.93b
  -Release:      20030725
  +Release:      20031001
   
   #   list of sources
   Source0:      ftp://ftp.zebra.org/pub/zebra/zebra-%{version}.tar.gz
  @@ -54,6 +54,7 @@
   PreReq:       readline
   AutoReq:      no
   AutoReqProv:  no
  +Conflicts:    quagga
   
   %description
       GNU Zebra is free software (distributed under GNU Generic Public
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6796 -r1.6797 news.txt
  --- openpkg-web/news.txt      30 Sep 2003 14:24:59 -0000      1.6796
  +++ openpkg-web/news.txt      1 Oct 2003 08:29:13 -0000       1.6797
  @@ -1,3 +1,4 @@
  +01-Oct-2003: Upgraded package: P<zebra-0.93b-20031001>
   30-Sep-2003: Upgraded package: P<icewm-1.2.13-20030930>
   30-Sep-2003: Upgraded package: P<dmalloc-5.2.3-20030930>
   30-Sep-2003: Upgraded package: P<bogofilter-0.15.5-20030930>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to