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

[Kilian Krause]

Author: kilian
Date: 2006-01-23 23:01:27 +0000 (Mon, 23 Jan 2006)
New Revision: 1196

Added:
   opal/trunk/debian/patches/00list
   opal/trunk/debian/patches/beta-version.dpatch
Modified:
   opal/trunk/debian/control
   opal/trunk/debian/rules
Log:
merge results from trial building. We can also ship libopal-doc finally. ;)


Modified: opal/trunk/debian/control
===================================================================
--- opal/trunk/debian/control	2006-01-22 19:35:22 UTC (rev 1195)
+++ opal/trunk/debian/control	2006-01-23 23:01:27 UTC (rev 1196)
@@ -73,18 +73,18 @@
  For more information on the OPAL project visit them at
  http://www.voxgratia.org/
 
-#Package: libopal-doc
-#Section: doc
-#Priority: extra
-#Architecture: all
-#Description: OPAL library documentation files
-# This package contains the documentation and samples to program with
-# the OPAL library.
-# .
-# The OPAL project aims to create a full featured, interoperable, Open Source
-# implementation of the H.323 and SIP protocols that can be used freely by
-# everybody. These protocols are most used for Voice over IP (VoIP)
-# conferencing.
-# .
-# For more information on the OPAL project visit them at
-# http://www.voxgratia.org/
+Package: libopal-doc
+Section: doc
+Priority: extra
+Architecture: all
+Description: OPAL library documentation files
+ This package contains the documentation and samples to program with
+ the OPAL library.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
+ .
+ For more information on the OPAL project visit them at
+ http://www.voxgratia.org/

Added: opal/trunk/debian/patches/00list
===================================================================
--- opal/trunk/debian/patches/00list	2006-01-22 19:35:22 UTC (rev 1195)
+++ opal/trunk/debian/patches/00list	2006-01-23 23:01:27 UTC (rev 1196)
@@ -0,0 +1 @@
+beta-version

Added: opal/trunk/debian/patches/beta-version.dpatch
===================================================================
--- opal/trunk/debian/patches/beta-version.dpatch	2006-01-22 19:35:22 UTC (rev 1195)
+++ opal/trunk/debian/patches/beta-version.dpatch	2006-01-23 23:01:27 UTC (rev 1196)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## beta-version.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Minor cleanup to get around version foo until we have a final release.
+
+ at DPATCH@
+diff -urNad opal-2.1.2~/opal_inc.mak.in opal-2.1.2/opal_inc.mak.in
+--- opal-2.1.2~/opal_inc.mak.in	2005-12-06 06:34:10.000000000 +0000
++++ opal-2.1.2/opal_inc.mak.in	2006-01-23 22:31:37.000000000 +0000
+@@ -97,10 +97,10 @@
+ 
+ 
+-OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
++OPAL_BASE  = opal
+-OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
++OPAL_FILE  = lib$(OPAL_BASE).$(LIB_SUFFIX)
+ 
+ LDFLAGS	    += -L$(OPAL_LIBDIR)
+-LDLIBS	    := -l$(OPAL_BASE)$(LIB_TYPE) $(LDLIBS)
++LDLIBS	    := -l$(OPAL_BASE) $(LDLIBS)
+ 
+ STDCCFLAGS  += -I$(OPAL_INCDIR)
+ 
+diff -urNad opal-2.1.2~/version.h opal-2.1.2/version.h
+--- opal-2.1.2~/version.h	2006-01-23 22:31:08.000000000 +0000
++++ opal-2.1.2/version.h	2006-01-23 22:31:14.000000000 +0000
+@@ -36,7 +36,7 @@
+ 
+ #define MAJOR_VERSION 2
+ #define MINOR_VERSION 1
+-#define BUILD_TYPE    BetaCode
++#define BUILD_TYPE    ReleaseCode
+ #define BUILD_NUMBER 2
+ 
+ 


Property changes on: opal/trunk/debian/patches/beta-version.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules	2006-01-22 19:35:22 UTC (rev 1195)
+++ opal/trunk/debian/rules	2006-01-23 23:01:27 UTC (rev 1196)
@@ -64,7 +64,7 @@
 
 build-indep: build-indep-stamp
 build-indep-stamp:
-	#$(MAKE) $(MAKE_BUILD_PARAM) docs
+	$(MAKE) $(MAKE_BUILD_PARAM) docs
 	touch build-indep-stamp
 
 clean: clean-patched unpatch
@@ -96,7 +96,7 @@
 	
 	dh_clean
 
-install: install-arch #install-indep
+install: install-arch install-indep
 install-indep:
 	dh_testdir
 	dh_testroot
@@ -120,25 +120,24 @@
 	-rmdir samples/simple/obj*
 
 #	libopal-dev package
-	dh_movefiles --sourcedir=debian/$(PACKAGE) -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so`
+	dh_movefiles --sourcedir=debian/$(PACKAGE) -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so` usr/include
+	rm -rf debian/$(PACKAGE)/usr/include
 	rm -f debian/$(PACKAGE)/usr/lib/libopal.so.? \
 	   debian/$(PACKAGE)/usr/lib/libopal.so.?.??
 
 	#cp -v lib/libopal.a debian/libopal-dev/usr/lib
 	sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
 	    opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak
-	cp -vr include/* $(PWD)/debian/libopal-dev/usr/include/opal/.
+	#cp -vr include/* $(PWD)/debian/libopal-dev/usr/include/opal/.
+	#find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
+
 	cp version.h debian/libopal-dev/usr/include/opal/
-	find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
 
 	# linking stuff under usr/share/opal
 	ln -s ../../include/opal/version.h debian/libopal-dev/usr/share/opal/
 	ln -s ../../include/opal debian/libopal-dev/usr/share/opal/include
 	ln -s ../../lib debian/libopal-dev/usr/share/opal/
 
-#	doc
-	#cp debian/libopal.docs debian/$(PACKAGE).docs
-
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi
 # in another 'make' thread.
@@ -184,5 +183,5 @@
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-strip
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
-binary: binary-arch #binary-indep
+binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean-patched