[Pkg-utopia-commits] r3651 - in /packages/unstable/dbus/debian: changelog control

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 17 11:58:00 2010
New Revision: 3651

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3651
Log:
* debian/control
  - Bump Standards-Version to 3.9.0.
  - Use architecture wildcard linux-any for libselinux1-dev Build-Depends.
  - Use Breaks instead of Conflicts as recommended by the new policy.
  - Remove old Conflicts which is no longer relevant.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/control

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3651&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Sat Jul 17 11:58:00 2010
@@ -10,6 +10,11 @@
     - Drop Build-Depends on quilt.
     - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
     - Remove debian/README.source.
+  * debian/control
+    - Bump Standards-Version to 3.9.0.
+    - Use architecture wildcard linux-any for libselinux1-dev Build-Depends.
+    - Use Breaks instead of Conflicts as recommended by the new policy.
+    - Remove old Conflicts which is no longer relevant.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 15 Jul 2010 01:10:46 +0200
 

Modified: packages/unstable/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/control?rev=3651&op=diff
==============================================================================
--- packages/unstable/dbus/debian/control (original)
+++ packages/unstable/dbus/debian/control Sat Jul 17 11:58:00 2010
@@ -15,8 +15,8 @@
                xmlto,
                xsltproc,
                libx11-dev,
-               libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
-Standards-Version: 3.8.4
+               libselinux1-dev [linux-any]
+Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/dbus/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/
 Homepage: http://dbus.freedesktop.org/
@@ -27,7 +27,7 @@
          ${misc:Depends},
          adduser,
          lsb-base (>= 3.2-14)
-Conflicts: dbus-1-utils (<< 1.0.2-5)
+Breaks: dbus-1-utils (<< 1.0.2-5)
 Replaces: dbus-1-utils (<< 1.0.2-5)
 Suggests: dbus-x11
 Description: simple interprocess messaging system
@@ -54,9 +54,9 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          dbus
-Conflicts: dbus (<< 1.1.2)
+Breaks: dbus (<< 1.1.2),
+        x11-common (<< 1:7.5+4)
 Replaces: dbus (<< 1.1.2)
-Breaks: x11-common (<< 1:7.5+4)
 Description: simple interprocess messaging system (X11 deps)
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
@@ -73,7 +73,6 @@
          ${misc:Depends}
 Recommends: dbus
 Section: libs
-Conflicts: dbus (<< 0.60)
 Description: simple interprocess messaging system
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in