[Pkg-voip-commits] r1906 - in asterisk/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-06-16 19:05:55 +0000 (Fri, 16 Jun 2006)
New Revision: 1906

Removed:
   asterisk/trunk/debian/patches/optim_o2.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
   asterisk/trunk/debian/rules
Log:
revert to rules-version of forcing -O2 with allowing stack traces for debugging.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-06-16 19:00:57 UTC (rev 1905)
+++ asterisk/trunk/debian/changelog	2006-06-16 19:05:55 UTC (rev 1906)
@@ -24,7 +24,6 @@
   * The data_dir patch also moves agi-bin/ and firmware/
   * option_detach: using -F instead of -D (the same as upstream)
   * asterisk.init: added "zaptel-fix" to unload and reload zaptel modules
-  * optim_o2.dpatch: don't build with -O6 
 
  -- Kilian Krause <kilian at debian.org>  Fri, 16 Jun 2006 18:04:50 +0000
 

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2006-06-16 19:00:57 UTC (rev 1905)
+++ asterisk/trunk/debian/patches/00list	2006-06-16 19:05:55 UTC (rev 1906)
@@ -16,4 +16,3 @@
 correct_pid_display
 zap_restart
 backport_playdtmf
-optim_o2

Deleted: asterisk/trunk/debian/patches/optim_o2.dpatch
===================================================================
--- asterisk/trunk/debian/patches/optim_o2.dpatch	2006-06-16 19:00:57 UTC (rev 1905)
+++ asterisk/trunk/debian/patches/optim_o2.dpatch	2006-06-16 19:05:55 UTC (rev 1906)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## optim_o2.dpatch by  <tzafrir at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad asterisk-1.2.9.1.dfsg/Makefile /tmp/dpep.6fdqBX/asterisk-1.2.9.1.dfsg/Makefile
---- asterisk-1.2.9.1.dfsg/Makefile	2006-06-16 21:37:39.000000000 +0300
-+++ /tmp/dpep.6fdqBX/asterisk-1.2.9.1.dfsg/Makefile	2006-06-16 21:38:39.000000000 +0300
-@@ -46,7 +46,7 @@
- #K6OPT  = -DK6OPT
- 
- #Tell gcc to optimize the code
--OPTIMIZE+=-O6
-+OPTIMIZE+=-O2
- endif
- 
- #Overwite config files on "make samples"

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2006-06-16 19:00:57 UTC (rev 1905)
+++ asterisk/trunk/debian/rules	2006-06-16 19:05:55 UTC (rev 1906)
@@ -19,7 +19,7 @@
 
 export PROC := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-#MAKEFLAGS = OPTIMIZE=-O2 MAKECMDGOALS=dont-optimize
+MAKEFLAGS = OPTIMIZE=-O2 MAKECMDGOALS=dont-optimize
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g