[Pkg-voip-commits] [dahdi-firmware] 34/71: * Standards version bumped to 3.9.2: - using Breaks instead of versioned Conflicts.

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-firmware.

commit f0a9225e38f390ad6b295dc89eb77b872c0fa9e7
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Jun 1 16:57:00 2011 +0000

    * Standards version bumped to 3.9.2:
      - using Breaks instead of versioned Conflicts.
    
    git-svn-id: svn://anonscm.alioth.debian.org/svn/pkg-voip/dahdi-firmware/trunk@8966 5e74be4b-f5d6-0310-a852-e9e23c5afa6a
---
 debian/changelog | 4 +++-
 debian/control   | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f94fb3..3b84cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 dahdi-firmware (2.4.1.2-1) unstable; urgency=low
 
   * New upstream release.
+  * Standards version bumped to 3.9.2:
+    - using Breaks instead of versioned Conflicts.
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 01 Jun 2011 19:37:32 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 01 Jun 2011 19:55:19 +0300
 
 dahdi-firmware (2.2.1.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1bb2f6c..f98eef0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
 Build-Depends: debhelper (>= 7), cdbs
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Homepage: http://www.asterisk.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/dahdi-firmware/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-voip/dahdi-firmware/
@@ -13,7 +13,8 @@ Package: dahdi-firmware-nonfree
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: zaptel-firmware
-Conflicts: zaptel-firmware, dahdi (<< 1:2.2.1)
+Conflicts: zaptel-firmware
+Breaks: dahdi (<< 1:2.2.1)
 Description: DAHDI non-free firmware
  DAHDI (formly Zaptel) is an interface for telephony devices used by e.g. 
  the Asterisk PBX software. The dahdi-* packages provide the kernel 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-firmware.git