[Pkg-voip-commits] r2946 - in opal/trunk/debian: . patches

Kilian Krause kilian at alioth.debian.org
Fri Jan 5 00:05:34 CET 2007 

Author: kilian
Date: 2007-01-05 00:05:33 +0100 (Fri, 05 Jan 2007)
New Revision: 2946

Modified:
   opal/trunk/debian/changelog
   opal/trunk/debian/control
   opal/trunk/debian/patches/libname.dpatch
   opal/trunk/debian/rules
Log:
try to replicate opt&debug changes from pwlib... Won't compile yet.


Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog	2007-01-04 21:07:20 UTC (rev 2945)
+++ opal/trunk/debian/changelog	2007-01-04 23:05:33 UTC (rev 2946)
@@ -1,8 +1,9 @@
 opal (2.2.3.dfsg-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Build opt and debug version. Bump to pwlib 1.10.2-3 therefor.
 
- -- Kilian Krause <kilian at debian.org>  Wed, 27 Dec 2006 23:42:04 +0100
+ -- Kilian Krause <kilian at debian.org>  Thu,  4 Jan 2007 19:14:15 +0100
 
 opal (2.2.3.dfsg-3) unstable; urgency=high
 

Modified: opal/trunk/debian/control
===================================================================
--- opal/trunk/debian/control	2007-01-04 21:07:20 UTC (rev 2945)
+++ opal/trunk/debian/control	2007-01-04 23:05:33 UTC (rev 2946)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
-Build-Depends: debhelper (>= 4.0.2), libpt-dbg (>= 1.10.2-1), libpt-dev (>= 1.10.2-1), g++ (>= 2.95), dpatch (>= 1.11), doxygen, autotools-dev, libspeex-dev (>= 1.1.11)
+Build-Depends: debhelper (>= 4.0.2), libpt-dbg (>= 1.10.2-3~), libpt-dev (>= 1.10.2-3~), g++ (>= 2.95), dpatch (>= 1.11), doxygen, autotools-dev, libspeex-dev (>= 1.1.11)
 Build-Depends-Indep: doxygen
 Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopal-dev
 Standards-Version: 3.6.2

Modified: opal/trunk/debian/patches/libname.dpatch
===================================================================
--- opal/trunk/debian/patches/libname.dpatch	2007-01-04 21:07:20 UTC (rev 2945)
+++ opal/trunk/debian/patches/libname.dpatch	2007-01-04 23:05:33 UTC (rev 2946)
@@ -5,21 +5,15 @@
 ## DP: fix naming of library file.
 
 @DPATCH@
-diff -urNad opal-2.1.3/opal_inc.mak.in /tmp/dpep.vc5Q70/opal-2.1.3/opal_inc.mak.in
---- opal-2.1.3/opal_inc.mak.in	2006-01-31 09:10:37.000000000 +0100
-+++ /tmp/dpep.vc5Q70/opal-2.1.3/opal_inc.mak.in	2006-02-06 21:22:59.966232274 +0100
-@@ -103,11 +103,11 @@
+diff -urNad opal-2.2.3.dfsg~/opal_inc.mak.in opal-2.2.3.dfsg/opal_inc.mak.in
+--- opal-2.2.3.dfsg~/opal_inc.mak.in	2007-01-04 23:33:52.000000000 +0100
++++ opal-2.2.3.dfsg/opal_inc.mak.in	2007-01-04 23:36:00.000000000 +0100
+@@ -103,7 +103,7 @@
  endif
  
  
 -OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
--OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
 +OPAL_BASE  = opal
-+OPAL_FILE  = lib$(OPAL_BASE).$(LIB_SUFFIX)
+ OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
  
  LDFLAGS	    += -L$(OPAL_LIBDIR)
--LDLIBS	    := -l$(OPAL_BASE)$(LIB_TYPE) $(LDLIBS)
-+LDLIBS	    := -l$(OPAL_BASE) $(LDLIBS)
- 
- STDCCFLAGS  += -I$(OPAL_INCDIR)
- 

Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules	2007-01-04 21:07:20 UTC (rev 2945)
+++ opal/trunk/debian/rules	2007-01-04 23:05:33 UTC (rev 2946)
@@ -10,9 +10,11 @@
 
 PACKAGE=libopal-$(LIBOPALCOMPAT)
 
+ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
 VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h)
 VER_MINOR := $(shell awk '/MINOR_VERSION/ { print $$3 }' version.h)
 VER_SUB   := $(shell awk '/BUILD_NUMBER/  { print $$3 }' version.h)
+endif
 
 SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 
@@ -46,36 +48,44 @@
 	./configure $(confflags) --prefix=/usr 
 
 autotools:
-	-if [ -f config.sub.old ]; then \
-	  rm -f config.sub; \
-	else \
-	  mv config.sub config.sub.old; \
-	fi
-	-if [ -f config.guess.old ]; then \
-	  rm -f config.guess; \
-	else \
-	  mv config.guess config.guess.old; \
-	fi
-	ln -s /usr/share/misc/config.sub config.sub
-	ln -s /usr/share/misc/config.guess config.guess
-	
+	rm -f config.sub config.guess
+	cp /usr/share/misc/config.sub config.sub
+	cp /usr/share/misc/config.guess config.guess
 	touch autotools
 
 check-ilbc:
-	( [ ! -d src/codec/iLBC ] ) || \
-	  ( echo "ERROR: iLBC code must be removed from upstream sources" ; false )
-
+	if [ -d src/codec/iLBC ];then \
+	   echo "ERROR: iLBC code must be removed from upstream sources" ; false ; \
+	fi
 	touch $@
 
 build-arch-stamp: config.status
-	$(MAKE) $(MAKE_BUILD_PARAM) opt
-	
-	# This dirty stuff is done to compile simple with apropiate options
-	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean opt
-
-	# Check that there is not any blatant error
+	$(MAKE) $(MAKE_BUILD_PARAM) both
+	# ensure we do a fresh check with hello world.
+	# ...first static
+	-$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+	-$(RM) -rf samples/simple/obj_*
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple bothnoshared
+	samples/simple/obj_*_d/simpleopal --help >/dev/null
+	samples/simple/obj_*_r/simpleopal --help >/dev/null
+	# then shared...
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+	$(RM) -rf samples/simple/obj_*
+	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple bothshared
+	if (samples/simple/obj_*_d/simpleopal --help >/dev/null);then \
+		echo shared debug simpleopal incorrectly compiled static; false;\
+	else \
+		echo shared debug simpleopal correctly compiled non-static; \
+	fi
+	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_d/simpleopal --help >/dev/null
+	if (samples/simple/obj_*_r/simpleopal --help >/dev/null);then \
+		echo shared opt simpleopal incorrectly compiled static; false;\
+	else \
+		echo shared opt simpleopal correctly compiled non-static; \
+	fi
 	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean 
+	-$(RM) -rf samples/simple/obj_*
 	
 	touch build-arch-stamp
 
@@ -90,7 +100,7 @@
 	dh_testroot
 	-rm -f build-arch-stamp build-indep-stamp patch-stamp
 	-rm -f config.status config.log autotools
-	-$(MAKE) $(MAKE_BUILD_PARAM) optclean clean 
+	-$(MAKE) $(MAKE_BUILD_PARAM) optclean debugclean clean 
 	-$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	-rm -rf samples/simple/obj*
 	-rm -f opal_inc.mak include/opal/buildopts.h
@@ -103,13 +113,6 @@
 	-rm -f debian/*substvars
 	-rm -f debian/*.debhelper
 	-rm -f debian/libopal-*.*.docs
-	
-	-if [ -f config.sub.old ]; then \
-	   mv config.sub.old config.sub; \
-	fi
-	-if [ -f config.guess.old ]; then \
-	   mv config.guess.old config.guess; \
-	fi
 	-rm -f config.status
 	
 	dh_clean
@@ -144,13 +147,20 @@
 	ln -s libopal.so.$(SHLIBSVER) \
 		debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT4)
 endif
+	# simpleopal
 	$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
 #	clean simple to install it as a sample in the docs
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	-$(RM) -rf samples/simple/obj_*
 	
+#	libopal-dbg
+	$(MAKE) $(MAKE_BUILD_PARAM) DEBUG=1 DESTDIR=$(CURDIR)/debian/libopal-dbg OPAL_LIBDIR=/usr/lib install
+	$(RM) -rf $(CURDIR)/debian/libopal-dbg/usr/include
+	cp lib/libopal*.a $(CURDIR)/debian/libopal-dbg/usr/lib
+
 #	libopal-dev package
 	dh_movefiles --sourcedir=debian/$(PACKAGE) -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so` usr/include
+	dh_movefiles --sourcedir=debian/libopal-dbg -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so` 
 	rm -rf debian/$(PACKAGE)/usr/include debian/$(PACKAGE)/usr/share/opal/opal_inc.mak
 	rm -f debian/$(PACKAGE)/usr/lib/libopal.so.? 
 	#rm -f debian/$(PACKAGE)/usr/lib/libopal.so.?.??

More information about the Pkg-voip-commits mailing list