[Pkg-voip-commits] r6459 - in /libpri/branches/experimental/debian: changelog control libpri1.0.dirs libpri1.0.install libpri1.4.install patches/00list patches/enable-gcc-optimizations.dpatch rules

Sat Nov 15 12:05:46 UTC 2008

Author: tzafrir-guest
Date: Sat Nov 15 12:05:46 2008
New Revision: 6459

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6459
Log:
* New upstream version.
* Dropping bristuff for now.
* Use LIBPRI_OPTS instead of CFLAGS: patch fits simpler.
* SONAME is now 1.4 . Changed package name accordingly.

Added:
    libpri/branches/experimental/debian/libpri1.4.install   (props changed)
      - copied unchanged from r6453, libpri/branches/experimental/debian/libpri1.0.install
Removed:
    libpri/branches/experimental/debian/libpri1.0.dirs
    libpri/branches/experimental/debian/libpri1.0.install
Modified:
    libpri/branches/experimental/debian/changelog
    libpri/branches/experimental/debian/control
    libpri/branches/experimental/debian/patches/00list
    libpri/branches/experimental/debian/patches/enable-gcc-optimizations.dpatch
    libpri/branches/experimental/debian/rules

Modified: libpri/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/branches/experimental/debian/changelog?rev=6459&op=diff
==============================================================================

--- libpri/branches/experimental/debian/changelog (original)
+++ libpri/branches/experimental/debian/changelog Sat Nov 15 12:05:46 2008
@@ -1,3 +1,12 @@
+libpri (1.4.7-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Dropping bristuff for now.
+  * Use LIBPRI_OPTS instead of CFLAGS: patch fits simpler.
+  * SONAME is now 1.4 . Changed package name accordingly.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 15 Nov 2008 13:44:11 +0200
+
 libpri (1.4.3-3) unstable; urgency=low
 
   [ Tzafrir Cohen ]

Modified: libpri/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/branches/experimental/debian/control?rev=6459&op=diff
==============================================================================
--- libpri/branches/experimental/debian/control (original)
+++ libpri/branches/experimental/debian/control Sat Nov 15 12:05:46 2008
@@ -12,12 +12,12 @@
 Package: libpri-dev
 Section: libdevel
 Architecture: any
-Depends: libpri1.0 (= ${binary:Version})
+Depends: libpri1.4 (= ${binary:Version})
 Description: Primary Rate ISDN specification development files
  Development files for the C implementation of the Primary Rate ISDN
  specification.
  
-Package: libpri1.0
+Package: libpri1.4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

Propchange: libpri/branches/experimental/debian/libpri1.4.install
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: libpri/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/branches/experimental/debian/patches/00list?rev=6459&op=diff
==============================================================================
--- libpri/branches/experimental/debian/patches/00list (original)
+++ libpri/branches/experimental/debian/patches/00list Sat Nov 15 12:05:46 2008
@@ -1,2 +1,3 @@
 enable-gcc-optimizations
-libname
+# Needed for a separate bristuffed version:
+#libname

Modified: libpri/branches/experimental/debian/patches/enable-gcc-optimizations.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/branches/experimental/debian/patches/enable-gcc-optimizations.dpatch?rev=6459&op=diff
==============================================================================
--- libpri/branches/experimental/debian/patches/enable-gcc-optimizations.dpatch (original)
+++ libpri/branches/experimental/debian/patches/enable-gcc-optimizations.dpatch Sat Nov 15 12:05:46 2008
@@ -1,20 +1,33 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## enable-gcc-optimizations.dpatch by Faidon Liambotis <paravoid at debian.org>
+## libname.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't discard CFLAGS of the environment
-## DP: debian/rules passes at least the optimization level
-
- at DPATCH@
-diff -urNad libpri-1.4.1~/Makefile libpri-1.4.1/Makefile
---- libpri-1.4.1~/Makefile	2006-12-30 21:17:34.000000000 +0200
-+++ libpri-1.4.1/Makefile	2007-08-07 04:15:59.000000000 +0300
-@@ -36,7 +36,7 @@
- DYNAMIC_LIBRARY=libpri.so.1.0
- STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
- DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
+## DP: Allow overriding the CPU optimizations from the Makefile through 
+## DP: the make command-line: make LIBPRI_OPT="-Os"
+## DP:
+## DP: Upstream issue: http://bugs.digium.com/view.php?id=12676
+ 
+Index: /home/tzafrir/Proj/Asterisk/Digium/libpri/trunk/Makefile
+===================================================================
+--- a/Makefile	(revision 559)
++++ b/Makefile	(working copy)
+@@ -43,7 +43,7 @@
+ DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
+ STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
+ DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
 -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
-+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
- SOFLAGS = -Wl,-hlibpri.so.1.0
+ SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
+@@ -73,7 +73,9 @@
+ #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+ ifeq ($(PROC),sparc64)
+ PROC=ultrasparc
+-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
++LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
++else
++#LIBPRI_OPT = -O2 # Probably the sane default (Tzafrir)
+ endif
+ 
+ all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)

Modified: libpri/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/branches/experimental/debian/rules?rev=6459&op=diff
==============================================================================
--- libpri/branches/experimental/debian/rules (original)
+++ libpri/branches/experimental/debian/rules Sat Nov 15 12:05:46 2008
@@ -8,14 +8,14 @@
 include /usr/share/dpatch/dpatch.make
 
 
-CFLAGS = -Wall -g
+LIBPRI_OPTS = -Wall -g
 
-USE_BRISTUFF=1
+USE_BRISTUFF=0
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	LIBPRI_OPTS += -O0
 else
-	CFLAGS += -O2
+	LIBPRI_OPTS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
@@ -62,9 +62,9 @@
 	dh_testdir
 	
 	# Add here commands to compile the package.
-	CFLAGS="$(CFLAGS)" $(MAKE)
+	LIBPRI_OPTS="$(LIBPRI_OPTS)" $(MAKE)
 ifeq ($(USE_BRISTUFF),1)
-	cd $(BRISTUFF_DIR); CFLAGS="$(CFLAGS)" $(MAKE) LIB_SUF=bristuffed
+	cd $(BRISTUFF_DIR); LIBPRI_OPTS="$(LIBPRI_OPTS)" $(MAKE) LIB_SUF=bristuffed
 endif
 	
 	touch build-stamp


