[Pkg-voip-commits] r6427 - in /asterisk-gui/trunk/debian: changelog patches/datadir_path rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Nov 13 19:19:12 2008
New Revision: 6427

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6427
Log:
Update to a released version (finally!)

Modified:
    asterisk-gui/trunk/debian/changelog
    asterisk-gui/trunk/debian/patches/datadir_path
    asterisk-gui/trunk/debian/rules

Modified: asterisk-gui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/changelog?rev=6427&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/changelog (original)
+++ asterisk-gui/trunk/debian/changelog Thu Nov 13 19:19:12 2008
@@ -1,4 +1,4 @@
-asterisk-gui (0.0.svn3778-1) UNRELEASED; urgency=low
+asterisk-gui (2.0.3-1) UNRELEASED; urgency=low
 
   * Initial release from digium SVN (Closes: #496258).
 

Modified: asterisk-gui/trunk/debian/patches/datadir_path
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/datadir_path?rev=6427&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/datadir_path (original)
+++ asterisk-gui/trunk/debian/patches/datadir_path Thu Nov 13 19:19:12 2008
@@ -3,7 +3,7 @@
 
 --- a/config/js/astman.js
 +++ b/config/js/astman.js
-@@ -2531,18 +2531,19 @@ var ASTGUI = {
+@@ -2531,17 +2531,18 @@ var ASTGUI = {
  
  ASTGUI.paths = {};
  
@@ -13,11 +13,11 @@
  ASTGUI.paths['rawman'] = '../../rawman';
  ASTGUI.paths['asteriskConfig'] = '/etc/asterisk/';
  ASTGUI.paths['ConfigBkp'] = '/var/lib/asterisk/gui_backups/';
- ASTGUI.paths['ConfigBkp_AA50'] = '/var/lib/asterisk/sounds/backups/'; // AA50 bkp path on C.F
  ASTGUI.paths['ConfigBkp_dldPath'] = ASTGUI.paths['guiInstall'] + 'private/bkps/'; // path for keeping the bkp files for download
- 
+-ASTGUI.paths['AGIBIN'] = '/var/lib/asterisk/agi-bin/';
 -ASTGUI.paths['Sounds'] = '/var/lib/asterisk/sounds/';
 -ASTGUI.paths['MOH'] = '/var/lib/asterisk/moh/' ; // path for music on hold files
++ASTGUI.paths['AGIBIN'] = ASTGUI.paths['astDataDir'] + '/agi-bin/';
 +ASTGUI.paths['Sounds'] = ASTGUI.paths['astDataDir'] + '/sounds/';
 +ASTGUI.paths['MOH'] = ASTGUI.paths['astDataDir'] + '/moh/' ; // path for music on hold files
  ASTGUI.paths['menusRecord'] = ASTGUI.paths['Sounds'] + 'record/' ;

Modified: asterisk-gui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/rules?rev=6427&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/rules (original)
+++ asterisk-gui/trunk/debian/rules Thu Nov 13 19:19:12 2008
@@ -1,14 +1,14 @@
 #!/usr/bin/make -f
 
-PACKAGE:=asterisk-gui
+PACKAGE:=$(shell sed -nre 's/^Source: (.*)$$/\1/p' debian/control)
 DEBVERSION:=$(shell head -n 1 debian/changelog \
-                    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-SVN_REV:=$(shell echo $(UPVERSION) | sed -e 's/^.*svn//')
-SVN_BRANCH:=branches/2.0
-SVN_URL:=http://svn.digium.com/svn/asterisk-gui/$(SVN_BRANCH)
-DIR_NAME:=$(PACKAGE)-$(UPVERSION)
-TARBALL:=$(PACKAGE)_$(UPVERSION).orig.tar.gz
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
+UPVERSIONMAJOR:=$(shell echo $(UPVERSION) | sed -re 's/(^[0-9]\.[0-9]).*/\1/')
+SHLIBS = $(PACKAGE) (>= $(UPVERSIONMAJOR))
+
+FILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
+URL := http://downloads.digium.com/pub/telephony/$(PACKAGE)/releases/$(PACKAGE)-$(UPVERSION).tar.gz
 
 
 -include /usr/share/cdbs/1/class/autotools.mk
@@ -47,16 +47,10 @@
 print-version:
 	@echo "Debian version:      $(DEBVERSION)"
 	@echo "Upstream version:    $(UPVERSION)"
-	@echo "Subversion revision: $(SVN_REV)"
 
 TARBALL_DIR=../tarballs/$(PACKAGE)-$(UPVERSION).tmp
 get-orig-source:
-	@dh_testdir
-	@[ -d $(TARBALL_DIR) ]||mkdir -p $(TARBALL_DIR)
-	@rm -rf $(TARBALL_DIR)/$(DIR_NAME)
-
-	@echo "Exporting rev. $(SVN_REV) to $(TARBALL_DIR)/$(DIR_NAME)"
-	@svn export -q -r $(SVN_REV) $(SVN_URL) $(TARBALL_DIR)/$(DIR_NAME)
-	@tar czf ../tarballs/$(TARBALL) -C $(TARBALL_DIR) $(DIR_NAME)
-	@echo "Cleaning up..."
-	@rm -rf $(TARBALL_DIR)
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)