[Pkg-voip-commits] r8854 - in /asterisk/trunk/debian: changelog patches/hack-multiple-app-voicemail rules

[pabelanger-guest at alioth.debian.org]

Author: pabelanger-guest
Date: Sun Apr 10 17:49:29 2011
New Revision: 8854

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8854
Log:
When compiling with DEB_BUILD_OPTIONS="debug" enable native Asterisk
debugging tools.  Specifically DONT_OPTIMIZE, DEBUG_THREADS and
--enable-dev-mode.


Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/hack-multiple-app-voicemail
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8854&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Apr 10 17:49:29 2011
@@ -30,8 +30,11 @@
   [ Paul Belanger ]
   * Depend on libneon27-dev and libical-dev for calendar support.
   * Depend on libsrtp0-dev for SRTP support.
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 26 Mar 2011 13:41:36 +0200
+  * When compiling with DEB_BUILD_OPTIONS="debug" enable native Asterisk
+    debugging tools.  Specifically DONT_OPTIMIZE, DEBUG_THREADS and
+    --enable-dev-mode.
+
+ -- Paul Belanger <pabelanger at digium.com>  Thu, 07 Apr 2011 19:34:18 -0400
 
 asterisk (1:1.6.2.9-2) unstable; urgency=high
 

Modified: asterisk/trunk/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/hack-multiple-app-voicemail?rev=8854&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Sun Apr 10 17:49:29 2011
@@ -41,7 +41,7 @@
 +	$(call add_depends_cmd,unixodbc) $@
 +	$(call add_depends_cmd,ltdl) $@
 +
-+clean::
++dist-clean::
 +	rm -f app_voicemail_*.c
 +
 +app_voicemail_imapstorage.o: _ASTCFLAGS+=-DIMAP_STORAGE

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=8854&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Sun Apr 10 17:49:29 2011
@@ -26,7 +26,7 @@
 BUILDFLAGS += ASTDATADIR=/usr/share/asterisk ASTVARRUNDIR=/var/run/asterisk
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
+	ENABLE_DEBUG += --enable-dev-mode
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
@@ -62,22 +62,29 @@
 
 	chmod 755 $(CURDIR)/debian/dummyprogs/fetch
 	
-	$(FETCH_ENV) ./configure \
-		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--with-cap \
-		--with-gsm \
-		--with-imap=system \
-		--with-pwlib=/usr/share/pwlib/include/ \
-		--with-h323=/usr/share/openh323/ 
+	$(FETCH_ENV) ./configure			\
+		--host=$(DEB_HOST_GNU_TYPE)		\
+		--build=$(DEB_BUILD_GNU_TYPE)		\
+		--prefix=/usr				\
+		--mandir=\$${prefix}/share/man		\
+		--infodir=\$${prefix}/share/info	\
+		--with-cap				\
+		--with-gsm				\
+		--with-imap=system			\
+		--with-pwlib=/usr/share/pwlib/include/	\
+		--with-h323=/usr/share/openh323/ 	\
+		${ENABLE_DEBUG}
 
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp: config.status
 	dh_testdir
+	$(MAKE) menuselect.makeopts
+        @if [ "x${ENABLE_DEBUG}" != "x" ] ; then \
+		menuselect/menuselect --enable DONT_OPTIMIZE menuselect.makeopts ; \
+		menuselect/menuselect --enable DEBUG_THREADS menuselect.makeopts ; \
+	fi
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) h323-mak
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS)
 	touch $@