merge from trunk

debian/changelog

@@ -16,6 +16,10 @@ ngcp-metapackages (2.6.0) unstable; urgency=low
   * control: Remove deprecated dependencies
   * Add ipcalc to nth dependencies
 
+  [ rfuchs ]
+  * add gdb to nth list
+  * add tshark to nth list
+
  -- Jon Bonilla <jbonilla@sipwise.com>  Wed, 15 Aug 2012 21:06:27 +0200
 
 ngcp-metapackages (2.5.4) unstable; urgency=low

debian/control

@@ -62,6 +62,7 @@ Description: Metapackage for Sipwise's NGCP platform
 Package: ngcp-nth-pro
 Architecture: all
 Depends: dstat,
+         gdb,
          host,
          ifenslave,
          ifrename,
@@ -83,6 +84,7 @@ Depends: dstat,
          sysstat,
          tcpdump,
          telnet-ssl,
+         tshark,
          vim,
          vlan,
          ${misc:Depends},
@@ -94,6 +96,7 @@ Description: Metapackage for Nice To Have tools in NGCP platforms
 Package: ngcp-nth-ce
 Architecture: all
 Depends: dstat,
+         gdb,
          host,
          ifenslave,
          ifrename,
@@ -114,6 +117,7 @@ Depends: dstat,
          sysstat,
          tcpdump,
          telnet-ssl,
+         tshark,
          vim,
          vlan,
          ${misc:Depends},