[Hostname-devel] [SCM] Git repository for hostname branch, master, updated. debian/3.07-3-g2d0f165

[Michael Meskes]

The following commit has been merged in the master branch:
commit 2d0f165c12b3b98712d0f2368d97108ba97506d7
Author: Michael Meskes <meskes at debian.org>
Date:   Fri Dec 23 11:18:39 2011 +0100

    Use Breaks instead of Conflicts.

diff --git a/debian/changelog b/debian/changelog
index 8b2b818..9da5635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hostname (3.08) unstable; urgency=low
 
   * Prevent a potential buffer underrun.
   * Clarified FQDN message in man page. (Closes: #626292)
+  * Use Breaks instead of Conflicts.
 
  -- Michael Meskes <meskes at debian.org>  Fri, 23 Dec 2011 11:07:34 +0100
 
diff --git a/debian/control b/debian/control
index 535a590..473b4f2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: hostname
 Architecture: any
 Essential: yes
 Replaces: nis (<< 3.17-30)
-Conflicts: nis (<< 3.17-30)
+Breaks: nis (<< 3.17-30)
 Pre-Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: utility to set/show the host name or domain name
  This package provides commands which can be used to display the system's

-- 
Git repository for hostname