Module: sip-router Branch: master Commit: e8c7708bed7081e74ee43370ab63031daac6fb8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8c7708… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Aug 27 11:35:50 2012 +0200 pkg/deb: Don't conflict with -dbg any more --- pkg/kamailio/deb/debian/control | 3 +-- pkg/kamailio/deb/lenny/control | 3 +-- pkg/kamailio/deb/lucid/control | 3 +-- pkg/kamailio/deb/precise/control | 3 +-- pkg/kamailio/deb/squeeze/control | 3 +-- pkg/kamailio/deb/wheezy/control | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index eb9b3e3..9b1eba5 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -47,8 +47,7 @@ Architecture: any Depends: adduser, ${misc:Depends}, ${shlibs:Depends} -Conflicts: kamailio-dbg, - kamailio-regex-modules +Conflicts: kamailio-regex-modules Suggests: kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, diff --git a/pkg/kamailio/deb/lenny/control b/pkg/kamailio/deb/lenny/control index 7c7490f..8c249e7 100644 --- a/pkg/kamailio/deb/lenny/control +++ b/pkg/kamailio/deb/lenny/control @@ -42,8 +42,7 @@ Architecture: any Depends: adduser, ${misc:Depends}, ${shlibs:Depends} -Conflicts: kamailio-dbg, - kamailio-regex-modules +Conflicts: kamailio-regex-modules Suggests: kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, diff --git a/pkg/kamailio/deb/lucid/control b/pkg/kamailio/deb/lucid/control index 8ad1536..6e14db3 100644 --- a/pkg/kamailio/deb/lucid/control +++ b/pkg/kamailio/deb/lucid/control @@ -43,8 +43,7 @@ Architecture: any Depends: adduser, ${misc:Depends}, ${shlibs:Depends} -Conflicts: kamailio-dbg, - kamailio-regex-modules +Conflicts: kamailio-regex-modules Suggests: kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 7775754..1a06a97 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -47,8 +47,7 @@ Architecture: any Depends: adduser, ${misc:Depends}, ${shlibs:Depends} -Conflicts: kamailio-dbg, - kamailio-regex-modules +Conflicts: kamailio-regex-modules Suggests: kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index c56e38e..76e81e7 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -44,8 +44,7 @@ Architecture: any Depends: adduser, ${misc:Depends}, ${shlibs:Depends} -Conflicts: kamailio-dbg, - kamailio-regex-modules +Conflicts: kamailio-regex-modules Suggests: kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index c7bdcf3..df9d83d 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -46,8 +46,7 @@ Architecture: any Depends: adduser, ${misc:Depends}, ${shlibs:Depends} -Conflicts: kamailio-dbg, - kamailio-regex-modules +Conflicts: kamailio-regex-modules Suggests: kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules,