[Pkg-voip-commits] r4051 - in bayonne/trunk/debian: . patches
kilian at alioth.debian.org
kilian at alioth.debian.org
Sat Aug 18 13:54:12 UTC 2007
Author: kilian
Date: 2007-08-18 13:54:12 +0000 (Sat, 18 Aug 2007)
New Revision: 4051
Added:
bayonne/trunk/debian/patches/libcapi20_fix.dpatch
Removed:
bayonne/trunk/debian/patches/02_fix_libpq.dpatch
bayonne/trunk/debian/patches/config-cfg.dpatch
bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch
bayonne/trunk/debian/patches/gcc4-ixdr.dpatch
Modified:
bayonne/trunk/debian/changelog
bayonne/trunk/debian/control
bayonne/trunk/debian/docs
bayonne/trunk/debian/init.d
bayonne/trunk/debian/patches/00list
bayonne/trunk/debian/patches/01_old_rollup.dpatch
bayonne/trunk/debian/rules
Log:
* New upstream release. (Closes: #416227, #422122, #429284)
- Weed out old patches that no longer apply.
* debian/control:
- Fix spelling (Closes: #435675)
- Remove OpenH323 completely as dropped upstream (Closes: #226951)
- Remove build-dep on libzap-dev
* debian/init.d:
- Add LSB section to init script
* debian/rules:
- Adjust to work with new upstream release.
- Fix get-orig-source to work with bayonne2
- Fix ignores make clean error lintian warning.
- Fix clean target to allow rebuilding
Modified: bayonne/trunk/debian/changelog
===================================================================
--- bayonne/trunk/debian/changelog 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/changelog 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,10 +1,21 @@
-bayonne (1.2.16-7) UNRELEASED; urgency=low
+bayonne (2.3.2-1) UNRELEASED; urgency=low
* NOT RELEASED YET
- * Build with OpenH323 module again (Closes: #226951)
- * Remove build-dep on libzap-dev
+ * New upstream release. (Closes: #416227, #422122, #429284)
+ - Weed out old patches that no longer apply.
+ * debian/control:
+ - Fix spelling (Closes: #435675)
+ - Remove OpenH323 completely as dropped upstream (Closes: #226951)
+ - Remove build-dep on libzap-dev
+ * debian/init.d:
+ - Add LSB section to init script
+ * debian/rules:
+ - Adjust to work with new upstream release.
+ - Fix get-orig-source to work with bayonne2
+ - Fix ignores make clean error lintian warning.
+ - Fix clean target to allow rebuilding
- -- Kilian Krause <kilian at debian.org> Thu, 28 Dec 2006 14:05:22 +0100
+ -- Kilian Krause <kilian at debian.org> Sat, 18 Aug 2007 15:47:40 +0200
bayonne (1.2.16-6) unstable; urgency=low
Modified: bayonne/trunk/debian/control
===================================================================
--- bayonne/trunk/debian/control 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/control 2007-08-18 13:54:12 UTC (rev 4051)
@@ -3,7 +3,27 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libcommoncpp2-dev (>= 1.4.2-2), libccaudio-dev (>= 1.1.2-2), libccscript-dev (>= 2.5.9-1), libperl-dev, zlib1g-dev, libxml2-dev [!amd64 !alpha !s390], tcl8.4-dev, libjpeg62-dev, libmysqlclient15-dev, libpam0g-dev (>= 0.76), dpatch, autotools-dev, sox, libopenh323-dev (>= 1.18.0)
+Build-Depends: debhelper (>> 4.0.0),
+ dpatch,
+ autotools-dev,
+ libccaudio2-dev (>= 0.9.5~),
+ libccscript3-dev (>= 1.1.2~),
+ doxygen, texlive-latex-base, latex2html,
+ libexosip2-dev (>= 3.0.0),
+ libavahi-client-dev (>= 0.3),
+ libccrtp-dev (>= 1.5.0),
+ libcapi20-dev
+X-Obsolete-Build-Depends:
+ libcommoncpp2-dev (>= 1.4.2-2),
+ libperl-dev,
+ zlib1g-dev,
+ libxml2-dev [!amd64 !alpha !s390],
+ tcl8.4-dev,
+ libjpeg62-dev,
+ libmysqlclient15-dev,
+ libpam0g-dev (>= 0.76),
+ sox,
+ libopenh323-dev (>= 1.18.0)
Standards-Version: 3.6.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
@@ -22,7 +42,7 @@
telephony cards from many vendors under free operating systems.
.
To speed development and simplify deployment of custom applications,
- Bayonne offers it's own native script interpreter which may be
+ Bayonne offers its own native script interpreter which may be
directly extended thru modular DSO plugins and TGI based applications.
TGI, "Telephony Gateway Interface", allows Bayonne to be easily
integrated with other system resources, such as web servers,
@@ -36,6 +56,7 @@
Package: bayonne-doc
Architecture: all
+Section: doc
Replaces: bayonne (<< 1.2)
Description: bayonne documentation
Documentation files for Bayonne, the telecommunications application
Modified: bayonne/trunk/debian/docs
===================================================================
--- bayonne/trunk/debian/docs 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/docs 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,7 +1,6 @@
AUTHORS
-BAYONNE.FAQ
+FAQ
NEWS
README
-README.1ST
TODO
THANKS
Modified: bayonne/trunk/debian/init.d
===================================================================
--- bayonne/trunk/debian/init.d 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/init.d 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,15 +1,16 @@
#! /bin/sh
#
-# skeleton example file to build /etc/init.d/ scripts.
-# This file should be used to construct scripts for /etc/init.d.
-#
-# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-# Modified for Debian GNU/Linux
-# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#
-# Version: @(#)skeleton 1.8 03-Mar-1998 miquels at cistron.nl
-#
-# This file was automatically customized by dh-make on Sat, 25 May 2002 21:45:55 +1000
+### BEGIN INIT INFO
+# Provides: bayonne
+# Required-Start: $all
+# Required-Stop: $all
+# Should-Start: $local_fs
+# Should-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: GNU Telephony Server
+# Description: Bayonne GNU Telephony Server
+### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/bayonne
Modified: bayonne/trunk/debian/patches/00list
===================================================================
--- bayonne/trunk/debian/patches/00list 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/patches/00list 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,5 +1,2 @@
01_old_rollup
-02_fix_libpq
-gcc4-friend-classes
-gcc4-ixdr
-config-cfg.dpatch
+libcapi20_fix
Modified: bayonne/trunk/debian/patches/01_old_rollup.dpatch
===================================================================
--- bayonne/trunk/debian/patches/01_old_rollup.dpatch 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/patches/01_old_rollup.dpatch 2007-08-18 13:54:12 UTC (rev 4051)
@@ -21,57 +21,9 @@
exit 0
@DPATCH@
-diff -urNad bayonne-1.2.15~/server/bayonne.8 bayonne-1.2.15/server/bayonne.8
---- bayonne-1.2.15~/server/bayonne.8 2005-10-12 19:41:43.000000000 +0100
-+++ bayonne-1.2.15/server/bayonne.8 2005-10-12 19:41:48.000000000 +0100
-@@ -57,8 +57,6 @@
- have the Bayonne host enabled in xhost. This provides remote graphical
- debugging of a Bayonne server.
-
--.SH SEE ALSO
--.BR bayonne.conf (7)
- .SH AUTHOR
- David Sugar (dyfet at ostel.com)
- .PP
-diff -urNad bayonne-1.2.15~/server/bayonne.init bayonne-1.2.15/server/bayonne.init
---- bayonne-1.2.15~/server/bayonne.init 2005-10-12 19:41:43.000000000 +0100
-+++ bayonne-1.2.15/server/bayonne.init 2005-10-12 19:41:48.000000000 +0100
-@@ -16,8 +16,6 @@
- # description: Bayonne is the telephony server of the GNU \
- # project and offers interactive voice response.
-
--# Source function library.
--. /etc/rc.d/init.d/functions
-
- RETVAL=0
-
-diff -urNad bayonne-1.2.15~/server/Makefile.am bayonne-1.2.15/server/Makefile.am
---- bayonne-1.2.15~/server/Makefile.am 2005-10-12 19:41:43.000000000 +0100
-+++ bayonne-1.2.15/server/Makefile.am 2005-10-12 19:41:48.000000000 +0100
-@@ -15,7 +15,7 @@
- dsolibdir = $(libdir)/bayonne/$(VERSION)
- pkgincludedir=${includedir}/cc++
- etc_prefix=@sysconfdir@
--ini_prefix=/etc
-+ini_prefix=@sysconfdir@
- etc_suffix=.orig
-
- AM_CPPFLAGS = -DVERPATH=\"@VERSION@\" @SERVER_FLAGS@
-diff -urNad bayonne-1.2.15~/server/Makefile.in bayonne-1.2.15/server/Makefile.in
---- bayonne-1.2.15~/server/Makefile.in 2005-10-12 19:41:43.000000000 +0100
-+++ bayonne-1.2.15/server/Makefile.in 2005-10-12 19:41:48.000000000 +0100
-@@ -165,7 +165,7 @@
- dsolibdir = $(libdir)/bayonne/$(VERSION)
- pkgincludedir = ${includedir}/cc++
- etc_prefix = @sysconfdir@
--ini_prefix = /etc
-+ini_prefix = @sysconfdir@
- etc_suffix = .orig
-
- AM_CPPFLAGS = -DVERPATH=\"@VERSION@\" @SERVER_FLAGS@
-diff -urNad bayonne-1.2.15~/var/users/admin bayonne-1.2.15/var/users/admin
---- bayonne-1.2.15~/var/users/admin 1970-01-01 01:00:00.000000000 +0100
-+++ bayonne-1.2.15/var/users/admin 2005-10-12 19:41:48.000000000 +0100
+diff -urNad bayonne-2.3.2~/var/users/admin bayonne-2.3.2/var/users/admin
+--- bayonne-2.3.2~/var/users/admin 1970-01-01 01:00:00.000000000 +0100
++++ bayonne-2.3.2/var/users/admin 2007-08-18 13:14:32.000000000 +0200
@@ -0,0 +1,2 @@
+password=9999
+type=user
Deleted: bayonne/trunk/debian/patches/02_fix_libpq.dpatch
===================================================================
--- bayonne/trunk/debian/patches/02_fix_libpq.dpatch 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/patches/02_fix_libpq.dpatch 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_libpq.dpatch by <danchev at spnet.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix buggy configure; this might not be needed in next upstream release
-
- at DPATCH@
-diff -urNad bayonne-1.2.16~/configure bayonne-1.2.16/configure
---- bayonne-1.2.16~/configure 2006-05-27 15:42:40.000000000 +0300
-+++ bayonne-1.2.16/configure 2006-08-17 20:05:45.000000000 +0300
-@@ -12580,7 +12580,7 @@
-
- else
-
-- if test -f $(includedir)/pgsql/libpq++.h ; then
-+ if test -f ${includedir}/pgsql/libpq++.h ; then
- POSTGRES_FLAGS="-I$(includedir)/pgsql"
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_PGSQL_POSTGRES 1
Deleted: bayonne/trunk/debian/patches/config-cfg.dpatch
===================================================================
--- bayonne/trunk/debian/patches/config-cfg.dpatch 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/patches/config-cfg.dpatch 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## config-cfg.dpatch by <mark at dell.purcell.id.au>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./data/config/30Server.cfg /tmp/dpep-work.BaxgVK/bayonne-1.2.14pl2/data/config/30Server.cfg
---- ./data/config/30Server.cfg 2001-04-04 14:48:21.000000000 +0100
-+++ /tmp/dpep-work.BaxgVK/bayonne-1.2.14pl2/data/config/30Server.cfg 2005-07-31 22:01:06.000000000 +0100
-@@ -82,7 +82,7 @@
- $DIALOG --title "Default script to start" --clear --inputbox "\
- Enter the name of the default scrupt file\n\
- to execute for incoming calls" \
-- 0 0 $server_default" 2>/tmp/inputbox.tmp.$$
-+ 0 0 "$server_default" 2>/tmp/inputbox.tmp.$$
- retval=$?
- input=`cat /tmp/inputbox.tmp.$$`
- rm -f /tmp/inputbox.tmp.$$
-@@ -144,8 +144,6 @@
- ;;
- esac
- ;;
-- esac
-- ;;
- esac
- exit 0
-
-diff -urNad --exclude=CVS --exclude=.svn ./data/config/40Network.cfg /tmp/dpep-work.BaxgVK/bayonne-1.2.14pl2/data/config/40Network.cfg
---- ./data/config/40Network.cfg 2001-04-10 16:37:56.000000000 +0100
-+++ /tmp/dpep-work.BaxgVK/bayonne-1.2.14pl2/data/config/40Network.cfg 2005-07-31 22:01:20.000000000 +0100
-@@ -147,8 +147,6 @@
- ;;
- esac
- ;;
-- esac
-- ;;
- esac
- exit 0
-
Deleted: bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch
===================================================================
--- bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,155 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## friend-classes.dpatch by <mark at dell.purcell.id.au>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./drivers/phonedev/driver.h /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/drivers/phonedev/driver.h
---- ./drivers/phonedev/driver.h 2002-12-12 03:43:41.000000000 +0000
-+++ /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/drivers/phonedev/driver.h 2005-07-31 21:14:18.000000000 +0100
-@@ -51,6 +51,7 @@
- } cpatone_t;
-
- class PhonedevTrunk;
-+class PhonedevService;
-
- typedef union
- {
-diff -urNad --exclude=CVS --exclude=.svn ./drivers/zapata/driver.h /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/drivers/zapata/driver.h
---- ./drivers/zapata/driver.h 2002-12-12 03:48:32.000000000 +0000
-+++ /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/drivers/zapata/driver.h 2005-07-31 21:14:29.000000000 +0100
-@@ -23,6 +23,7 @@
- #endif
-
- class ZapataTrunk;
-+class ZapataService;
-
- typedef bool (ZapataTrunk::*trunkhandler_t)(TrunkEvent *event);
-
-diff -urNad --exclude=CVS --exclude=.svn ./modules/auditing/tcpmon.cpp /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/modules/auditing/tcpmon.cpp
---- ./modules/auditing/tcpmon.cpp 2002-12-11 03:52:24.000000000 +0000
-+++ /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/modules/auditing/tcpmon.cpp 2005-07-31 21:14:46.000000000 +0100
-@@ -80,6 +80,8 @@
-
- #endif
-
-+class MonSession;
-+
- class TcpMonitor : public TCPSocket, public Monitor, public Server
- {
- private:
-diff -urNad --exclude=CVS --exclude=.svn ./server/bayonne.h /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/server/bayonne.h
---- ./server/bayonne.h 2004-11-02 16:03:30.000000000 +0000
-+++ /tmp/dpep-work.JlFzba/bayonne-1.2.14pl2/server/bayonne.h 2005-07-31 21:15:02.000000000 +0100
-@@ -2052,6 +2052,8 @@
- aaImage(aaScript *script);
- };
-
-+class Conference;
-+
- /**
- * The mixer object is a resource for conferences.
- *
-@@ -2270,6 +2272,8 @@
- };
- #endif
-
-+class ScriptInterface;
-+
- /**
- * We derive a Bayonne server version of ScriptInterp, "Trunk",
- * which holds most common elements of the script engine for Bayonne
---- ./server/bayonne.h~ 2006-03-12 21:42:18.000000000 +0000
-+++ ./server/bayonne.h 2006-03-12 22:00:48.000000000 +0000
-@@ -781,6 +781,10 @@
- * @author David Sugar <dyfet at ostel.com>
- * @short phrase translations dso base for tts.
- */
-+
-+class Translator;
-+Translator *getTranslator(const char *name);
-+
- class Translator : protected Keydata
- {
- private:
-@@ -1423,6 +1427,10 @@
- * @author David Sugar <dyfet at ostel.com>
- * @short Request service.
- */
-+
-+class Request;
-+Request *request(TrunkGroup *group, char **argv, unsigned timeout, const char *tag, const char *pid);
-+
- class Request
- {
- private:
-@@ -1473,6 +1481,10 @@
- * @author David Sugar <dyfet at ostel.com>
- * @short Trunk group configuration.
- */
-+
-+class TrunkGroup;
-+TrunkGroup *getGroup(const char *name);
-+
- class TrunkGroup : public Keydata, public CallStat
- {
- private:
-@@ -2938,6 +2950,10 @@
- * @author David Sugar <dyfet at ostel.com>
- * @short Bayonne audit logging interface.
- */
-+
-+void audit(Trunk *trunk, char *detail);
-+void alog(Trunk *trunk, char *detail);
-+
- class Audit : public Mutex
- {
- private:
-@@ -3553,6 +3569,10 @@
- * @short threaded server service.
- * @author David Sugar <dyfet at ostel.com>
- */
-+
-+void startServers(void);
-+void stopServers(void);
-+
- class Server : public Thread
- {
- private:
-@@ -3625,6 +3645,10 @@
- * @short generated sample tone.
- * @author David Sugar.
- */
-+
-+class phTone;
-+phTone *getphTone(const char *name);
-+
- class phTone
- {
- private:
-@@ -3705,6 +3729,11 @@
- * @short TGI interpreter module.
- * @author David Sugar <dyfet at ostel.com>
- */
-+
-+class TGI;
-+void getInterp(char *cmd, char **args);
-+TGI *getInterp(char *cmd);
-+
- class TGI
- {
- private:
-@@ -3782,6 +3811,12 @@
- * @short Module interface class.
- * @author David Sugar <dyfet at ostel.com>
- */
-+
-+class Module;
-+Module *getModule(modtype_t mod, const char *name);
-+void detachModules(Trunk *trunk);
-+void attachModules(Trunk *trunk);
-+
- class Module : public Script
- {
- private:
Deleted: bayonne/trunk/debian/patches/gcc4-ixdr.dpatch
===================================================================
--- bayonne/trunk/debian/patches/gcc4-ixdr.dpatch 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/patches/gcc4-ixdr.dpatch 2007-08-18 13:54:12 UTC (rev 4051)
@@ -1,142 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc4-ixdr.dpatch by <mark at dell.purcell.id.au>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./modules/sunrpc/bayonne_xdr.c /tmp/dpep-work.naqDWe/bayonne-1.2.14pl2/modules/sunrpc/bayonne_xdr.c
---- ./modules/sunrpc/bayonne_xdr.c 2004-11-11 11:27:49.000000000 +0000
-+++ /tmp/dpep-work.naqDWe/bayonne-1.2.14pl2/modules/sunrpc/bayonne_xdr.c 2005-07-31 21:18:49.000000000 +0100
-@@ -66,12 +66,12 @@
- return FALSE;
-
- } else {
-- IXDR_PUT_LONG(buf, objp->pol_active);
-- IXDR_PUT_LONG(buf, objp->max_incoming);
-- IXDR_PUT_LONG(buf, objp->max_outgoing);
-- IXDR_PUT_LONG(buf, objp->tot_incoming);
-- IXDR_PUT_LONG(buf, objp->tot_outgoing);
-- IXDR_PUT_LONG(buf, objp->pol_members);
-+ IXDR_PUT_INT32(buf, objp->pol_active);
-+ IXDR_PUT_INT32(buf, objp->max_incoming);
-+ IXDR_PUT_INT32(buf, objp->max_outgoing);
-+ IXDR_PUT_INT32(buf, objp->tot_incoming);
-+ IXDR_PUT_INT32(buf, objp->tot_outgoing);
-+ IXDR_PUT_INT32(buf, objp->pol_members);
- }
- if (!xdr_array (xdrs, (char **)&objp->pol_ports.pol_ports_val, (u_int *) &objp->pol_ports.pol_ports_len, ~0,
- sizeof (int), (xdrproc_t) xdr_int))
-@@ -100,12 +100,12 @@
- return FALSE;
-
- } else {
-- objp->pol_active = IXDR_GET_LONG(buf);
-- objp->max_incoming = IXDR_GET_LONG(buf);
-- objp->max_outgoing = IXDR_GET_LONG(buf);
-- objp->tot_incoming = IXDR_GET_LONG(buf);
-- objp->tot_outgoing = IXDR_GET_LONG(buf);
-- objp->pol_members = IXDR_GET_LONG(buf);
-+ objp->pol_active = IXDR_GET_INT32(buf);
-+ objp->max_incoming = IXDR_GET_INT32(buf);
-+ objp->max_outgoing = IXDR_GET_INT32(buf);
-+ objp->tot_incoming = IXDR_GET_INT32(buf);
-+ objp->tot_outgoing = IXDR_GET_INT32(buf);
-+ objp->pol_members = IXDR_GET_INT32(buf);
- }
- if (!xdr_array (xdrs, (char **)&objp->pol_ports.pol_ports_val, (u_int *) &objp->pol_ports.pol_ports_len, ~0,
- sizeof (int), (xdrproc_t) xdr_int))
-@@ -154,9 +154,9 @@
- return FALSE;
-
- } else {
-- IXDR_PUT_LONG(buf, objp->mixer_avail);
-- IXDR_PUT_LONG(buf, objp->mixer_used);
-- IXDR_PUT_LONG(buf, objp->mixer_groups);
-+ IXDR_PUT_INT32(buf, objp->mixer_avail);
-+ IXDR_PUT_INT32(buf, objp->mixer_used);
-+ IXDR_PUT_INT32(buf, objp->mixer_groups);
- }
- if (!xdr_array (xdrs, (char **)&objp->mixer_conf.mixer_conf_val, (u_int *) &objp->mixer_conf.mixer_conf_len, ~0,
- sizeof (bayonne_conf), (xdrproc_t) xdr_bayonne_conf))
-@@ -173,9 +173,9 @@
- return FALSE;
-
- } else {
-- objp->mixer_avail = IXDR_GET_LONG(buf);
-- objp->mixer_used = IXDR_GET_LONG(buf);
-- objp->mixer_groups = IXDR_GET_LONG(buf);
-+ objp->mixer_avail = IXDR_GET_INT32(buf);
-+ objp->mixer_used = IXDR_GET_INT32(buf);
-+ objp->mixer_groups = IXDR_GET_INT32(buf);
- }
- if (!xdr_array (xdrs, (char **)&objp->mixer_conf.mixer_conf_val, (u_int *) &objp->mixer_conf.mixer_conf_len, ~0,
- sizeof (bayonne_conf), (xdrproc_t) xdr_bayonne_conf))
-@@ -286,9 +286,9 @@
- return FALSE;
-
- } else {
-- IXDR_PUT_LONG(buf, objp->conf_mixer);
-- IXDR_PUT_LONG(buf, objp->conf_alloc);
-- IXDR_PUT_LONG(buf, objp->conf_groups);
-+ IXDR_PUT_INT32(buf, objp->conf_mixer);
-+ IXDR_PUT_INT32(buf, objp->conf_alloc);
-+ IXDR_PUT_INT32(buf, objp->conf_groups);
- }
- if (!xdr_array (xdrs, (char **)&objp->conf_limits.conf_limits_val, (u_int *) &objp->conf_limits.conf_limits_len, ~0,
- sizeof (int), (xdrproc_t) xdr_int))
-@@ -305,9 +305,9 @@
- return FALSE;
-
- } else {
-- objp->conf_mixer = IXDR_GET_LONG(buf);
-- objp->conf_alloc = IXDR_GET_LONG(buf);
-- objp->conf_groups = IXDR_GET_LONG(buf);
-+ objp->conf_mixer = IXDR_GET_INT32(buf);
-+ objp->conf_alloc = IXDR_GET_INT32(buf);
-+ objp->conf_groups = IXDR_GET_INT32(buf);
- }
- if (!xdr_array (xdrs, (char **)&objp->conf_limits.conf_limits_val, (u_int *) &objp->conf_limits.conf_limits_len, ~0,
- sizeof (int), (xdrproc_t) xdr_int))
-@@ -416,13 +416,13 @@
- if (!xdr_long (xdrs, &objp->gid))
- return FALSE;
- } else {
-- IXDR_PUT_U_LONG(buf, objp->nodes);
-- IXDR_PUT_U_LONG(buf, objp->ports);
-- IXDR_PUT_U_LONG(buf, objp->used);
-- IXDR_PUT_U_LONG(buf, objp->mixers);
-- IXDR_PUT_U_LONG(buf, objp->conferences);
-- IXDR_PUT_LONG(buf, objp->uid);
-- IXDR_PUT_LONG(buf, objp->gid);
-+ IXDR_PUT_U_INT32(buf, objp->nodes);
-+ IXDR_PUT_U_INT32(buf, objp->ports);
-+ IXDR_PUT_U_INT32(buf, objp->used);
-+ IXDR_PUT_U_INT32(buf, objp->mixers);
-+ IXDR_PUT_U_INT32(buf, objp->conferences);
-+ IXDR_PUT_INT32(buf, objp->uid);
-+ IXDR_PUT_INT32(buf, objp->gid);
- }
- return TRUE;
- } else if (xdrs->x_op == XDR_DECODE) {
-@@ -455,13 +455,13 @@
- if (!xdr_long (xdrs, &objp->gid))
- return FALSE;
- } else {
-- objp->nodes = IXDR_GET_U_LONG(buf);
-- objp->ports = IXDR_GET_U_LONG(buf);
-- objp->used = IXDR_GET_U_LONG(buf);
-- objp->mixers = IXDR_GET_U_LONG(buf);
-- objp->conferences = IXDR_GET_U_LONG(buf);
-- objp->uid = IXDR_GET_LONG(buf);
-- objp->gid = IXDR_GET_LONG(buf);
-+ objp->nodes = IXDR_GET_U_INT32(buf);
-+ objp->ports = IXDR_GET_U_INT32(buf);
-+ objp->used = IXDR_GET_U_INT32(buf);
-+ objp->mixers = IXDR_GET_U_INT32(buf);
-+ objp->conferences = IXDR_GET_U_INT32(buf);
-+ objp->uid = IXDR_GET_INT32(buf);
-+ objp->gid = IXDR_GET_INT32(buf);
- }
- return TRUE;
- }
Added: bayonne/trunk/debian/patches/libcapi20_fix.dpatch
===================================================================
--- bayonne/trunk/debian/patches/libcapi20_fix.dpatch (rev 0)
+++ bayonne/trunk/debian/patches/libcapi20_fix.dpatch 2007-08-18 13:54:12 UTC (rev 4051)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## libcapi20_fix.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bayonne-2.3.2~/configure bayonne-2.3.2/configure
+--- bayonne-2.3.2~/configure 2007-08-18 13:16:08.000000000 +0200
++++ bayonne-2.3.2/configure 2007-08-18 15:27:21.000000000 +0200
+@@ -20406,8 +20406,6 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- $
+-
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ALERT_SENDING_COMPLETE 1
+ _ACEOF
Property changes on: bayonne/trunk/debian/patches/libcapi20_fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: bayonne/trunk/debian/rules
===================================================================
--- bayonne/trunk/debian/rules 2007-08-18 13:31:55 UTC (rev 4050)
+++ bayonne/trunk/debian/rules 2007-08-18 13:54:12 UTC (rev 4051)
@@ -4,8 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
export DH_COMPAT=4
export OPENH323DIR=/usr/share/openh323
@@ -23,7 +21,7 @@
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
FILENAME := bayonne_$(UPVERSION).orig.tar.gz
-URL := http://heanet.dl.sourceforge.net/gnutelephony/bayonne-$(UPVERSION).tar.gz
+URL := http://ftp.gnu.org/pub/gnu/bayonne/bayonne2-$(UPVERSION).tar.gz
export CPPFLAGS=-I/usr/include/cc++2/ -fPIC
@@ -58,33 +56,32 @@
build: build-stamp
build-stamp: config.status
dh_testdir
-
- # Add here commands to compile the package.
+
$(MAKE)
#/usr/bin/docbook-to-man debian/bayonne.sgml > bayonne.1
-
+
touch build-stamp
clean: cleanup unpatch
cleanup:
dh_testdir
dh_testroot
-
+
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ]||$(MAKE) distclean
rm -f build-stamp config.status
-test -r /usr/share/misc/config.sub && \
cp -f /usr/share/misc/config.sub config/config.sub
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess config/config.guess
-
-
# Cleanup what the make distclean doesn't
rm -f */Makefile */*/Makefile
rm -f contrib/dist/streams.spec
rm -f contrib/dist/native.spec
rm -f drivers/openswitch drivers/openline4
-
+ rm -f docs/doxy docs/*.pdf docs/img1.old
+ rm -rf docs/html
+ rm -rf docs/latex
dh_clean
install: build
@@ -92,28 +89,24 @@
dh_testroot
dh_clean -k
dh_installdirs
-
# Add here commands to install the package into debian/bayonne.
$(MAKE) install DESTDIR=$(CURDIR)/debian/bayonne
-
dh_movefiles --sourcedir=debian/bayonne
rm -f $(CURDIR)/debian/bayonne/etc/*.orig
-
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
dh_testroot -i
- dh_installdocs doc/*.html doc/*.pdf doc/*.css doc/*.text doc/*.tex doc/*.ps -i
- dh_installexamples contrib/tgitest server/bayonne.conf server/bayonne.sched -X COPYING -i
+ dh_installdocs -i
rm -f debian/bayonne/etc/*.orig
dh_installlogrotate -i
- dh_installman doc/man3/* -i
+ #dh_installman doc/man3/* -i
dh_installinfo -i
dh_installchangelogs ChangeLog -i
dh_link -i
dh_strip -i
- /usr/bin/strip --remove-section=.comment --remove-section=.note debian/bayonne/usr/lib/bayonne/[0-9]*/[a-z]*
+ /usr/bin/strip --remove-section=.comment --remove-section=.note debian/bayonne/usr/lib/bayonne-*/*
dh_compress -i
dh_fixperms -i
dh_makeshlibs -i
@@ -127,14 +120,14 @@
binary-arch: build install
dh_testdir -a
dh_testroot -a
- dh_installdocs
+ dh_installdocs -a
dh_installlogrotate -a
dh_installinit -a
dh_installcron -a
dh_installchangelogs ChangeLog -a
dh_link -a
dh_strip -a
- /usr/bin/strip --remove-section=.comment --remove-section=.note debian/bayonne/usr/lib/bayonne/[0-9]*/[a-z]*
+ /usr/bin/strip --remove-section=.comment --remove-section=.note debian/bayonne/usr/lib/bayonne-*/*
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
More information about the Pkg-voip-commits
mailing list