[Pkg-voip-commits] r5021 - in /agx-ast-addons/trunk/debian: ./ README.Debian changelog compat control copyright docs patches/ patches/asteriskh_ugly.diff patches/series rules
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Tue Dec 4 12:39:52 UTC 2007
Author: tzafrir-guest
Date: Tue Dec 4 12:39:52 2007
New Revision: 5021
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5021
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
agx-ast-addons/trunk/debian/ (with props)
agx-ast-addons/trunk/debian/README.Debian
agx-ast-addons/trunk/debian/changelog
agx-ast-addons/trunk/debian/compat
agx-ast-addons/trunk/debian/control
agx-ast-addons/trunk/debian/copyright
agx-ast-addons/trunk/debian/docs
agx-ast-addons/trunk/debian/patches/
agx-ast-addons/trunk/debian/patches/asteriskh_ugly.diff
agx-ast-addons/trunk/debian/patches/series
agx-ast-addons/trunk/debian/rules (with props)
Propchange: agx-ast-addons/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: agx-ast-addons/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/README.Debian?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/README.Debian (added)
+++ agx-ast-addons/trunk/debian/README.Debian Tue Dec 4 12:39:52 2007
@@ -1,0 +1,7 @@
+Upstream package also includes three other modules that we choose to
+omit as they are included in our Asterisk package:
+ * app_devstate - from bristuff. We include it as part of BRIstuff.
+ * app_pickup2 - We include it as part of BRIstuff.
+ * func_devstate - Backport from asterisk trunk (to be 1.6). This is a
+ the backport from svncomminuty.digium.com which we
+ also use in the package Asterisk.
Added: agx-ast-addons/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/changelog?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/changelog (added)
+++ agx-ast-addons/trunk/debian/changelog Tue Dec 4 12:39:52 2007
@@ -1,0 +1,5 @@
+agx-ast-addons (1.4.3-1) UNRELEASED; urgency=low
+
+ * Initial debian package.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Fri, 23 Nov 2007 14:42:30 +0200
Added: agx-ast-addons/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/compat?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/compat (added)
+++ agx-ast-addons/trunk/debian/compat Tue Dec 4 12:39:52 2007
@@ -1,0 +1,1 @@
+4
Added: agx-ast-addons/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/control?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/control (added)
+++ agx-ast-addons/trunk/debian/control Tue Dec 4 12:39:52 2007
@@ -1,0 +1,21 @@
+Source: agx-ast-addons
+Section: comm
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Build-Depends: debhelper (>= 4.1.0), quilt,
+ asterisk-dev (>= 1.4.0),
+ libspandsp-dev,
+ cmake
+Standards-Version: 3.7.2
+Homepage: http://sourceforge.net/projects/ags-ast-addons
+
+Package: agx-ast-addons
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: AGX's extra modules for the Asterisk PBX
+ A number of external modules collected and maintained by Antonio Gallo.
+ Modules include:
+ * app_confcall - An alternative implementation of Meetme
+ * app_nv_backgrounddetect, app_nv_faxdetect
+ * app_rxfax, app_txfax - uses SpanDSP
Added: agx-ast-addons/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/copyright?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/copyright (added)
+++ agx-ast-addons/trunk/debian/copyright Tue Dec 4 12:39:52 2007
@@ -1,0 +1,38 @@
+This package was debianized by Tzafrir Cohen <tzafrir.cohen at xorcom.com> on
+Sun, 25 Nov 2007 19:47:11 +0200.
+
+It was downloaded from http://sourceforge.net/projects/agx-ast-addons
+
+Upstream Author: Antonio Gallo <agx at linux.it>
+
+Copyright:
+All of them are GPLv2, AFAIK.
+This still needs review. And proper stanza added.
+
+Statements from the files:
+app_confcall.c: * Copyright (c) 2004-2007 Anthony Minessale II <anthmct at yahoo.com>
+app_confcall.c: * The above copyright notice and this permission notice shall be
+app_confcall.c: * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+app_devstate.c: * Copyright (C) 2005, Druid Software
+app_devstate.c: * Copyright (C) 2007, 1.4 porting by Antonio Gallo (AGX) www.badpenguin.org www.mercuriuspbx.it
+app_nv_backgrounddetect.c: * Copyright (C) 2004-2005, Newman Telecom, Inc. and Newman Ventures, Inc.
+app_nv_backgrounddetect.c: * Copyright (C) 2007, 1.4 porting by Antonio Gallo (AGX) www.badpenguin.org www.mercuriuspbx.it
+app_nv_backgrounddetect.c: * Portions Copyright:
+app_nv_backgrounddetect.c: * Copyright (C) 2001, Linux Support Services, Inc.
+app_nv_backgrounddetect.c: * Copyright (C) 2004, Digium, Inc.
+app_nv_faxdetect.c: * Copyright (C) 2004-2005, Newman Telecom, Inc. and Newman Ventures, Inc.
+app_nv_faxdetect.c: * Copyright (C) 2007, 1.4 porting by Antonio Gallo (AGX) www.badpenguin.org www.mercuriuspbx.it
+app_nv_faxdetect.c: * Portions Copyright:
+app_nv_faxdetect.c: * Copyright (C) 2001, Linux Support Services, Inc.
+app_nv_faxdetect.c: * Copyright (C) 2004, Digium, Inc.
+app_pickup2.c: * Copyright (C) 2004, Florian Overkamp <florian at obsimref.com>
+app_pickup2.c: * Copyright (C) 2004, Junghanns.NET GmbH
+app_pickup2.c: * Copyright (C) 2005-2007, Thorsten Knabe <ast at thorsten-knabe.de>
+app_pickup2.c: * Copyright (C) 2007, 1.4 porting by Antonio Gallo (AGX) www.badpenguin.org www.mercuriuspbx.it
+app_rxfax.c: * based on app_rxfax.c from: Copyright (C) 2003, Steve Underwood <steveu at coppice.org>
+app_rxfax.c: * Copyright (C) 20007 by Antonio Gallo <agx at linux.it>
+app_txfax.c: * Copyright (C) 2003, Steve Underwood
+func_devstate.c: * Copyright (C) 2007, Digium, Inc.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
Added: agx-ast-addons/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/docs?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/docs (added)
+++ agx-ast-addons/trunk/debian/docs Tue Dec 4 12:39:52 2007
@@ -1,0 +1,2 @@
+README
+TODO
Added: agx-ast-addons/trunk/debian/patches/asteriskh_ugly.diff
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/patches/asteriskh_ugly.diff?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/patches/asteriskh_ugly.diff (added)
+++ agx-ast-addons/trunk/debian/patches/asteriskh_ugly.diff Tue Dec 4 12:39:52 2007
@@ -1,0 +1,128 @@
+# a quick-and0dirty patch to make
+# agx-ast-addons build.
+#
+# Sets <asterisk/asterisk.h> instead of
+# "asterisk.h" and <asterisk.h> .
+# and removes a module that was missing from SVN.
+Index: agx-ast-addons-1.4.3/app_devstate.c
+===================================================================
+--- agx-ast-addons-1.4.3.orig/app_devstate.c 2007-12-04 14:03:48.000000000 +0200
++++ agx-ast-addons-1.4.3/app_devstate.c 2007-12-04 14:04:12.000000000 +0200
+@@ -8,9 +8,8 @@
+ */
+
+ #include "addon_version.h"
+-#include "asterisk.h"
+
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -58,9 +57,9 @@
+ snprintf(devName, sizeof(devName), "DS/%s", argv[1]);
+ if (argc == 4) {
+ ast_log(LOG_NOTICE, "devname %s cid %s\n", devName, argv[3]);
+- ast_device_state_changed_literal(devName);
++ ast_device_state_changed_literal(devName, NULL, NULL);
+ } else {
+- ast_device_state_changed_literal(devName);
++ ast_device_state_changed_literal(devName, NULL, NULL);
+ }
+ return RESULT_SUCCESS;
+ }
+@@ -93,7 +92,7 @@
+ }
+
+ snprintf(devName, sizeof(devName), "DS/%s", device);
+- ast_device_state_changed_literal(devName);
++ ast_device_state_changed_literal(devName, NULL, NULL);
+
+ return 0;
+ }
+Index: agx-ast-addons-1.4.3/app_rxfax.c
+===================================================================
+--- agx-ast-addons-1.4.3.orig/app_rxfax.c 2007-12-04 14:03:48.000000000 +0200
++++ agx-ast-addons-1.4.3/app_rxfax.c 2007-12-04 14:04:12.000000000 +0200
+@@ -13,7 +13,7 @@
+ DisplayName: RxFAX
+ ***/
+
+-#include "asterisk.h"
++#include <asterisk/asterisk.h>
+
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
+
+Index: agx-ast-addons-1.4.3/app_txfax.c
+===================================================================
+--- agx-ast-addons-1.4.3.orig/app_txfax.c 2007-12-04 14:03:48.000000000 +0200
++++ agx-ast-addons-1.4.3/app_txfax.c 2007-12-04 14:04:12.000000000 +0200
+@@ -16,9 +16,7 @@
+ DisplayName: TxFAX
+ ***/
+
+-#include "asterisk.h"
+-
+-#include "asterisk.h"
++#include <asterisk/asterisk.h>
+
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
+
+Index: agx-ast-addons-1.4.3/app_pickup2.c
+===================================================================
+--- agx-ast-addons-1.4.3.orig/app_pickup2.c 2007-12-04 14:03:48.000000000 +0200
++++ agx-ast-addons-1.4.3/app_pickup2.c 2007-12-04 14:04:12.000000000 +0200
+@@ -12,9 +12,7 @@
+ *
+ */
+
+-#include "asterisk.h"
+-
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+ #include <stdlib.h>
+ #include <unistd.h>
+Index: agx-ast-addons-1.4.3/app_confcall.c
+===================================================================
+--- agx-ast-addons-1.4.3.orig/app_confcall.c 2007-12-04 14:04:25.000000000 +0200
++++ agx-ast-addons-1.4.3/app_confcall.c 2007-12-04 14:04:41.000000000 +0200
+@@ -21,8 +21,7 @@
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+-#include "asterisk.h"
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+ #include <pthread.h>
+ #include <stdlib.h>
+Index: agx-ast-addons-1.4.3/CMakeLists.txt
+===================================================================
+--- agx-ast-addons-1.4.3.orig/CMakeLists.txt 2007-12-04 14:10:46.000000000 +0200
++++ agx-ast-addons-1.4.3/CMakeLists.txt 2007-12-04 14:11:27.000000000 +0200
+@@ -14,9 +14,9 @@
+ # Asterisk is required
+ #--------------------------------------------------
+
+-FIND_PATH(ASTERISK_INCLUDE_DIR asterisk.h /usr/include /usr/local/include)
++FIND_PATH(ASTERISK_INCLUDE_DIR asterisk/asterisk.h /usr/include /usr/local/include)
+ IF(NOT ASTERISK_INCLUDE_DIR)
+-MESSAGE(FATAL_ERROR "MISSING HEADER: asterisk.h")
++MESSAGE(FATAL_ERROR "MISSING HEADER: asterisk/asterisk.h")
+ ENDIF(NOT ASTERISK_INCLUDE_DIR)
+ INCLUDE_DIRECTORIES(${ASTERISK_INCLUDE_DIR})
+
+Index: agx-ast-addons-1.4.3/func_devstate.c
+===================================================================
+--- agx-ast-addons-1.4.3.orig/func_devstate.c 2007-12-04 14:13:05.000000000 +0200
++++ agx-ast-addons-1.4.3/func_devstate.c 2007-12-04 14:13:29.000000000 +0200
+@@ -28,7 +28,7 @@
+ * when I couldn't sleep. :)
+ */
+
+-#include "asterisk.h"
++#include <asterisk/asterisk.h>
+
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
Added: agx-ast-addons/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/patches/series?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/patches/series (added)
+++ agx-ast-addons/trunk/debian/patches/series Tue Dec 4 12:39:52 2007
@@ -1,0 +1,1 @@
+asteriskh_ugly.diff
Added: agx-ast-addons/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/agx-ast-addons/trunk/debian/rules?rev=5021&op=file
==============================================================================
--- agx-ast-addons/trunk/debian/rules (added)
+++ agx-ast-addons/trunk/debian/rules Tue Dec 4 12:39:52 2007
@@ -1,0 +1,159 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export DH_COMPART = 4
+
+PACKEAGE:=agx-ast-addons
+
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
+
+FILENAME := $(PACKEAGE)_$(UPVERSION).orig.tar.gz
+FILENAME_BZ := $(PACKEAGE)-$(UPVERSION).tar.bz2
+# FIXME: a direct link to a SF mirror:
+URL := http://heanet.dl.sourceforge.net/sourceforge/agx-ast-addons/$(FILENAME_BZ)
+
+-include /usr/share/quilt/quilt.make
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+configure: debian/stamp-configure
+debian/stamp-configure: debian/stamp-patched
+ dh_testdir
+ cmake "." -DCMAKE_INSTALL_PREFIX=/usr
+ touch $@
+
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: debian/stamp-build-arch
+debian/stamp-build-arch: debian/stamp-configure
+ $(MAKE)
+ touch $@
+
+build-indep: debian/stamp-build-indep
+debian/stamp-build-indep: debian/stamp-configure
+
+ # Add here commands to compile the indep part of the package.
+ #$(MAKE) doc
+ touch $@
+
+clean: clean-unpatched unpatch
+clean-unpatched:
+ dh_testdir
+ dh_testroot
+ rm -f debian/stamp-build-arch debian/stamp-build-indep #CONFIGURE-STAMP#
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) clean
+ # Fixme: find a nicer way:
+ $(RM) -rf CMakeFiles
+ $(RM) -f CMakeCache.txt DartTestfile.txt Makefile \
+ cmake_install.cmake install_manifest.txt
+
+ dh_clean
+
+install: install-indep install-arch
+install-indep:
+# dh_testdir
+# dh_testroot
+# dh_clean -k -i
+# dh_installdirs -i
+#
+# # Add here commands to install the indep part of the package into
+# # debian/<package>-doc.
+# #INSTALLDOC#
+#
+# dh_install -i
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -a
+ dh_installdirs -a
+ #dh_installdirs -s # no idea why it doesn't work
+
+ # Add here commands to install the arch part of the package into
+ # debian/tmp.
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKEAGE)
+ # remove modules we currently have in bristuff:
+ $(RM) -f $(CURDIR)/debian/$(PACKEAGE)/usr/lib/asterisk/modules/app_devstate.so
+ $(RM) -f $(CURDIR)/debian/$(PACKEAGE)/usr/lib/asterisk/modules/app_pickup2.so
+ $(RM) -f $(CURDIR)/debian/$(PACKEAGE)/usr/lib/asterisk/modules/func_devstate.so
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGES
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# # -n: there are no /usr/lib libraries inthis package
+ dh_makeshlibs -n
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+print-version:
+ @@echo "Debian version: $(DEBVERSION)"
+ @@echo "Upstream version: $(UPVERSION)"
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@echo Downloading $(FILENAME) from $(URL) ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME_BZ) $(URL)
+ @@bzcat ../tarballs/$(FILENAME_BZ) | gzip -9 >../tarballs/$(FILENAME)
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch
Propchange: agx-ast-addons/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-voip-commits
mailing list