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

kilian at alioth.debian.org kilian at alioth.debian.org
Sat Aug 11 11:43:30 UTC 2007 

Author: kilian
Date: 2007-08-11 11:43:30 +0000 (Sat, 11 Aug 2007)
New Revision: 3977

Added:
   asterisk-oh323/trunk/debian/patches/asterisk-driver_Makefile.dpatch
   asterisk-oh323/trunk/debian/patches/asterisk.h_include.dpatch
   asterisk-oh323/trunk/debian/patches/wrapper_Makefile.dpatch
Modified:
   asterisk-oh323/trunk/debian/changelog
   asterisk-oh323/trunk/debian/control
   asterisk-oh323/trunk/debian/patches/00list
   asterisk-oh323/trunk/debian/patches/Makefile.dpatch
   asterisk-oh323/trunk/debian/patches/chan_oh323.dpatch
   asterisk-oh323/trunk/debian/rules
Log:
* Compile properly with -O2 and -fPIC.
* Fix include reference to silence warnings. Only run the openh323 ccflags
  gathering once.
* Don't ignore make clean errors to slience lintian.
* Build-depends on asterisk1.2 to overcome FTBFS.

Modified: asterisk-oh323/trunk/debian/changelog
===================================================================
--- asterisk-oh323/trunk/debian/changelog	2007-08-11 10:23:11 UTC (rev 3976)
+++ asterisk-oh323/trunk/debian/changelog	2007-08-11 11:43:30 UTC (rev 3977)
@@ -1,8 +1,13 @@
 asterisk-oh323 (0.7.3-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Compile properly with -O2 and -fPIC.
+  * Fix include reference to silence warnings. Only run the openh323 ccflags
+    gathering once.
+  * Don't ignore make clean errors to slience lintian.
+  * Build-depends on asterisk1.2 to overcome FTBFS.
 
- -- Kilian Krause <kilian at debian.org>  Sun,  1 Jan 2006 03:32:57 +0000
+ -- Kilian Krause <kilian at debian.org>  Sat, 11 Aug 2007 13:35:20 +0200
 
 asterisk-oh323 (0.7.3-2) unstable; urgency=low
 

Modified: asterisk-oh323/trunk/debian/control
===================================================================
--- asterisk-oh323/trunk/debian/control	2007-08-11 10:23:11 UTC (rev 3976)
+++ asterisk-oh323/trunk/debian/control	2007-08-11 11:43:30 UTC (rev 3977)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), asterisk-dev (>= 1:1.2.1.dfsg-2), libopenh323-dev (>= 1.15.6-1), dpatch
+Build-Depends: debhelper (>= 4.0.0), asterisk1.2-dev (>= 1:1.2.1.dfsg-2), libopenh323-dev (>= 1.15.6-1), dpatch
 Standards-Version: 3.6.1
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
 
 Package: asterisk-oh323
 Architecture: any
-Depends: ${shlibs:Depends}, asterisk (>= 1.2)
-Conflicts: asterisk-h323
+Depends: ${shlibs:Depends}, asterisk1.2 (>= 1:1.2)
+Conflicts: asterisk-h323, asterisk (>= 1:1.4)
 Replaces: asterisk-h323
 Description: oh323 channel driver for Asterisk
  This package adds H.323 support to the Asterisk PBX.

Modified: asterisk-oh323/trunk/debian/patches/00list
===================================================================
--- asterisk-oh323/trunk/debian/patches/00list	2007-08-11 10:23:11 UTC (rev 3976)
+++ asterisk-oh323/trunk/debian/patches/00list	2007-08-11 11:43:30 UTC (rev 3977)
@@ -1,2 +1,5 @@
-#Makefile.dpatch
+Makefile
 chan_oh323
+#asterisk.h_include
+asterisk-driver_Makefile.dpatch
+wrapper_Makefile.dpatch

Modified: asterisk-oh323/trunk/debian/patches/Makefile.dpatch
===================================================================
--- asterisk-oh323/trunk/debian/patches/Makefile.dpatch	2007-08-11 10:23:11 UTC (rev 3976)
+++ asterisk-oh323/trunk/debian/patches/Makefile.dpatch	2007-08-11 11:43:30 UTC (rev 3977)
@@ -2,21 +2,19 @@
 ## Makefile.dpatch by Kilian Krause <kk at verfaction.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix building on AMD64 et.al.
+## DP: Compile with -O2 as Debian Policy requires.
 
 @DPATCH@
-diff -urNad asterisk-oh323-0.6.6pre3/Makefile /tmp/dpep.3hXNkc/asterisk-oh323-0.6.6pre3/Makefile
---- asterisk-oh323-0.6.6pre3/Makefile	2005-01-21 16:33:47.000000000 +0000
-+++ /tmp/dpep.3hXNkc/asterisk-oh323-0.6.6pre3/Makefile	2005-02-22 02:05:48.767720171 +0000
-@@ -176,9 +176,9 @@
+diff -urNad asterisk-oh323-0.7.3~/rules.mak asterisk-oh323-0.7.3/rules.mak
+--- asterisk-oh323-0.7.3~/rules.mak	2005-09-09 16:35:23.000000000 +0200
++++ asterisk-oh323-0.7.3/rules.mak	2007-08-11 12:41:08.000000000 +0200
+@@ -63,7 +63,7 @@
+ 
+ # Set the C++ compiler flags (for wrapper compilation)
+ # and C compiler flags (for channel driver compilation)
+-CPPFLAGS = -Wall -felide-constructors -x c++ -Os
++CPPFLAGS = -Wall -felide-constructors -x c++ -O2
+-CFLAGS = -Wall
++CFLAGS = -Wall -O2
  ifeq	($(OH323BUILDTYPE),optnotrace)
  OPENH323USERFLAGS := NOTRACE=1
- endif
--CPPFLAGS = -Wall -x c++ -Os
-+CPPFLAGS = -Wall -x c++ -Os -fPIC
- ASTERISKINCLUDE = -I$(ASTERISKINCDIR) -I../wrapper
--CFLAGS = -Wall
-+CFLAGS = -Wall -fPIC
- ifdef	HAS_OH323MODS
- CPPFLAGS += -DHAS_OH323MODS
- CFLAGS += -DHAS_OH323MODS

Added: asterisk-oh323/trunk/debian/patches/asterisk-driver_Makefile.dpatch
===================================================================
--- asterisk-oh323/trunk/debian/patches/asterisk-driver_Makefile.dpatch	                        (rev 0)
+++ asterisk-oh323/trunk/debian/patches/asterisk-driver_Makefile.dpatch	2007-08-11 11:43:30 UTC (rev 3977)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## asterisk-driver_Makefile.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compile with -O2 according to Debian Policy
+
+ at DPATCH@
+diff -urNad asterisk-oh323-0.7.3~/asterisk-driver/Makefile asterisk-oh323-0.7.3/asterisk-driver/Makefile
+--- asterisk-oh323-0.7.3~/asterisk-driver/Makefile	2005-09-09 16:35:25.000000000 +0200
++++ asterisk-oh323-0.7.3/asterisk-driver/Makefile	2007-08-11 13:26:19.000000000 +0200
+@@ -94,7 +94,7 @@
+ endif
+ 
+ CFLAGS += -pipe -Wstrict-prototypes -Wmissing-prototypes \
+-		-Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE -fPIC -g -O6 \
++		-Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE -fPIC -g -O2 \
+ 		-fomit-frame-pointer
+ 
+ DRVDEPS=$(shell ls *.h)


Property changes on: asterisk-oh323/trunk/debian/patches/asterisk-driver_Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: asterisk-oh323/trunk/debian/patches/asterisk.h_include.dpatch
===================================================================
--- asterisk-oh323/trunk/debian/patches/asterisk.h_include.dpatch	                        (rev 0)
+++ asterisk-oh323/trunk/debian/patches/asterisk.h_include.dpatch	2007-08-11 11:43:30 UTC (rev 3977)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## asterisk.h_include.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix location of asterisk.h with the 1.4 version.
+
+ at DPATCH@
+diff -urNad asterisk-oh323-0.7.3~/asterisk-driver/chan_oh323.c asterisk-oh323-0.7.3/asterisk-driver/chan_oh323.c
+--- asterisk-oh323-0.7.3~/asterisk-driver/chan_oh323.c	2007-08-11 13:01:31.000000000 +0200
++++ asterisk-oh323-0.7.3/asterisk-driver/chan_oh323.c	2007-08-11 13:02:05.000000000 +0200
+@@ -46,7 +46,7 @@
+ #include <netinet/ip.h>
+ #include <sys/signal.h>
+ 
+-#include "asterisk.h"
++#include "asterisk/asterisk.h"
+ 
+ #include "asterisk/lock.h"
+ #include "asterisk/channel.h"


Property changes on: asterisk-oh323/trunk/debian/patches/asterisk.h_include.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk-oh323/trunk/debian/patches/chan_oh323.dpatch
===================================================================
--- asterisk-oh323/trunk/debian/patches/chan_oh323.dpatch	2007-08-11 10:23:11 UTC (rev 3976)
+++ asterisk-oh323/trunk/debian/patches/chan_oh323.dpatch	2007-08-11 11:43:30 UTC (rev 3977)
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## chan_oh323.dpatch by  <kk at cyclop.kk.de>
+## chan_oh323.dpatch by Kilian Krause <kilian at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.

Added: asterisk-oh323/trunk/debian/patches/wrapper_Makefile.dpatch
===================================================================
--- asterisk-oh323/trunk/debian/patches/wrapper_Makefile.dpatch	                        (rev 0)
+++ asterisk-oh323/trunk/debian/patches/wrapper_Makefile.dpatch	2007-08-11 11:43:30 UTC (rev 3977)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wrapper_Makefile.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compile shared lib wrapper with -fPIC as it's supposed to be.
+## DP: Only run gathering of ccflags of openh323 once.
+
+ at DPATCH@
+diff -urNad asterisk-oh323-0.7.3~/wrapper/Makefile asterisk-oh323-0.7.3/wrapper/Makefile
+--- asterisk-oh323-0.7.3~/wrapper/Makefile	2007-08-11 13:27:33.000000000 +0200
++++ asterisk-oh323-0.7.3/wrapper/Makefile	2007-08-11 13:28:06.000000000 +0200
+@@ -33,7 +33,7 @@
+ .PHONY: .pwlib_version .openh323_version
+ 
+ OPENH323USERFLAGS =
+-STDCCFLAGS :=
++STDCCFLAGS := -fPIC
+ 
+ ifdef	NOVIDEO
+ OPENH323USERFLAGS += NOVIDEO=1
+@@ -62,7 +62,7 @@
+ ifdef	OH323_SUPPRESS_H235
+ STDCCFLAGS  += -DOH323_SUPPRESS_H235
+ endif
+-OPENH323FLAGS = $(shell make $(OPENH323USERFLAGS) -f openh323flags.mak \
++OPENH323FLAGS := $(shell make $(OPENH323USERFLAGS) -f openh323flags.mak \
+ 		--no-print-directory -s \
+ 		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) oh323ccflags)
+ CPPFLAGS += $(OPENH323FLAGS)


Property changes on: asterisk-oh323/trunk/debian/patches/wrapper_Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk-oh323/trunk/debian/rules
===================================================================
--- asterisk-oh323/trunk/debian/rules	2007-08-11 10:23:11 UTC (rev 3976)
+++ asterisk-oh323/trunk/debian/rules	2007-08-11 11:43:30 UTC (rev 3977)
@@ -19,7 +19,16 @@
 
 include /usr/share/dpatch/dpatch.make
 
-MAKEPARAMS=OPENH323DIR=/usr/share/openh323/ PWLIBDIR=/usr/share/pwlib/ SKIP_SUFFIX=1 LIBPT_BASE=libpt LIBH323_BASE=libopenh323 OH323WRAPLIBDIR=/usr/lib/ PROC=""
+MAKEPARAMS=OPENH323DIR=/usr/share/openh323/ \
+	PWLIBDIR=/usr/share/pwlib/ \
+	SKIP_SUFFIX=1 \
+	OH323STAT=0 \
+	LIBPT_BASE=libpt \
+	LIBH323_BASE=libopenh323 \
+	OH323WRAPLIBDIR=/usr/lib/ \
+	PROC="" \
+	PWLIB_VERSION=1.10.7 \
+	OH323_VERSION=1.18.0
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -31,7 +40,7 @@
 build: patch-stamp build-stamp
 build-stamp: 
 	dh_testdir
-	$(MAKE) $(MAKEPARAMS)
+	$(MAKE) $(MAKEPARAMS) #OH323BUILDTYPE=notrace
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -40,7 +49,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) clean $(MAKEPARAMS)
+	$(MAKE) clean $(MAKEPARAMS)
 
 	dh_clean

More information about the Pkg-voip-commits mailing list