[Pkg-voip-commits] r6088 - in /asterisk/branches/experimental/debian: changelog patches/bristuff/ patches/series rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Aug 26 10:22:23 2008
New Revision: 6088

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6088
Log:
Hmm... We need an upstream tarball first. Commit current guesswork
(removal of bristuff, basically)

Removed:
    asterisk/branches/experimental/debian/patches/bristuff/
Modified:
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/patches/series
    asterisk/branches/experimental/debian/rules

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=6088&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Tue Aug 26 10:22:23 2008
@@ -1,3 +1,10 @@
+asterisk (1:1.6.0~dfsg~rc1-1) UNRELEASED; urgency=low
+
+  * Working on the experimental branch.
+  * Disabled bristuff.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 26 Aug 2008 12:56:06 +0300
+
 asterisk (1:1.4.21.2~dfsg-2) UNRELEASED; urgency=low
 
   [ Victor Seva ]

Modified: asterisk/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/series?rev=6088&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/series (original)
+++ asterisk/branches/experimental/debian/patches/series Tue Aug 26 10:22:23 2008
@@ -24,60 +24,6 @@
 # for chan_misdn (even though it's not enabled yet)
 misdn_FOP
 
-### bristuff
-bristuff/bristuff-notice
-
-bristuff/configurable-AST_SYSTEM_NAME
-
-# standalone changes/applications
-# - they don't break the API
-# - they don't need other API changes
-bristuff/xagi
-bristuff/misc-app-segfault
-bristuff/misc-app-pickup
-bristuff/misc-app-devstate
-bristuff/misc-res-watchdog
-bristuff/misc-manager-dbdel
-bristuff/misc-res-esel
-
-# small non-API-breaking bug fixes
-bristuff/chan-iax2-hangup-cause
-bristuff/isdn-fixes
-bristuff/app-meetme-avoid-overflows
-bristuff/answer-before-say
-
-# app_dial adding of options 
-bristuff/app-dial-priority-202
-bristuff/app-dial-etc
-bristuff/app-dial-R-noinband
-bristuff/app-dial-c-callback
-
-bristuff/zapata_num_spans
-
-# use /usr/include/bristuffed/libpri.h - /usr/lib/libpri-bristuffed.so.1.0
-use-libpri-bristuffed
-# euroISDN, BRI support
-bristuff/zapata-bri+euroisdn
-
-bristuff/ast-send-message
-
-# don't split these up!
-bristuff/ast_monitor_start-targetscript
-bristuff/ast-device-state-CID
-bristuff/uniqueid-10-channel-ops-uniqueid
-bristuff/uniqueid-20-monitor
-bristuff/uniqueid-30-app-chanspy
-bristuff/uniqueid-40-manager
-
-# these depend on the uniqueid changes; the following are a set
-bristuff/feature-autoanswer
-bristuff/feature-holdedcalls
-
-#bristuff/zapata_euroisdn_holded
-
-# GSM support; it needs the above patch applied first, unfortunately.
-bristuff/zapata-gsm
-
 # bridging app backported from 1.6
 # it needs the above feature patches applied first.
 feature-bridge

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=6088&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Tue Aug 26 10:22:23 2008
@@ -4,6 +4,9 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+PACKAGE:=asterisk
+PACKAGE_SRC:=$(PACKAGE)
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -43,12 +46,12 @@
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-DEB_NOEPOCH_VERSION:=$(shell echo $(DEBVERSION) | cut -d':' -f 2)
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-
-FILENAME := asterisk_$(UPVERSION)~dfsg.orig.tar.gz
-UPFILENAME := asterisk_$(UPVERSION).orig.tar.gz
-URL := http://downloads.digium.com/pub/asterisk/releases/asterisk-$(UPVERSION).tar.gz
+DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
+UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/~dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/')
+
+UPFILENAME := $(PACKAGE_SRC)_$(UPVERSION).orig.tar.gz
+FILENAME := $(PACKAGE_SRC)_$(DEB_BASE_VERSION).orig.tar.gz
+URL := http://downloads.digium.com/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz
 
 # make sure we have 'fetch' . We need to have either wget or fetch
 # on the system. However it is generally not a good idea to actually