[Pkg-zenoss-commits] r159 - in /packages/zenoss/trunk/debian: get-orig-source.sh rules

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Jun 19 11:22:27 2007
New Revision: 159

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=159
Log:
pass the needed variable to get-orig.sh

Modified:
    packages/zenoss/trunk/debian/get-orig-source.sh
    packages/zenoss/trunk/debian/rules

Modified: packages/zenoss/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/get-orig-source.sh?rev=159&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/get-orig-source.sh (original)
+++ packages/zenoss/trunk/debian/get-orig-source.sh Tue Jun 19 11:22:27 2007
@@ -8,52 +8,52 @@
 
 echo "finding directories"
 if [ -d ../tarballs ]; then
-  packbase="$(CURDIR)/../tarballs"
-  upstream="$(CURDIR)/../upstream"
+  packbase="$CURDIR/../tarballs"
+  upstream="$CURDIR/../upstream"
 else
-  packbase="$(CURDIR)"
-  upstream="$(CURDIR)/upstream"
+  packbase="$CURDIR"
+  upstream="$CURDIR/upstream"
 fi
-mkdir -p $$upstream
-mkdir -p $$packbase
+mkdir -p $upstream
+mkdir -p $packbase
 
 echo "getting revision from svn"
-if [ -z $(REVISION) ]; then
-  revision=`svn info $(ZENOSS_SVN) | grep Revision | sed 's,[^0-9]*,,g'`
+if [ -z $REVISION ]; then
+  revision=`svn info $ZENOSS_SVN | grep Revision | sed 's,[^0-9]*,,g'`
 else
-  revision=$(REVISION)
+  revision=$REVISION
 fi
 
 echo "checking destinations for .orig dir and .orig.tar.gz"
-tarball="zenoss_$(VERSION)$(EXTRAVERSION)+r$$revision.orig.tar.gz"
-if [ -e $$packbase/$$tarball ]; then
-  echo "$$tarball exists in $$packbase"
+tarball="zenoss_${VERSION}${EXTRAVERSION}+r$revision.orig.tar.gz"
+if [ -e $packbase/$tarball ]; then
+  echo "$tarball exists in $packbase"
   echo "please remove it before trying to create a new one"
   exit 1
 fi
-origdirname="zenoss-$(VERSION)$(EXTRAVERSION)+r$$revision.orig"
-packdir="$$packbase/$$origdirname"
-if [ -d $$packdir ]; then
-  echo "$$packdir exists, please remove first"
+origdirname="zenoss-${VERSION}${EXTRAVERSION}+r$revision.orig"
+packdir="$packbase/$origdirname"
+if [ -d $packdir ]; then
+  echo "$packdir exists, please remove first"
   exit 1
 fi
 
 echo "fetching the Zenoss source from svn"
-if [ $(KEEP_UPSTREAM) -gt 0 ]; then
+if [ $KEEP_UPSTREAM -gt 0 ]; then
   echo "   (keeping sources)"
-  if [ -d $$upstream/zenoss/.svn ]; then
-    svn up -r$$revision $$upstream/zenoss >/dev/null
+  if [ -d $upstream/zenoss/.svn ]; then
+    svn up -r$revision $upstream/zenoss >/dev/null
   else
-    mkdir -p $$upstream
-    svn co -r$$revision $(ZENOSS_SVN) $$upstream/zenoss >/dev/null
+    mkdir -p $upstream
+    svn co -r$revision $ZENOSS_SVN $upstream/zenoss >/dev/null
   fi
-  svn export $$upstream/zenoss $$packdir
+  svn export $upstream/zenoss $packdir
 else
   echo "   (not keeping sources)"
-  svn export -r$$revision $(ZENOSS_SVN) $$packdir
+  svn export -r$revision $ZENOSS_SVN $packdir
 fi
 pushd . >/dev/null
-cd $$packdir
+cd $packdir
 
 echo "extracting needed external libs, removing the rest"
 tar xfz inst/externallibs/PDIS-XPath-0.3.tar.gz
@@ -86,11 +86,11 @@
 rm -f Products/ZenEvents/docs/rfc3164.txt
 
 echo "packaging the orig.tar.gz and cleaning up"
-cd $$packdir/..
-tar cf - $$origdirname | gzip --best - > $$tarball
-rm -rf $$origdirname
+cd $packdir/..
+tar cf - $origdirname | gzip --best - > $tarball
+rm -rf $origdirname
 popd >/dev/null
 
-echo "tarball: $$packbase/$$tarball"
+echo "tarball: $packbase/$tarball"
 echo "done."
 

Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=159&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Tue Jun 19 11:22:27 2007
@@ -145,7 +145,13 @@
 # get-orig-source will drop the orig.tar.gz in
 # ../tarballs, if the directory exists
 get-orig-source:
-	debian/get-orig-source.sh
+	CURDIR=$(CURDIR) \
+	EXTRAVERSION=$(EXTRAVERSION) \
+	KEEP_UPSTREAM=$(KEEP_UPSTREAM) \
+	REVISION=$(REVISION) \
+	VERSION=$(VERSION) \
+	ZENOSS_SVN=$(ZENOSS_SVN) \
+		debian/get-orig-source.sh
 
 ##############################################################################