merge from trunk

debian/changelog

@@ -1,3 +1,13 @@
+ngcp-metapackages (2.6.1) unstable; urgency=low
+
+  [ Michael Prokop ]
+  * Replace dependency of ngcp-ossbss-common with according ce/pro/carrier packages
+
+  [ jbonilla ]
+  * remove rsyslog-tools dependencies 
+
+ -- Jon Bonilla <jbonilla@sipwise.com>  Thu, 23 Aug 2012 18:28:04 +0200
+
 ngcp-metapackages (2.6.0) unstable; urgency=low
 
   [ mprokop ]

debian/control

@@ -148,13 +148,12 @@ Depends: bzip2,
          ngcp-monitoring-tools,
          ngcp-ossbss-apache,
          ngcp-ossbss-billing,
-         ngcp-ossbss-common,
+         ngcp-ossbss-common-ce | ngcp-ossbss-common-pro | ngcp-ossbss-common-carrier,
          ngcp-ossbss-system,
          ngcp-ossbss-voip,
          ngcp-ossbss-xmldispatcher,
          ngcp-rate-o-mat,
          ngcp-reminder,
-         ngcp-rsyslog-tools,
          ngcp-sems-ha,
          ngcp-system-tools-pro,
          ngcp-vmnotify,
@@ -197,13 +196,12 @@ Depends: bzip2,
          ngcp-monitoring-tools,
          ngcp-ossbss-apache,
          ngcp-ossbss-billing,
-         ngcp-ossbss-common,
+         ngcp-ossbss-common-ce | ngcp-ossbss-common-pro | ngcp-ossbss-common-carrier,
          ngcp-ossbss-system,
          ngcp-ossbss-voip,
          ngcp-ossbss-xmldispatcher,
          ngcp-rate-o-mat,
          ngcp-reminder,
-         ngcp-rsyslog-tools,
          ngcp-sems-ha,
          ngcp-system-tools-pro,
          ngcp-vmnotify,
@@ -243,13 +241,12 @@ Depends: bsd-mailx | mailx,
          ngcp-mediator,
          ngcp-ossbss-apache,
          ngcp-ossbss-billing,
-         ngcp-ossbss-common,
+         ngcp-ossbss-common-ce | ngcp-ossbss-common-pro | ngcp-ossbss-common-carrier,
          ngcp-ossbss-system,
          ngcp-ossbss-voip,
          ngcp-ossbss-xmldispatcher,
          ngcp-rate-o-mat,
          ngcp-reminder,
-         ngcp-rsyslog-tools,
          ngcp-sems,
          ngcp-system-tools-ce,
          ngcp-vmnotify,