[Pkg-voip-commits] r6415 - in /freepbx-core/trunk: ./ debian/rules

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Wed Nov 12 14:48:45 2008
New Revision: 6415

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6415
Log:
Include the modules-m.n.xml in the generated tarball, and don't leave it lying around.

Modified:
    freepbx-core/trunk/   (props changed)
    freepbx-core/trunk/debian/rules

Propchange: freepbx-core/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk1 (original)
+++ bzr:revision-id:v3-trunk1 Wed Nov 12 14:48:45 2008
@@ -1,3 +1,4 @@
 2 daniel at daniel-watkins.co.uk-20081112122419-zyl0378e811hikua
 3 daniel at daniel-watkins.co.uk-20081112122435-z1axzyvm4pq1svkq
 4 daniel at daniel-watkins.co.uk-20081112141939-beobc3zinuhhz8bk
+5 daniel at daniel-watkins.co.uk-20081112144840-o8x3pwmh9ch9uinx

Propchange: freepbx-core/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Nov 12 14:48:45 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-11-12 14:19:39.150000095 +0000
+timestamp: 2008-11-12 14:48:40.671000004 +0000
 committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
 properties: 
 	branch-nick: freepbx-core

Modified: freepbx-core/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-core/trunk/debian/rules?rev=6415&op=diff
==============================================================================
--- freepbx-core/trunk/debian/rules (original)
+++ freepbx-core/trunk/debian/rules Wed Nov 12 14:48:45 2008
@@ -4,7 +4,8 @@
 UPSTREAM_VERSION = $(shell echo $(VERSION) | cut -d"-" -f1)
 MAJOR_VERSION = $(shell echo $(VERSION) | cut -d"." -f1-2)
 
-XML = "http://mirror.freepbx.org/modules-$(MAJOR_VERSION).xml"
+XML_FILE = modules-$(MAJOR_VERSION).xml
+XML_URL = "http://mirror.freepbx.org/$(XML_FILE)"
 MODULE_STUB = http://mirror.freepbx.org/modules/
 MODULES = dashboard featurecodeadmin fw_ari fw_fop voicemail core framework
 
@@ -12,7 +13,7 @@
 ORIG_TARBALL=freepbx-core_$(UPSTREAM_VERSION)+$(shell date +%Y%m%d).orig.tar.gz
 
 get-orig-source:
-	wget $(XML)
+	wget $(XML_URL)
 	mkdir $(UPSTREAM_DIR)
 	for module in $(MODULES); do \
         location=`./module-location.py modules-2.5.xml $$module`; \
@@ -21,5 +22,6 @@
         tar zxf $$tarball -C $(UPSTREAM_DIR); \
         rm $$tarball; \
     done
+	mv $(XML_FILE) $(UPSTREAM_DIR)
 	tar zcf $(ORIG_TARBALL) $(UPSTREAM_DIR)
 	rm -rf $(UPSTREAM_DIR)