r24859 - in /desktop/unstable/gnome-session/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jul 22 15:42:23 2010
New Revision: 24859

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24859
Log:
* Bump Standards-Version to 3.9.0. Use Breaks instead of Conflicts as
  recommended by the new policy.
* Drop build-dependency on type-handling.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/control
    desktop/unstable/gnome-session/debian/control.in

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=24859&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Thu Jul 22 15:42:23 2010
@@ -9,9 +9,11 @@
     - Add debian/source/format.
     - Drop Build-Depends on quilt.
     - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
+  * Bump Standards-Version to 3.9.0. Use Breaks instead of Conflicts as
+    recommended by the new policy.
 
   [ Josselin Mouette ]
-  * Drob build-dependency on type-handling.
+  * Drop build-dependency on type-handling.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 22 Jul 2010 17:20:24 +0200
 

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=24859&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control [utf-8] Thu Jul 22 15:42:23 2010
@@ -8,7 +8,7 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Michael Biebl <biebl at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5.0.13),
                gnome-pkg-tools (>= 0.13),
@@ -108,8 +108,8 @@
 Depends: ${misc:Depends}
 Replaces: gnome-session (<< 2.28.0-5),
           libgnomevfs2-common (<< 1:2.24.0-3)
-Conflicts: gnome-session (<< 2.28.0-5),
-           libgnomevfs2-common (<< 1:2.24.0-3)
+Breaks: gnome-session (<< 2.28.0-5),
+        libgnomevfs2-common (<< 1:2.24.0-3)
 Description: Common files for the GNOME session manager
  This package contains common files for the GNOME 2 and GNOME 3 
  sessions, such as icons, translations and startup scripts.

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=24859&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control.in [utf-8] Thu Jul 22 15:42:23 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5.0.13),
                gnome-pkg-tools (>= 0.13),
@@ -103,8 +103,8 @@
 Depends: ${misc:Depends}
 Replaces: gnome-session (<< 2.28.0-5),
           libgnomevfs2-common (<< 1:2.24.0-3)
-Conflicts: gnome-session (<< 2.28.0-5),
-           libgnomevfs2-common (<< 1:2.24.0-3)
+Breaks: gnome-session (<< 2.28.0-5),
+        libgnomevfs2-common (<< 1:2.24.0-3)
 Description: Common files for the GNOME session manager
  This package contains common files for the GNOME 2 and GNOME 3 
  sessions, such as icons, translations and startup scripts.