[Pkg-voip-commits] [SCM] reSIProcate branch, master, updated. upstream/1.8.0_pre1-55-g24cab6e

[Daniel Pocock]

The following commit has been merged in the master branch:
commit 3c2f4b74991cc0f6cf5248c0d2b38121f104b8ac
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Tue May 22 16:27:35 2012 +0200

    Update to build with debhelper instead of cdbs

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index c347f77..febbce4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Daniel Pocock <daniel at pocock.com.au>
-Build-Depends: cdbs, debhelper (>= 8.0.0), gperf, libasio-dev (>= 1.2.0), libboost-dev, libc-ares-dev (>= 1.6.0), libdb++-dev, libpopt-dev, libssl-dev (>= 0.9.8), perl, libmysqlclient-dev, libradiusclient-ng-dev, libcppunit-dev, autotools-dev, libpcre3-dev, dpkg-dev (>= 1.16.1~)
+Build-Depends: debhelper (>= 9.0.0), gperf, libasio-dev (>= 1.2.0), libboost-dev, libc-ares-dev (>= 1.6.0), libdb++-dev, libpopt-dev, libssl-dev (>= 0.9.8), perl, libmysqlclient-dev, libradiusclient-ng-dev, libcppunit-dev, autotools-dev, libpcre3-dev, dpkg-dev (>= 1.16.1~)
 Homepage: http://www.resiprocate.org/
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
diff --git a/debian/reTurnServer.config-sample b/debian/reTurnServer.config
similarity index 100%
rename from debian/reTurnServer.config-sample
rename to debian/reTurnServer.config
diff --git a/debian/repro.config-sample b/debian/repro.config
similarity index 100%
rename from debian/repro.config-sample
rename to debian/repro.config
diff --git a/debian/repro.install b/debian/repro.install
index e32939e..50c13d2 100644
--- a/debian/repro.install
+++ b/debian/repro.install
@@ -1,2 +1,3 @@
 usr/lib/librepro-*.so*
 usr/sbin/repro
+debian/repro.config etc/repro
diff --git a/debian/resiprocate-turn-server.install b/debian/resiprocate-turn-server.install
index 9a158cf..ba7818a 100644
--- a/debian/resiprocate-turn-server.install
+++ b/debian/resiprocate-turn-server.install
@@ -1 +1,2 @@
 usr/sbin/reTurnServer
+debian/reTurnServer.config etc
diff --git a/debian/rules b/debian/rules
index c8023cb..bf44aec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,10 @@ include /usr/share/dpkg/buildflags.mk
 #CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 #LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+#include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
 
 DEB_CONFIGURE_EXTRA_FLAGS := --with-ssl
 DEB_CONFIGURE_EXTRA_FLAGS += --with-mysql
@@ -24,9 +26,13 @@ CPPFLAGS += -DRESIP_FIXED_POINT
 CPPFLAGS += -fpermissive
 LDFLAGS += -lcares
 
-install/repro::
-	cp debian/repro.config-sample debian/repro/etc/repro/repro.config
+# force building in the pkgroot or it won't build
+%:
+	dh $@ --builddirectory=.
+
+#install/repro::
+#	cp debian/repro.config-sample debian/repro/etc/repro/repro.config
 
-install/resiprocate-turn-server::
-	cp debian/reTurnServer.config-sample debian/resiprocate-turn-server/etc/reTurnServer.config
+#install/resiprocate-turn-server::
+#	cp debian/reTurnServer.config-sample debian/resiprocate-turn-server/etc/reTurnServer.config
 

-- 
reSIProcate