[Pkg-voip-commits] r1190 - opal/trunk/debian

[Kilian Krause]

Author: kilian
Date: 2006-01-22 15:33:04 +0000 (Sun, 22 Jan 2006)
New Revision: 1190

Modified:
   opal/trunk/debian/changelog
   opal/trunk/debian/rules
Log:
preparing next piece towards ekiga 2.0beta1


Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog	2006-01-22 15:17:43 UTC (rev 1189)
+++ opal/trunk/debian/changelog	2006-01-22 15:33:04 UTC (rev 1190)
@@ -1,5 +1,5 @@
-opal (2.2.0-1) experimental; urgency=low
+opal (2.1.2-1) experimental; urgency=low
 
   * Initial release.
 
- -- Kilian Krause <kilian at debian.org>  Fri, 20 Jan 2006 18:44:19 +0100
+ -- Kilian Krause <kilian at debian.org>  Sat, 21 Jan 2006 23:59:50 +0000

Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules	2006-01-22 15:17:43 UTC (rev 1189)
+++ opal/trunk/debian/rules	2006-01-22 15:33:04 UTC (rev 1190)
@@ -3,7 +3,7 @@
 export DH_COMPAT=4
 
 # Change this on API breakage
-export LIBOPALCOMPAT=2.1.2
+export LIBOPALCOMPAT=2.2.0
 
 PACKAGE=libopal-$(LIBOPALCOMPAT)
 
@@ -32,7 +32,7 @@
 build-arch: build-arch-stamp
 
 Makefile: patch-stamp autotools configure
-	./configure $(confflags) --prefix=/usr 
+	./configure $(confflags) --prefix=/usr --disable-iax
 
 autotools:
 	-if [ -f config.sub.old ]; then \
@@ -109,18 +109,21 @@
 	dh_clean -k -a
 	dh_installdirs -a
 
-	$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/$(PACKAGE)/usr install
+	$(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(PWD)/debian/$(PACKAGE) install
 ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT))
 	ln -s libopal.so.$(SHLIBSVER) \
 		debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT)
 endif
-	$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(PWD)/debian/simpleopal/usr -C samples/simple install
+	$(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(PWD)/debian/simpleopal -C samples/simple install
 #	clean simple to install it as a sample in the docs
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
 	-rmdir samples/simple/obj*
 
 #	libopal-dev package
 	dh_movefiles --sourcedir=debian/$(PACKAGE) -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so`
+	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
@@ -168,8 +171,8 @@
 	dh_testroot
 	dh_strip --keep-debug --exclude=libopal_d
 
-	cp -af debian/libopal-$(SHLIBSVER)/usr/lib/debug debian/libopal-dbg/usr/lib && \
-		rm -rf debian/libopal-$(SHLIBSVER)/usr/lib/debug
+	cp -af debian/$(PACKAGE)/usr/lib/debug debian/libopal-dbg/usr/lib && \
+		rm -rf debian/$(PACKAGE)/usr/lib/debug
 	rm -rf debian/simpleopal/usr/lib/
 
 # Build architecture independant packages using the common target.