[Glibc-bsd-commits] r3887 - trunk/freebsd-utils/debian

[Robert Millan]

Author: rmh
Date: 2011-11-23 06:38:12 +0000 (Wed, 23 Nov 2011)
New Revision: 3887

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
Log:
  [ Jonathan Nieder ]
  * pf: Breaks, Replaces freebsd-net-tools versions that provided
    /etc/pf.os, pfctl, and authpf.  (Closes: #649684)
  * pf: Remove Replaces relation against freebsd-utils.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-11-22 22:54:23 UTC (rev 3886)
+++ trunk/freebsd-utils/debian/changelog	2011-11-23 06:38:12 UTC (rev 3887)
@@ -1,10 +1,16 @@
 freebsd-utils (8.2+ds2-12) UNRELEASED; urgency=low
 
+  [ Robert Millan ]
   * 044_mount_exec.diff: Fix mount_smbfs execution.
   * Make Description clearer and easier to translate.  (Closes: #649356)
 
- -- Robert Millan <rmh at debian.org>  Sun, 20 Nov 2011 12:24:45 +0100
+  [ Jonathan Nieder ]
+  * pf: Breaks, Replaces freebsd-net-tools versions that provided
+    /etc/pf.os, pfctl, and authpf.  (Closes: #649684)
+  * pf: Remove Replaces relation against freebsd-utils.
 
+ -- Robert Millan <rmh at debian.org>  Wed, 23 Nov 2011 07:37:43 +0100
+
 freebsd-utils (8.2+ds2-11) unstable; urgency=low
 
   * Unify all __unused fixes into a single patch.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2011-11-22 22:54:23 UTC (rev 3886)
+++ trunk/freebsd-utils/debian/control	2011-11-23 06:38:12 UTC (rev 3887)
@@ -240,7 +240,8 @@
 Priority: important
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: freebsd-utils (<< 8.2+ds2-11)
+Breaks: freebsd-net-tools (<< 8.2+ds2-11)
+Replaces: freebsd-net-tools (<< 8.2+ds2-11)
 Homepage: http://www.openbsd.org/faq/pf/
 Description: The OpenBSD Packet Filter
  Packet Filter (from here on referred to as PF) is OpenBSD's system for