[Pkg-silc-commits] r34 - in /silc-toolkit/trunk/debian: changelog control

[stesie-guest at users.alioth.debian.org]

Author: stesie-guest
Date: Mon May 28 17:12:05 2007
New Revision: 34

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=34
Log:
Do not conflict with libsilc package.

Modified:
    silc-toolkit/trunk/debian/changelog
    silc-toolkit/trunk/debian/control

Modified: silc-toolkit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/changelog?rev=34&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/changelog (original)
+++ silc-toolkit/trunk/debian/changelog Mon May 28 17:12:05 2007
@@ -13,6 +13,7 @@
     of /usr/share/doc/libsilc-dev.
   * SIM modules are now shipped in /usr/lib/silc/libsilc-1.1-1 instead of
     /usr/lib/silc.
+  * Do not conflict with libsilc package.
 
  -- Jérémy Bobbio <lunar at debian.org>  Sun, 27 May 2007 16:04:49 +0200
 

Modified: silc-toolkit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/control?rev=34&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/control (original)
+++ silc-toolkit/trunk/debian/control Mon May 28 17:12:05 2007
@@ -29,7 +29,6 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: libsilc
 Replaces: libsilc
-Conflicts: libsilc
 Description: SILC library (silc-toolkit)
  silc-toolkit library files
  .