[Pkg-voip-commits] r8926 - in /sip-tester/trunk/debian: changelog control patches/Makefile.patch patches/enable-gsl.patch patches/include-limits.patch patches/series patches/sipp.hpp.patch rules source/ source/format

pabelanger-guest at alioth.debian.org pabelanger-guest at alioth.debian.org
Mon May 2 20:44:25 UTC 2011 

Author: pabelanger-guest
Date: Mon May  2 20:44:21 2011
New Revision: 8926

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8926
Log:
* New Upstream Release (Closes: #623915).
* Switch to dpkg-source 3.0 (quilt) format
* Building with PCAP play.
* Switch back to Debhelper.

Added:
    sip-tester/trunk/debian/patches/series
    sip-tester/trunk/debian/source/
    sip-tester/trunk/debian/source/format
Modified:
    sip-tester/trunk/debian/changelog
    sip-tester/trunk/debian/control
    sip-tester/trunk/debian/patches/Makefile.patch
    sip-tester/trunk/debian/patches/enable-gsl.patch
    sip-tester/trunk/debian/patches/include-limits.patch
    sip-tester/trunk/debian/patches/sipp.hpp.patch
    sip-tester/trunk/debian/rules

Modified: sip-tester/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/changelog?rev=8926&op=diff
==============================================================================
--- sip-tester/trunk/debian/changelog (original)
+++ sip-tester/trunk/debian/changelog Mon May  2 20:44:21 2011
@@ -1,3 +1,12 @@
+sip-tester (1:3.2-1) UNRELEASED; urgency=low
+
+  * New Upstream Release (Closes: #623915).
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Building with PCAP play.
+  * Switch back to Debhelper.
+
+ -- Paul Belanger <pabelanger at digium.com>  Mon, 02 May 2011 16:36:17 -0400
+
 sip-tester (1:3.1-3) unstable; urgency=low
 
   * Fix "pkg-config: command not found" Added Build-Depends: (Closes: #585904)

Modified: sip-tester/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/control?rev=8926&op=diff
==============================================================================
--- sip-tester/trunk/debian/control (original)
+++ sip-tester/trunk/debian/control Mon May  2 20:44:21 2011
@@ -3,7 +3,12 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, ARAKI Yasuhiro <ar at debian.org>, Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, pkg-config, libncurses5-dev, libnet1-dev, libpcap-dev, libgsl0-dev
+Build-Depends: debhelper (>= 7),
+ pkg-config,
+ libncurses5-dev,
+ libnet1-dev,
+ libpcap-dev,
+ libgsl0-dev,
 Build-Conflicts: libssl-dev
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/sipp/

Modified: sip-tester/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/Makefile.patch?rev=8926&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/Makefile.patch (original)
+++ sip-tester/trunk/debian/patches/Makefile.patch Mon May  2 20:44:21 2011
@@ -1,7 +1,7 @@
 
---- sip-tester-2.0.1.orig/Makefile
-+++ sip-tester-2.0.1/Makefile
-@@ -82,7 +82,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -85,7 +85,7 @@ CPP_Darwin=g++  
  CPP=$(CPP_$(SYSTEM))
  
  #Model specific flags
@@ -10,4 +10,3 @@
  MFLAGS_9000/800=+DAportable
  MFLAGS_9000/785=+DAportable
  MFLAGS_i686=
-

Modified: sip-tester/trunk/debian/patches/enable-gsl.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/enable-gsl.patch?rev=8926&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/enable-gsl.patch (original)
+++ sip-tester/trunk/debian/patches/enable-gsl.patch Mon May  2 20:44:21 2011
@@ -1,6 +1,5 @@
-diff -Nur -x '*.orig' -x '*~' sip-tester-3.1//local.mk sip-tester-3.1.new//local.mk
---- sip-tester-3.1//local.mk	2008-01-12 06:53:48.000000000 +1100
-+++ sip-tester-3.1.new//local.mk	2010-06-14 13:30:21.000000000 +1000
+--- a/local.mk
++++ b/local.mk
 @@ -2,3 +2,7 @@
  #  EXTRACPPFLAGS=-DHAVE_GSL -I`if test -f /usr/local/lib/libgsl.so; then echo /usr/local; else echo ./ext; fi;`/include
  #  EXTRACFLAGS=-DHAVE_GSL -I`if test -f /usr/local/lib/libgsl.so; then echo /usr/local; else echo ./ext; fi;`/include
@@ -9,10 +8,9 @@
 +EXTRACFLAGS=-DHAVE_GSL `pkg-config --include gsl`
 +EXTRALIBS=`pkg-config --libs gsl`
 +
-diff -Nur -x '*.orig' -x '*~' sip-tester-3.1//scenario.cpp sip-tester-3.1.new//scenario.cpp
---- sip-tester-3.1//scenario.cpp	2008-03-29 07:13:47.000000000 +1100
-+++ sip-tester-3.1.new//scenario.cpp	2010-06-14 13:31:58.000000000 +1000
-@@ -28,11 +28,9 @@
+--- a/scenario.cpp
++++ b/scenario.cpp
+@@ -29,11 +29,9 @@
  
  #include <stdlib.h>
  #include "sipp.hpp"
@@ -24,7 +22,7 @@
  
  /************************ Class Constructor *************************/
  
-@@ -1081,7 +1079,6 @@
+@@ -1115,7 +1113,6 @@ CSample *parse_distribution(bool oldstyl
      double min = xp_get_double("min", "Uniform distribution");
      double max = xp_get_double("max", "Uniform distribution");
      distribution = new CUniform(min, max);
@@ -32,7 +30,7 @@
    } else if (!strcmp(distname, "normal")) {
      double mean = xp_get_double("mean", "Normal distribution");
      double stdev = xp_get_double("stdev", "Normal distribution");
-@@ -1114,16 +1111,6 @@
+@@ -1148,16 +1145,6 @@ CSample *parse_distribution(bool oldstyl
      double n = xp_get_double("n", "Negative Binomial distribution");
      double p = xp_get_double("p", "Negative Binomial distribution");
      distribution = new CNegBin(n, p);
@@ -49,9 +47,8 @@
    } else {
      ERROR("Unknown distribution: %s\n", ptr);
    }
-diff -Nur -x '*.orig' -x '*~' sip-tester-3.1//stat.cpp sip-tester-3.1.new//stat.cpp
---- sip-tester-3.1//stat.cpp	2008-03-28 01:56:58.000000000 +1100
-+++ sip-tester-3.1.new//stat.cpp	2010-06-14 13:32:45.000000000 +1000
+--- a/stat.cpp
++++ b/stat.cpp
 @@ -30,11 +30,9 @@
  #include "sipp.hpp"
  #include "scenario.hpp"
@@ -64,7 +61,7 @@
  
  /*
  ** Local definitions (macros)
-@@ -1673,7 +1671,6 @@
+@@ -1862,7 +1860,6 @@ double CUniform::cdfInv(double percentil
    return min + (max * percentile);
  }
  
@@ -72,17 +69,16 @@
  gsl_rng *gsl_init() {
    static gsl_rng *rng = NULL;
  
-@@ -1912,6 +1909,5 @@
+@@ -2101,6 +2098,5 @@ int CNegBin::timeDescr(char *s, int len)
  double CNegBin::cdfInv(double percentile) {
    return 0;
  }
 -#endif
  
  
-diff -Nur -x '*.orig' -x '*~' sip-tester-3.1//stat.hpp sip-tester-3.1.new//stat.hpp
---- sip-tester-3.1//stat.hpp	2008-04-11 22:26:37.000000000 +1000
-+++ sip-tester-3.1.new//stat.hpp	2010-06-14 13:33:06.000000000 +1000
-@@ -41,11 +41,9 @@
+--- a/stat.hpp
++++ b/stat.hpp
+@@ -38,11 +38,9 @@
  #include <fstream>
  #include <stdio.h>
  
@@ -92,9 +88,9 @@
  #include <gsl/gsl_cdf.h>
 -#endif
  
- /* MAX_RTD_INFO_LENGTH defines the number of RTD begin and end points a single
-  * call can have.  If you need more than five, you can increase this number,
-@@ -615,7 +613,6 @@
+ #include "variables.hpp"
+ 
+@@ -629,7 +627,6 @@ private:
  	double min, max;
  };
  
@@ -102,7 +98,7 @@
  /* Normal distribution. */
  class CNormal : public CSample {
  public:
-@@ -717,6 +714,5 @@
+@@ -731,6 +728,5 @@ protected:
  	double p, n;
  	gsl_rng *rng;
  };

Modified: sip-tester/trunk/debian/patches/include-limits.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/include-limits.patch?rev=8926&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/include-limits.patch (original)
+++ sip-tester/trunk/debian/patches/include-limits.patch Mon May  2 20:44:21 2011
@@ -1,7 +1,6 @@
-diff -Nur -x '*.orig' -x '*~' sip-tester-3.1//call.cpp sip-tester-3.1.new//call.cpp
---- sip-tester-3.1//call.cpp	2008-04-10 00:50:37.000000000 +1000
-+++ sip-tester-3.1.new//call.cpp	2010-06-13 15:30:21.000000000 +1000
-@@ -41,6 +41,7 @@
+--- a/call.cpp
++++ b/call.cpp
+@@ -44,6 +44,7 @@
  #include <iostream>
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -9,14 +8,13 @@
  
  #ifdef PCAPPLAY
  #include "send_packets.h"
-diff -Nur -x '*.orig' -x '*~' sip-tester-3.1//scenario.cpp sip-tester-3.1.new//scenario.cpp
---- sip-tester-3.1//scenario.cpp	2008-03-29 07:13:47.000000000 +1100
-+++ sip-tester-3.1.new//scenario.cpp	2010-06-13 15:30:43.000000000 +1000
-@@ -27,6 +27,7 @@
+--- a/scenario.cpp
++++ b/scenario.cpp
+@@ -28,6 +28,7 @@
   */
  
  #include <stdlib.h>
 +#include <limits.h>
  #include "sipp.hpp"
- #ifdef HAVE_GSL
  #include <gsl/gsl_rng.h>
+ #include <gsl/gsl_randist.h>

Added: sip-tester/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/series?rev=8926&op=file
==============================================================================
--- sip-tester/trunk/debian/patches/series (added)
+++ sip-tester/trunk/debian/patches/series Mon May  2 20:44:21 2011
@@ -1,0 +1,4 @@
+enable-gsl.patch
+include-limits.patch
+Makefile.patch
+sipp.hpp.patch

Modified: sip-tester/trunk/debian/patches/sipp.hpp.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/sipp.hpp.patch?rev=8926&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/sipp.hpp.patch (original)
+++ sip-tester/trunk/debian/patches/sipp.hpp.patch Mon May  2 20:44:21 2011
@@ -1,13 +1,12 @@
 
---- sip-tester-2.0.1.orig/sipp.hpp
-+++ sip-tester-2.0.1/sipp.hpp
-@@ -443,7 +443,7 @@
- void remove_from_pollfiles(int sock);
- int pollset_add(call * p_call, int socket);
+--- a/sipp.hpp
++++ b/sipp.hpp
+@@ -582,7 +582,7 @@ void sipp_close_socket(struct sipp_socke
+ #define WS_BUFFER 2 /* Buffer the message if there is no room for writing the message. */
+ 
  
 -#if defined (__hpux) || defined (__alpha) && !defined (__FreeBSD__)
 +#if defined (__hpux) || defined (__digital__) && defined(__unix__)
  #define sipp_socklen_t  int
  #else
  #define sipp_socklen_t  socklen_t
-

Modified: sip-tester/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/rules?rev=8926&op=diff
==============================================================================
--- sip-tester/trunk/debian/rules (original)
+++ sip-tester/trunk/debian/rules Mon May  2 20:44:21 2011
@@ -1,12 +1,31 @@
 #!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
 
-# pcapplay support appears broken at present :-(
-# DEB_MAKE_BUILD_TARGET    := pcapplay
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+        BUILDFLAGS += OPTIMIZE=-O0
+else
+        BUILDFLAGS += OPTIMIZE=-O2
+endif
+BUILDFLAGS += MAKECMDGOALS=dont-optimize
 
 help2man:
 	/usr/bin/help2man -v '-v' -N -S 'Debian GNU/Linux' -o debian/sipp.1 sipp \
 		-n 'Session Initiation Protol (SIP) performance testing tool'
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	        dh_auto_build -- pcapplay

Added: sip-tester/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/source/format?rev=8926&op=file
==============================================================================
--- sip-tester/trunk/debian/source/format (added)
+++ sip-tester/trunk/debian/source/format Mon May  2 20:44:21 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-voip-commits mailing list