repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 95428a72ffb5214826b61d5e77f860e7ef6a6c9e:
path_to: 
revision_to: 

commit 95428a72ffb5214826b61d5e77f860e7ef6a6c9e
Author: Alexander Barton 
Date:   Mon May 4 11:23:19 2009 +0200

    Fixed "Conflicts:" line in debian/control: missing comma

diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog

--- a/contrib/Debian/changelog
+++ b/contrib/Debian/changelog
@@ -1,3 +1,9 @@
+ngircd (14-0ab3) unstable; urgency=low
+
+  * Fixed "Conflicts:" line in debian/control: missing comma.
+
+ -- Alexander Barton   Mon,  4 May 2009 11:21:55 +0200
+
 ngircd (14-0ab2) unstable; urgency=low

   * Add new "ngircd-full-dbg" package including degug code and both
diff --git a/contrib/Debian/control b/contrib/Debian/control

--- a/contrib/Debian/control
+++ b/contrib/Debian/control
@@ -32,7 +32,7 @@ Package: ngircd-full
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: ircd
-Conflicts: ngircd ngircd-dbg
+Conflicts: ngircd, ngircd-dbg
 Description: A lightweight daemon for the Internet Relay Chat (IRC)
  ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
  network. It is written from scratch and is not based upon the original
@@ -55,7 +55,7 @@ Package: ngircd-full-dbg
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: ircd
-Conflicts: ngircd ngircd-full
+Conflicts: ngircd, ngircd-full
 Description: A lightweight daemon for the Internet Relay Chat (IRC)
  ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
  network. It is written from scratch and is not based upon the original

-----END OF PAGE-----