[Pkg-voip-commits] r1209 - asterisk/trunk/debian
asterisk/trunk/debian/patches asterisk-addons
asterisk-addons/trunk/debian libpri/trunk/debian
libpri/trunk/debian/patches openh323/trunk/debian
zaptel/trunk/debian zaptel/trunk/debian/patches
Kilian Krause
kilian at costa.debian.org
Sun Jan 29 16:53:31 UTC 2006
Author: kilian
Date: 2006-01-29 16:53:28 +0000 (Sun, 29 Jan 2006)
New Revision: 1209
Added:
asterisk-addons/build-area
asterisk-addons/tarballs
Modified:
asterisk-addons/trunk/debian/control
asterisk/trunk/debian/changelog
asterisk/trunk/debian/control
asterisk/trunk/debian/patches/bristuff.dpatch
libpri/trunk/debian/changelog
libpri/trunk/debian/patches/libname.dpatch
openh323/trunk/debian/changelog
openh323/trunk/debian/control
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/00list
zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch
Log:
rollup for asterisk 1.2.3 with its new libs. Still due: bristuff 0.3.0i
Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog 2006-01-29 12:34:24 UTC (rev 1208)
+++ asterisk/trunk/debian/changelog 2006-01-29 16:53:28 UTC (rev 1209)
@@ -1,4 +1,4 @@
-asterisk (1:1.2.1.dfsg-4) UNRELEASED; urgency=low
+asterisk (1:1.2.3.dfsg-1) UNRELEASED; urgency=low
[ Tzafrir Cohen ]
* Fix PID display (Closes: #338646)
@@ -15,6 +15,8 @@
* ukcid.dpatch: UK Caller ID patch for the X100P. (Closes: #302380)
[ Kilian Krause ]
+ * New upstream release. Bumping depends on libpri and zaptel to according
+ 1.2 versions.
* Build-Depends on libpri1.2 since new ABI caused new package name.
* Removed alternatives from Build-Depends since sbuild will only take first
anyway to ensure constant rebuilds.
Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control 2006-01-29 12:34:24 UTC (rev 1208)
+++ asterisk/trunk/debian/control 2006-01-29 16:53:28 UTC (rev 1209)
@@ -4,12 +4,12 @@
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>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.1-4), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.1-3), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.1-4), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.2-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.2-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.2-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev
Package: asterisk
Architecture: all
Section: comm
-Depends: asterisk-classic (= ${Source-Version})|asterisk-bristuff (= ${Source-Version}), asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
+Depends: asterisk-classic (= ${Source-Version})|asterisk-bristuff (= ${Source-Version}), adduser (>= 3.63)
Conflicts: asterisk-oh323 (<= 0.6.6pre3-3)
Suggests: gnomemeeting, ohphone, kphone, asterisk-doc, asterisk-dev, asterisk-rate-engine, mpg123
Description: Open Source Private Branch Exchange (PBX) - dummy package
@@ -38,7 +38,7 @@
Package: asterisk-classic
Architecture: any
Section: comm
-Depends: ${shlibs:Depends}, adduser (>= 3.63)
+Depends: ${shlibs:Depends}, asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
Conflicts: asterisk-bristuff
Description: Open Source Private Branch Exchange (PBX) - original Digium version
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
@@ -66,7 +66,7 @@
Package: asterisk-bristuff
Architecture: any
Section: comm
-Depends: ${shlibs:Depends}, adduser (>= 3.63)
+Depends: ${shlibs:Depends}, asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
Conflicts: asterisk-classic
Description: Open Source Private Branch Exchange (PBX) - BRIstuff-enabled version
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
Modified: asterisk/trunk/debian/patches/bristuff.dpatch
===================================================================
--- asterisk/trunk/debian/patches/bristuff.dpatch 2006-01-29 12:34:24 UTC (rev 1208)
+++ asterisk/trunk/debian/patches/bristuff.dpatch 2006-01-29 16:53:28 UTC (rev 1209)
@@ -2084,14 +2084,6 @@
diff -urN asterisk-1.2.1.orig/channel.c asterisk-1.2.1/channel.c
--- asterisk-1.2.1.orig/channel.c 2005-12-02 00:34:58.000000000 +0100
+++ asterisk-1.2.1/channel.c 2006-01-05 10:21:35.000000000 +0100
-@@ -95,6 +95,7 @@
- static int shutting_down = 0;
-
- static int uniqueint = 0;
-+AST_MUTEX_DEFINE_EXPORTED(uniquelock);
-
- unsigned long global_fin = 0, global_fout = 0;
-
@@ -511,6 +512,17 @@
.description = "Null channel (should not see this)",
};
@@ -8941,12 +8933,10 @@
/* Why is the channel hanged up */
int hangupcause;
-@@ -531,6 +534,11 @@
+@@ -531,6 +534,9 @@
#define AST_STATE_MUTE (1 << 16)
/*! @} */
-+extern ast_mutex_t uniquelock;
-+
+/*! \brief Change the state of a channel and the callerid of the calling channel*/
+int ast_setstate_and_cid(struct ast_channel *chan, int state, char *cid_num, char *cid_name);
+
Added: asterisk-addons/build-area
===================================================================
--- asterisk-addons/build-area 2006-01-29 12:34:24 UTC (rev 1208)
+++ asterisk-addons/build-area 2006-01-29 16:53:28 UTC (rev 1209)
@@ -0,0 +1 @@
+link ../build-area/
\ No newline at end of file
Property changes on: asterisk-addons/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: asterisk-addons/tarballs
===================================================================
--- asterisk-addons/tarballs 2006-01-29 12:34:24 UTC (rev 1208)
+++ asterisk-addons/tarballs 2006-01-29 16:53:28 UTC (rev 1209)
@@ -0,0 +1 @@
+link ../tarballs/
\ No newline at end of file
Property changes on: asterisk-addons/tarballs
___________________________________________________________________
Name: svn:special
+ *
Modified: asterisk-addons/trunk/debian/control
===================================================================
--- asterisk-addons/trunk/debian/control 2006-01-29 12:34:24 UTC (rev 1208)
+++ asterisk-addons/trunk/debian/control 2006-01-29 16:53:28 UTC (rev 1209)
@@ -1,8 +1,9 @@
Source: asterisk-addons
Section: comm
Priority: optional
-Maintainer: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Build-Depends: debhelper (>= 4.0.0), libmysqlclient12-dev || libmysqlclient-dev, asterisk-dev, libsqlite3-dev
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, 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), libmysqlclient12-dev, asterisk-dev, libsqlite3-dev
Standards-Version: 3.6.1
Package: asterisk-mysql
Modified: libpri/trunk/debian/changelog
===================================================================
--- libpri/trunk/debian/changelog 2006-01-29 12:34:24 UTC (rev 1208)
+++ libpri/trunk/debian/changelog 2006-01-29 16:53:28 UTC (rev 1209)
@@ -1,9 +1,10 @@
-libpri (1.2.1-3) UNRELEASED; urgency=low
+libpri (1.2.2-1) UNRELEASED; urgency=low
[ Tzafrir Cohen ]
* bristuff 0.3.0-PRE-1f
[ Kilian Krause ]
+ * New upstream release.
* New ABI since 1.2.1 without chaning SONAME. Adjusting at least the package
name accordingly. (Closes: #341109)
* Add GNU/kFreeBSD patch to run ldconfig (Closes: #338388)
Modified: libpri/trunk/debian/patches/libname.dpatch
===================================================================
--- libpri/trunk/debian/patches/libname.dpatch 2006-01-29 12:34:24 UTC (rev 1208)
+++ libpri/trunk/debian/patches/libname.dpatch 2006-01-29 16:53:28 UTC (rev 1209)
@@ -8,9 +8,9 @@
## DP: libpri-$(LIB_SUF).so.1
@DPATCH@
-diff -urNad libpri-1.2.1/Makefile /tmp/dpep.3vEzwU/libpri-1.2.1/Makefile
---- libpri-1.2.1/Makefile 2005-12-31 19:42:55.000000000 +0200
-+++ /tmp/dpep.3vEzwU/libpri-1.2.1/Makefile 2005-12-31 19:44:00.000000000 +0200
+diff -urNad libpri-1.2.2~/Makefile libpri-1.2.2/Makefile
+--- libpri-1.2.2~/Makefile 2006-01-29 16:00:46.000000000 +0000
++++ libpri-1.2.2/Makefile 2006-01-29 16:03:50.000000000 +0000
@@ -32,16 +32,22 @@
OSARCH=$(shell uname -s)
PROC?=$(shell uname -m)
@@ -31,7 +31,7 @@
CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
INSTALL_PREFIX?=
INSTALL_BASE=/usr
--SOFLAGS = -Wl,-hlibpri.so.1
+-SOFLAGS = -Wl,-hlibpri.so.1.0
+INCLUDE_DIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/include/$(LIB_SUF)
+SOFLAGS = -Wl,-hlib$(LIBNAME).so.1
LDCONFIG = /sbin/ldconfig
@@ -46,7 +46,7 @@
#INSTALL_PREFIX = /opt/asterisk # Uncomment out to install in standard Solaris location for 3rd party code
endif
-@@ -82,28 +88,27 @@
+@@ -82,28 +88,28 @@
install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
@@ -57,14 +57,14 @@
- install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
-- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
+- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+ ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf lib$(LIBNAME).so.1 lib$(LIBNAME).so )
install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS); fi
else
-- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
-- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) )
+- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
+ ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf lib$(LIBNAME).so.1 lib$(LIBNAME).so ; $(SOSLINK) )
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
endif
@@ -84,12 +84,12 @@
pritest: pritest.o
$(CC) -o pritest pritest.o -L. -lpri -lzap $(CFLAGS)
-@@ -131,7 +136,7 @@
+@@ -131,7 +137,7 @@
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
$(LDCONFIG) $(LDCONFIG_FLAGS) .
-- ln -sf libpri.so.1 libpri.so
+- ln -sf libpri.so.1.0 libpri.so
+ ln -sf lib$(LIBNAME).so.1 lib$(LIBNAME).so
+ ln -sf libpri.so.1.0 libpri.so.1
$(SOSLINK)
- clean:
Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog 2006-01-29 12:34:24 UTC (rev 1208)
+++ openh323/trunk/debian/changelog 2006-01-29 16:53:28 UTC (rev 1209)
@@ -1,8 +1,9 @@
-openh323 (1.15.6-4) UNRELEASED; urgency=low
+openh323 (1.17.4-1) UNRELEASED; urgency=low
+ * New upstream version (Atlas) to match with Phobos release of PWLib.
* debian/rules: fix OPENH323DIR preset in openh323u.mak.
- -- Kilian Krause <kilian at debian.org> Wed, 21 Dec 2005 18:04:40 +0100
+ -- Kilian Krause <kilian at debian.org> Sun, 29 Jan 2006 13:58:42 +0100
openh323 (1.15.6-3) unstable; urgency=high
Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control 2006-01-29 12:34:24 UTC (rev 1208)
+++ openh323/trunk/debian/control 2006-01-29 16:53:28 UTC (rev 1209)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
-Build-Depends: debhelper (>=4.0.2), libpt-dbg (>=1.8.7-2), libpt-dev (>=1.8.7-2), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.0.rel-4), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev
+Build-Depends: debhelper (>=4.0.2), libpt-dbg (>=1.9.2-1), libpt-dev (>=1.9.2-1), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev
Build-Depends-Indep: doxygen
Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopenh323-1.15.3c2, libopenh323-1.15.6
Standards-Version: 3.6.2
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2006-01-29 12:34:24 UTC (rev 1208)
+++ zaptel/trunk/debian/changelog 2006-01-29 16:53:28 UTC (rev 1209)
@@ -1,13 +1,14 @@
-zaptel (1:1.2.1-4) UNRELEASED; urgency=low
+zaptel (1:1.2.2-1) UNRELEASED; urgency=low
[ Kilian Krause ]
+ * New upstream release.
* Install zaptel kernel modules into properly named directory (Closes: #343521)
[ Tzafrir Cohen ]
* ukcid.dpatch: for UK Caller ID support (Zaptel part, closes: #302380)
* newer versions of genzaptelconf and xpp.dpatch
- -- Kilian Krause <kilian at debian.org> Wed, 11 Jan 2006 20:29:37 +0100
+ -- Kilian Krause <kilian at debian.org> Sun, 29 Jan 2006 15:51:31 +0000
zaptel (1:1.2.1-3) unstable; urgency=low
Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list 2006-01-29 12:34:24 UTC (rev 1208)
+++ zaptel/trunk/debian/patches/00list 2006-01-29 16:53:28 UTC (rev 1209)
@@ -1,7 +1,7 @@
Makefile_deps_kern
Makefile_deps_utils
Makefile_uname
-Makefile_pscmd
+#Makefile_pscmd
Makefile_targets
Makefile_kbuild
#Makefile_xpp
Modified: zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch 2006-01-29 12:34:24 UTC (rev 1208)
+++ zaptel/trunk/debian/patches/Makefile_deps_kern.dpatch 2006-01-29 16:53:28 UTC (rev 1209)
@@ -7,16 +7,16 @@
## DP: dependency on zaptel.h .
@DPATCH@
-diff -urNad zaptel-1.2.0/Makefile /tmp/dpep.NGQeEA/zaptel-1.2.0/Makefile
---- zaptel-1.2.0/Makefile 2005-11-18 00:41:33.480504890 +0200
-+++ /tmp/dpep.NGQeEA/zaptel-1.2.0/Makefile 2005-11-18 01:00:01.442774892 +0200
-@@ -137,40 +137,24 @@
+diff -urNad zaptel-1.2.2~/Makefile zaptel-1.2.2/Makefile
+--- zaptel-1.2.2~/Makefile 2006-01-10 20:32:34.000000000 +0000
++++ zaptel-1.2.2/Makefile 2006-01-29 16:08:28.000000000 +0000
+@@ -169,40 +169,24 @@
tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-tor2.o: tor2-hw.h tor2fw.h zaptel.h
-
--zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
+-zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h version.h
-
-torisa.o: zaptel.h torisa.h
-
@@ -27,28 +27,28 @@
-wcfxo.o: zaptel.h
-
-wct1xxp.o: zaptel.h
-+tor2.o: tor2-hw.h tor2fw.h
++tor2.o: tor2-hw.h tor2fw.h
-wcte11xp.o: zaptel.h
-+zaptel.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
++zaptel.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h version.h
-ztd-loc.o: zaptel.h
-+torisa.o: torisa.h
++torisa.o: torisa.h
-wct4xxp.o: zaptel.h
-+wcusb.o: wcusb.h
++wcusb.o: wcusb.h
-wctdm.o: zaptel.h wctdm.h
-+wcfxsusb.o: wcfxsusb.h
++wcfxsusb.o: wcfxsusb.h
-wctdm24xxp.o: zaptel.h wctdm.h
-+wctdm.o: wctdm.h
++wctdm.o: wctdm.h
-pciradio.o: zaptel.h radfw.h
-+wctdm24xxp.o: wctdm.h
++wctdm24xxp.o: wctdm.h
-wcs3200p.o: zaptel.h
-+pciradio.o: radfw.h
++pciradio.o: radfw.h
ztdummy.o: ztdummy.h
More information about the Pkg-voip-commits
mailing list