r24694 - in /desktop/unstable/brasero/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jul  4 12:36:47 2010
New Revision: 24694

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24694
Log:
* Bump-Standards-Version to 3.9.0
  - Use architecture wildcard kfreebsd-any for the libcam-dev Build-Depends.
  - Use Breaks instead of Conflicts as recommended by the new policy.

Modified:
    desktop/unstable/brasero/debian/changelog
    desktop/unstable/brasero/debian/control
    desktop/unstable/brasero/debian/control.in

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=24694&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Sun Jul  4 12:36:47 2010
@@ -9,6 +9,9 @@
     - 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 architecture wildcard kfreebsd-any for the libcam-dev Build-Depends.
+    - Use Breaks instead of Conflicts as recommended by the new policy.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 04 Jul 2010 13:55:52 +0200
 

Modified: desktop/unstable/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control?rev=24694&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control [utf-8] (original)
+++ desktop/unstable/brasero/debian/control [utf-8] Sun Jul  4 12:36:47 2010
@@ -11,7 +11,7 @@
                autotools-dev,
                cdbs,
                gnome-pkg-tools (>= 0.7),
-               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+               libcam-dev [kfreebsd-any],
                libglib2.0-dev (>= 2.22.0),
                libgtk2.0-dev (>= 2.19.7),
                libgconf2-dev,
@@ -34,7 +34,7 @@
                libnotify-dev (>= 0.3.0),
                intltool (>= 0.35.0)
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
 Homepage: http://www.gnome.org/projects/brasero/
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/brasero/
@@ -74,7 +74,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: brasero (<< 2.26)
-Conflicts: brasero (<< 2.26)
+Breaks: brasero (<< 2.26)
 Description: Common files for the Brasero CD burning application and library
  Brasero is a simple application to burn, copy and erase CD and DVD 
  media.

Modified: desktop/unstable/brasero/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control.in?rev=24694&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control.in [utf-8] (original)
+++ desktop/unstable/brasero/debian/control.in [utf-8] Sun Jul  4 12:36:47 2010
@@ -6,7 +6,7 @@
                autotools-dev,
                cdbs,
                gnome-pkg-tools (>= 0.7),
-               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+               libcam-dev [kfreebsd-any],
                libglib2.0-dev (>= 2.22.0),
                libgtk2.0-dev (>= 2.19.7),
                libgconf2-dev,
@@ -29,7 +29,7 @@
                libnotify-dev (>= 0.3.0),
                intltool (>= 0.35.0)
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
 Homepage: http://www.gnome.org/projects/brasero/
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/brasero/
@@ -69,7 +69,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: brasero (<< 2.26)
-Conflicts: brasero (<< 2.26)
+Breaks: brasero (<< 2.26)
 Description: Common files for the Brasero CD burning application and library
  Brasero is a simple application to burn, copy and erase CD and DVD 
  media.