merge from trunk

debian/changelog

@@ -1,3 +1,9 @@
+ngcp-sipsak (0.9.6+sipwise3) unstable; urgency=low
+
+  * Fixed Debian packaging [Mika]
+
+ -- Richard Fuchs <rfuchs@sipwise.com>  Fri, 30 Sep 2011 11:10:04 -0400
+
 ngcp-sipsak (0.9.6+sipwise2) unstable; urgency=low
 
   * Remove RAW support as it's not implemented properly and causes timeout

debian/compat

@@ -1 +1 @@
-4
+5

debian/control

@@ -1,9 +1,9 @@
 Source: ngcp-sipsak
 Section: net
 Priority: optional
-Maintainer: Andreas Granig <agranig@sipwise.com>
+Maintainer: Sipwise Development Team <support@sipwise.com>
 Build-Depends: debhelper (>= 4.0.0), libruli4-dev, libgnutls-dev, pkg-config
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
 
 Package: ngcp-sipsak
 Architecture: any

debian/rules

@@ -63,7 +63,7 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/sipsak
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/ngcp-sipsak
 
 binary-indep: build install
 # We have nothing to do by default.