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

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-05-27 22:21:48 +0000 (Sun, 27 May 2007)
New Revision: 3621

Modified:
   opal/trunk/debian/changelog
   opal/trunk/debian/control
   opal/trunk/debian/rules
Log:
comply with SOVER to make dh_shlibdeps happy.


Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog	2007-05-27 13:29:56 UTC (rev 3620)
+++ opal/trunk/debian/changelog	2007-05-27 22:21:48 UTC (rev 3621)
@@ -2,6 +2,7 @@
 
   * NOT RELEASED YET
   * Build opt, opt+ptrace and debug version like PWLib. Bump to pwlib 1.10.7 therefore.
+  * Change package name to comply with SOVER.
 
  -- Kilian Krause <kilian at debian.org>  Sat, 26 May 2007 20:47:42 +0200
 

Modified: opal/trunk/debian/control
===================================================================
--- opal/trunk/debian/control	2007-05-27 13:29:56 UTC (rev 3620)
+++ opal/trunk/debian/control	2007-05-27 22:21:48 UTC (rev 3621)
@@ -10,11 +10,11 @@
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
 
-Package: libopal-2.2.0
+Package: libopal-2.2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libopal-2.2.0-ptrace, libopal-2.2.0-develop
+Conflicts: libopal-2.2-ptrace, libopal-2.2-develop
 Suggests: libopal-dev
 Description: Open Phone Abstraction Library - successor of OpenH323
  This package contains the shared version of the OPAL library.
@@ -27,11 +27,11 @@
  For more information on the OPAL project visit them at
  http://www.voxgratia.org/
 
-Package: libopal-2.2.0-ptrace
+Package: libopal-2.2-ptrace
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libopal-2.2.0, libopal-2.2.0-develop
+Conflicts: libopal-2.2, libopal-2.2-develop
 Suggests: libopal-dev
 Description: Open Phone Abstraction Library - Ptrace enabled version for extended debugging
  This package contains the shared version of the OPAL library.
@@ -47,11 +47,11 @@
  For more information on the OPAL project visit them at
  http://www.voxgratia.org/
 
-Package: libopal-2.2.0-develop
+Package: libopal-2.2-develop
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libopal-2.2.0-ptrace, libopal-2.2.0
+Conflicts: libopal-2.2-ptrace, libopal-2.2
 Suggests: libopal-dev
 Description: Open Phone Abstraction Library - full debug runtime with ptrace
  This package contains the shared version of the OPAL library.
@@ -72,7 +72,7 @@
 Section: libdevel
 Architecture: any
 Conflicts: openmpi-dev
-Depends: libopal-2.2.0 (= ${Source-Version})|libopal-2.2.0-ptrace (= ${Source-Version})|libopal-2.2.0-develop (= ${Source-Version}), libpt-dev (>= 1.10.7~dfsg~)
+Depends: libopal-2.2 (= ${Source-Version})|libopal-2.2-ptrace (= ${Source-Version})|libopal-2.2-develop (= ${Source-Version}), libpt-dev (>= 1.10.7~dfsg~)
 Description: OPAL library header files
  This package contains the the headers and a static version of the
  OPAL library.
@@ -104,7 +104,7 @@
 Package: libopal-dbg
 Section: libdevel
 Priority: extra
-Depends: libopal-2.2.0
+Depends: libopal-2.2
 Architecture: any
 Description: OPAL library debug symbols
  This package contains the shared and static debug symbols of the

Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules	2007-05-27 13:29:56 UTC (rev 3620)
+++ opal/trunk/debian/rules	2007-05-27 22:21:48 UTC (rev 3621)
@@ -3,10 +3,8 @@
 export DH_COMPAT=5
 
 # Change this on API breakage
-export LIBOPALCOMPAT=2.2.0
-export LIBOPALCOMPAT2=2.2.1
-export LIBOPALCOMPAT3=2.1.3
-export LIBOPALCOMPAT4=2.2.2
+export LIBOPALCOMPAT=2.2
+export LIBOPALCOMPAT2=2.1.3
 
 PACKAGE=libopal-$(LIBOPALCOMPAT)
 
@@ -186,18 +184,6 @@
 		debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT2); \
 	done
 endif
-ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT3))
-	for suffix in "" "-ptrace" "-develop";do \
-	ln -s libopal.so.$(SHLIBSVER) \
-		debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT3); \
-	done
-endif
-ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT4))
-	for suffix in "" "-ptrace" "-develop";do \
-	ln -s libopal.so.$(SHLIBSVER) \
-		debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT4); \
-	done
-endif
 	# simpleopal
 	$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
 #	clean simple to install it as a sample in the docs
@@ -212,7 +198,6 @@
 	cp lib/highopt/libopal*.a $(CURDIR)/debian/libopal-dev/usr/lib
 	ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so
 	ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so.$(VER_MAJOR)
-	ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so.$(VER_MAJOR).$(VER_MINOR)
 
 	sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
 	    opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak