[Pkg-voip-commits] r5844 - in /ser/trunk/debian: changelog patches/dont-link-extra-system-libs patches/dont-link-superfluous-libs patches/series rules ser-pa-module.install ser.install

Sun Jun 8 14:19:37 UTC 2008

Author: marcusb-guest
Date: Sun Jun  8 14:19:36 2008
New Revision: 5844

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5844
Log:
Install the private shared modules.

Added:
    ser/trunk/debian/patches/dont-link-extra-system-libs
Removed:
    ser/trunk/debian/patches/dont-link-superfluous-libs
Modified:
    ser/trunk/debian/changelog
    ser/trunk/debian/patches/series
    ser/trunk/debian/rules
    ser/trunk/debian/ser-pa-module.install
    ser/trunk/debian/ser.install

Modified: ser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/changelog?rev=5844&op=diff
==============================================================================

--- ser/trunk/debian/changelog (original)
+++ ser/trunk/debian/changelog Sun Jun  8 14:19:36 2008
@@ -2,7 +2,8 @@
 
   * New upstream release.
   * Improved package descriptions. (Closes: #468472)
-  * Removed bashism from the init script. Thanks to Chris Lamb. (Closes: #473704)
+  * Removed bashism from the init script. Thanks to Chris Lamb.
+    (Closes: #473704)
   * debian/rules: Only invoke make once during build, and install into
     debian/tmp.
   * debian/ser.examples: Install all the examples.
@@ -13,7 +14,7 @@
   * Merge the acc_db module into the main ser package, and the acc_radius
     module into the ser-radius-modules package, since they have no extra
     dependencies.
-  * New patch dont-link-superfluous-libs: Avoid unnecessary linking of
+  * New patch dont-link-extra-system-libs: Avoid unnecessary linking of
     shared libraries.
   * Bump compat version to 5.
 

Added: ser/trunk/debian/patches/dont-link-extra-system-libs
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/patches/dont-link-extra-system-libs?rev=5844&op=file
==============================================================================
--- ser/trunk/debian/patches/dont-link-extra-system-libs (added)
+++ ser/trunk/debian/patches/dont-link-extra-system-libs Sun Jun  8 14:19:36 2008
@@ -1,0 +1,62 @@
+The sercmd utility and some of the modules were being linked against
+some unneeded shared system libraries.
+
+--- a/modules/mysql/Makefile
++++ b/modules/mysql/Makefile
+@@ -17,6 +17,6 @@ LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib
+ 		-L$(LOCALBASE)/mysql/lib/mysql/ \
+ 		-L$(LOCALBASE)/mysql/lib \
+ 		-L/usr/lib64/mysql \
+-		-lmysqlclient -lz
++		-lmysqlclient
+ 
+ include ../../Makefile.modules
+--- a/utils/sercmd/Makefile
++++ b/utils/sercmd/Makefile
+@@ -12,7 +12,7 @@ use_readline ?=
+ 
+ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \
+ 		$(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS))
+-LIBS:=$(filter-out -lfl  -ldl -lpthread -lssl -lcrypto, $(LIBS))
++LIBS:=$(filter-out -lfl  -ldl -lresolv -lpthread -lssl -lcrypto, $(LIBS))
+ 
+ ifeq ($(use_readline),)
+ readline_path := $(shell  \
+@@ -27,7 +27,7 @@ endif
+ 
+ ifeq ($(use_readline),1)
+ 	DEFS+=-DUSE_READLINE
+-	LIBS+=-lreadline -lncurses
++	LIBS+=-lreadline
+ endif
+ 
+ 
+--- a/Makefile.modules
++++ b/Makefile.modules
+@@ -43,3 +43,5 @@ LDFLAGS:=$(MOD_LDFLAGS)
+ endif
+ 
+ include $(COREPATH)/Makefile.rules
++
++LIBS:=$(filter-out -ldl -lresolv, $(LIBS))
+--- a/modules/osp/Makefile
++++ b/modules/osp/Makefile
+@@ -41,7 +41,7 @@ NAME=osp.so
+ DEFS+=-D_POSIX_THREADS
+ 
+ LIBS=$(shell if [ -f /usr/local/lib/libosptk.a ]; then echo "-losptk" ; else echo "-losp" ; fi)
+-LIBS+=-lssl -lcrypto -lpthread -lm
++LIBS+=-lpthread
+ 
+ 
+ 
+--- a/lib/Makefile.ser
++++ b/lib/Makefile.ser
+@@ -8,6 +8,7 @@ ser      = $(CURDIR)/..
+ 
+ INCLUDES += -I$(CURDIR) -I$(ser)
+ LIBS     += -L$(CURDIR)/cds -L$(CURDIR)/qsa
++LIBS	 := $(filter-out -ldl -lresolv, $(LIBS))
+ 
+ ####################################
+ # make rules

Modified: ser/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/patches/series?rev=5844&op=diff
==============================================================================
--- ser/trunk/debian/patches/series (original)
+++ ser/trunk/debian/patches/series Sun Jun  8 14:19:36 2008
@@ -1,4 +1,4 @@
-dont-link-superfluous-libs
+dont-link-extra-system-libs
 stop-build-on-error
 fix-osptk-lib-path
 fix-manpage-syntax

Modified: ser/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/rules?rev=5844&op=diff
==============================================================================
--- ser/trunk/debian/rules (original)
+++ ser/trunk/debian/rules Sun Jun  8 14:19:36 2008
@@ -90,7 +90,7 @@
 	dh_compress 
 	dh_fixperms
 	dh_installdeb
-	dh_shlibdeps
+	dh_shlibdeps -Lser -l/usr/lib/ser
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: ser/trunk/debian/ser-pa-module.install
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/ser-pa-module.install?rev=5844&op=diff
==============================================================================
--- ser/trunk/debian/ser-pa-module.install (original)
+++ ser/trunk/debian/ser-pa-module.install Sun Jun  8 14:19:36 2008
@@ -1,3 +1,5 @@
+usr/lib/ser/lib_ser_presence.so
+usr/lib/ser/lib_ser_xcap.so
 usr/lib/ser/modules/pa.so
 usr/lib/ser/modules/presence_b2b.so
 usr/lib/ser/modules/rls.so

Modified: ser/trunk/debian/ser.install
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/ser.install?rev=5844&op=diff
==============================================================================
--- ser/trunk/debian/ser.install (original)
+++ ser/trunk/debian/ser.install Sun Jun  8 14:19:36 2008
@@ -1,5 +1,7 @@
 etc/ser/ser.cfg
 etc/ser/dictionary.ser
+usr/lib/ser/lib_ser_cds.so
+usr/lib/ser/libbinrpc.so
 usr/lib/ser/modules
 usr/sbin/gen_ha1
 usr/sbin/ser


