[Pkg-voip-commits] r2993 - in freepbx/trunk/debian: . contrib
contrib/template/debian patches
Diego Iastrubni
elcuco-guest at alioth.debian.org
Wed Jan 10 17:27:08 CET 2007
Author: elcuco-guest
Date: 2007-01-10 17:27:08 +0100 (Wed, 10 Jan 2007)
New Revision: 2993
Removed:
freepbx/trunk/debian/freepbx-vmail.install
Modified:
freepbx/trunk/debian/changelog
freepbx/trunk/debian/contrib/fpx-modules
freepbx/trunk/debian/contrib/template/debian/changelog
freepbx/trunk/debian/contrib/template/debian/control
freepbx/trunk/debian/contrib/template/debian/dirs
freepbx/trunk/debian/contrib/template/debian/install
freepbx/trunk/debian/contrib/template/debian/rules
freepbx/trunk/debian/patches/00list
freepbx/trunk/debian/rules
Log:
uploaded 2.2.0
some changes:
new ugly version scheme. stupid debian rules... i liked how it was on sarge...
the fpx-modules script is now usable, and i am using it to build the packages (around 40 now)
the package (and the freepbx-modules) can be build, however i am still not sure of the quality of those packages. i will explain on the ML "soon" how to use the script module.
the script for changing the freepbx module status is unusable, and upstream provides a usable one now. i will have to see what else i messed up, with hope to fix it soon.
todo: what what X-Rob did on the freepbx svn and merge those changes into this repository.
Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/changelog 2007-01-10 16:27:08 UTC (rev 2993)
@@ -1,3 +1,10 @@
+freepbx (2.2.0~dfsg-1.1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Lets use the new ugly debian scheme for versions
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Wed, 10 Jan 2007 18:00:00 +0200
+
freepbx (2.1.3.dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
Modified: freepbx/trunk/debian/contrib/fpx-modules
===================================================================
--- freepbx/trunk/debian/contrib/fpx-modules 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/contrib/fpx-modules 2007-01-10 16:27:08 UTC (rev 2993)
@@ -52,19 +52,21 @@
#######################################################################################
-# script defaultm, generally no need to modify those
+# script default, generally no need to modify those
#######################################################################################
define("AMP_CONF", "/etc/amportal.conf");
define("PHP_ASMANAGER", "/var/lib/asterisk/bin/php-asmanager.php");
define("MONITOR_DIR", "/var/spool/asterisk/monitor");
+define("MYDIR", dirname(__FILE__));
+$xml_server = "http://mirror.freepbx.org/";
+$modules_server = "http://mirror.freepbx.org/modules/";
$dryrun = false;
$debug = false;
$verbose = false;
-
function showHelp()
{
print( "Module updater needs a parameter:
@@ -73,7 +75,7 @@
- clean: remove all the local modules
- build: build all the local modules
-You can also use the --debug (-d) and --verbose (-d) switches to get more information.
+You can also use the --debug (-d) and --verbose (-v) switches to get more information.
For more details, look at the code.
\n");
}
@@ -111,7 +113,7 @@
function getversion()
{
- return "2.1";
+ return "2.2";
}
// borrowed from freepbx
@@ -222,8 +224,10 @@
// borrowed from freepbx
function get_online_modules()
{
+ global $xml_server;
+
$version = getversion();
- $url = "http://amportal.sourceforge.net/modules-".$version.".xml";
+ $url = $xml_server . "/modules-$version.xml";
debug( "Downloding $url" );
$data = file_get_contents($url);
@@ -279,6 +283,9 @@
// some parts borrowed...
function download_modules( $online_modules, $local_modules )
{
+ global $xml_server;
+ global $modules_server;
+
foreach( $online_modules as $on_module )
{
$status = "?";
@@ -303,15 +310,16 @@
unlink($filename);
}
- $url = "https://svn.sourceforge.net/svnroot/amportal/modules/".$on_module['location'];
+ $url = "$modules_server/" . $on_module['location'];
print( "Upgrading module \"" . $on_module["displayName"] . "\"\n" );
debug( "Downloading from $url" );
debug( $on_module["rawname"] );
- $name = $on_module["displayName"];
+ $name = $on_module["displayName"];
$rawname = $on_module["rawname"];
$version = $on_module["version"];
$date = chop( `date -R` );
+ $info = $on_module["info"];
// download the module
$fp = @fopen($filename,"w");
@@ -334,7 +342,7 @@
if ($working_in_svn)
exec_cmd("svn export template/ modules/$rawname/ --force --quiet");
else {
- exec_cmd("cp -a template/ modules/$rawname");
+ exec_cmd("cp -a " . MYDIR . "/template/ modules/$rawname");
exec_cmd("mv modules/$rawname/template/* modules/$rawname/");
exec_cmd("rm -fr modules/$rawname/template/");
}
@@ -350,11 +358,12 @@
exec_cmd( "sed -r -i 's/@@VERSION@@/$version/g' modules/$rawname/debian/*" );
exec_cmd( "sed -r -i 's/@@NAME@@/$name/g' modules/$rawname/debian/*" );
exec_cmd( "sed -r -i 's|@@DATE@@|$date|g' modules/$rawname/debian/*" );
+ exec_cmd( "sed -r -i 's|@@INFO@@|$date|g' modules/$rawname/debian/*" );
}
// now we have the most updated modules, download the module list as well
$version = getversion();
- $url = "http://amportal.sourceforge.net/modules-".$version.".xml";
+ $url = "$xml_server/modules-".$version.".xml";
$filename = "modules-".$version.".xml";
debug( "Downloding $url" );
@@ -378,7 +387,7 @@
debug( "cd modules/" . $module["rawname"] );
chdir( "modules/" . $module["rawname"] );
- if (exec_cmd( "debuild -uc -us -rfakeroot &> build.log" ) == 0){
+ if (exec_cmd( "echo y | debuild -uc -us -rfakeroot &> build.log" ) == 0){
print( " ok.\n" );
}
else{
@@ -411,7 +420,6 @@
$shortopts = "hdv";
$longopts = array( "help","debug" );
-
$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
if (is_object($args)) {
// assume it's PEAR_ERROR
Modified: freepbx/trunk/debian/contrib/template/debian/changelog
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/changelog 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/contrib/template/debian/changelog 2007-01-10 16:27:08 UTC (rev 2993)
@@ -1,3 +1,5 @@
-freepbx-module-@@RAWNAME@@ (2.1-@@VERSION@@-1) unstable; urgency=low
+freepbx-module-@@RAWNAME@@ (2.2-@@VERSION@@-1) unstable; urgency=low
+
* First release.
+
-- Diego Iastrubni <diego.iastrubni at xorcom.com> @@DATE@@
Modified: freepbx/trunk/debian/contrib/template/debian/control
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/control 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/contrib/template/debian/control 2007-01-10 16:27:08 UTC (rev 2993)
@@ -10,4 +10,5 @@
Architecture: all
Depends: freepbx-admin
Description: FreePBX module: @@NAME@@
- This is a freepbx-module, see information on @@INFO@@
+ This is a freepbx-module, see information on
+ @@INFO@@
Modified: freepbx/trunk/debian/contrib/template/debian/dirs
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/dirs 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/contrib/template/debian/dirs 2007-01-10 16:27:08 UTC (rev 2993)
@@ -1,2 +1,2 @@
usr/share/freepbx-common/
-usr/share/freepbx/admin/modules/
+usr/share/freepbx/modules/
Modified: freepbx/trunk/debian/contrib/template/debian/install
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/install 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/contrib/template/debian/install 2007-01-10 16:27:08 UTC (rev 2993)
@@ -1,6 +1,5 @@
-*.php usr/share/freepbx/admin/modules/@@RAWNAME@@/
-*.sql usr/share/freepbx/admin/modules/@@RAWNAME@@/
-*.sqlite usr/share/freepbx/admin/modules/@@RAWNAME@@/
-*.html usr/share/freepbx/admin/modules/@@RAWNAME@@/
-*.xml usr/share/freepbx/admin/modules/@@RAWNAME@@/
-
+*.php usr/share/freepbx/modules/@@RAWNAME@@/
+*.sql usr/share/freepbx/modules/@@RAWNAME@@/
+*.sqlite usr/share/freepbx/modules/@@RAWNAME@@/
+*.html usr/share/freepbx/modules/@@RAWNAME@@/
+*.xml usr/share/freepbx/modules/@@RAWNAME@@/
Modified: freepbx/trunk/debian/contrib/template/debian/rules
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/rules 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/contrib/template/debian/rules 2007-01-10 16:27:08 UTC (rev 2993)
@@ -9,6 +9,11 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
+MODULE_NAME=$(shell basename $(PWD))
+DESTDIR=/tmp/debuild-svn/$(MODULE_NAME)
+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$$//')
+FILENAME=$(MODULE_NAME)_$(UPVERSION).tgz
CFLAGS = -Wall -g
@@ -66,6 +71,14 @@
dh_md5sums
dh_builddeb
+# a hack, not really a solution
+get-orig-source:
+ rm -fr $(DESTDIR)
+ mkdir -p $(DESTDIR)
+ svn export . $(DESTDIR) --force
+ tar -czf $(FILENAME) -C $(DESTDIR) .
+ rm -fr $(DESTDIR)
+ mv $(FILENAME) ../tarballs
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
-
\ No newline at end of file
Deleted: freepbx/trunk/debian/freepbx-vmail.install
===================================================================
--- freepbx/trunk/debian/freepbx-vmail.install 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/freepbx-vmail.install 2007-01-10 16:27:08 UTC (rev 2993)
@@ -1,3 +0,0 @@
-amp_conf/cgi-bin/vmail.cgi usr/lib/cgi-bin/
-amp_conf/htdocs/_asterisk/* usr/share/freepbx/_asterisk/
-
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/patches/00list 2007-01-10 16:27:08 UTC (rev 2993)
@@ -1,17 +1,17 @@
# fix various things which freepbx just does wrong
-ast-config-dirs
-clean-install-amp
-disable-online-updates
-fix-retrieve-op-panel-cfg
-fix-fop-config.dpatch
-fix-version-2.1.3
-fix-open-or-die
-fix-recordings
-fix-toplinks
-fix-index-php
-fix-wierd-email
+#ast-config-dirs
+#clean-install-amp
+#disable-online-updates
+#fix-retrieve-op-panel-cfg
+#fix-fop-config.dpatch
+#fix-version-2.1.3
+#fix-open-or-die
+#fix-recordings
+#fix-toplinks
+#fix-index-php
+#fix-wierd-email
# backports from the trunk, nice features, fixes... why not having them as well...?
-check-ast-runnning
-alternative-css
-log-retrieve
+#check-ast-runnning
+#alternative-css
+#log-retrieve
Modified: freepbx/trunk/debian/rules
===================================================================
--- freepbx/trunk/debian/rules 2007-01-10 14:28:58 UTC (rev 2992)
+++ freepbx/trunk/debian/rules 2007-01-10 16:27:08 UTC (rev 2993)
@@ -25,18 +25,20 @@
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
+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
-#URL:= http://switch.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
-#URL:= http://kent.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
-#URL:= http://belnet.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
-#URL:= http://ovh.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
+#SITE:= http://surfnet.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://jaist.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://switch.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://kent.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://belnet.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://ovh.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://ufpr.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://puzzle.dl.sourceforge.net/sourceforge/amportal
+#SITE:= http://superb-east.dl.sourceforge.net/sourceforge/amportal
-#URL:= http://ufpr.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
-#URL:= http://puzzle.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
-URL:= http://superb-east.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
+SITE:= http://mirror.freepbx.org
+URL:= $(SITE)/$(PACKAGE)-$(UPVERSION).tar.gz
configure: configure-stamp
configure-stamp:
@@ -150,7 +152,7 @@
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@echo Downloading $(UPFILENAME) from $(URL) ...
- @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+ wget -N -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
tar xfz ../tarballs/$(UPFILENAME)
mv $(PACKAGE)-$(UPVERSION) $(PACKAGE)-$(UPVERSION).tmp
More information about the Pkg-voip-commits
mailing list