[Pkg-voip-commits] r2988 - freepbx/trunk/debian

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-01-09 17:14:12 +0100 (Tue, 09 Jan 2007)
New Revision: 2988

Modified:
   freepbx/trunk/debian/control
   freepbx/trunk/debian/freepbx-panel.prerm
   freepbx/trunk/debian/rules
Log:
last sync of this code, next version is v2.2.
Rob Thomas started working on the 2.2 version - we must follow mainstream (it's not acceptable that mainstream has a better version then ours... we must win at the version race...)


Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control	2007-01-09 14:00:16 UTC (rev 2987)
+++ freepbx/trunk/debian/control	2007-01-09 16:14:12 UTC (rev 2988)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Diego Iastrubni <diego.iastrubni at xorcom.com>
-Build-Depends: debhelper (>= 4.0.0), sharutils, sox, dpatch
-Build-Depends-Indep: sharutils
+Build-Depends: debhelper (>= 4.0.0)
+Build-Depends-Indep: sharutils, sox, dpatch
 #Standards-Version: 3.6.1
 Standards-Version: 3.7.2
 

Modified: freepbx/trunk/debian/freepbx-panel.prerm
===================================================================
--- freepbx/trunk/debian/freepbx-panel.prerm	2007-01-09 14:00:16 UTC (rev 2987)
+++ freepbx/trunk/debian/freepbx-panel.prerm	2007-01-09 16:14:12 UTC (rev 2988)
@@ -24,18 +24,12 @@
 
 
 case "$1" in
-	purge)
+	purge|remove)
 		# remove this alternative configuration
 		update-alternatives --remove op-panel /etc/op-panel/freepbx/op_server.cfg
 		# make the op-panel aware of the new configuration
-		invoke-rc.d restart
+		invoke-rc.d op-panel restart || true
 	;;
-	remove)
-		# remove this alternative configuration
-		update-alternatives --remove op-panel /etc/op-panel/freepbx/op_server.cfg
-		# make the op-panel aware of the new configuration
-		invoke-rc.d restart
-	;;
 	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 	;;
 	

Modified: freepbx/trunk/debian/rules
===================================================================
--- freepbx/trunk/debian/rules	2007-01-09 14:00:16 UTC (rev 2987)
+++ freepbx/trunk/debian/rules	2007-01-09 16:14:12 UTC (rev 2988)
@@ -22,10 +22,10 @@
 PACKAGE=freepbx
 
 # this hacks are been done for get-orig-source
-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$$//')
-UPFILENAME:= $(PACKAGE)_$(UPVERSION).orig.tar.gz
-DEBFILENAME:=$(PACKAGE)_$(UPVERSION).dfsg.orig.tar.gz
+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$$//')
+UPFILENAME	:= $(PACKAGE)_$(UPVERSION).orig.tar.gz
+DEBFILENAME	:= $(PACKAGE)_$(UPVERSION).dfsg.orig.tar.gz
 
 #URL:= http://surfnet.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
 #URL:= http://jaist.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
@@ -105,6 +105,7 @@
 	chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-install-mysql.sh       
 	chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-install-sqlite.sh      
 	chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-post-reload            
+	chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-module-status
 	chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-remove-mysql.sh        
 	chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-remove-sqlite.sh       	
 	
@@ -168,9 +169,9 @@
 # repackage the new source
 	cd $(PACKAGE)-$(UPVERSION).tmp ; \
 	mkdir $(PACKAGE)_$(UPVERSION).dfsg;\
-	mv * $(PACKAGE)_$(UPVERSION).dfsg; \
+	mv -f * $(PACKAGE)_$(UPVERSION).dfsg; \
 	tar cfz ../$(DEBFILENAME) *
-	mv $(DEBFILENAME) ../tarballs
+	mv -f $(DEBFILENAME) ../tarballs
 	echo Cleaning up...
 	$(RM) -rf $(PACKAGE)-$(UPVERSION).tmp/