[23123] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r22786 - trunk/debathena/scripts

daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Mon Mar 10 10:22:22 2008

Date: Mon, 10 Mar 2008 10:19:48 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200803101419.KAA28905@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: ghudson
Date: 2008-03-10 10:19:47 -0400 (Mon, 10 Mar 2008)
New Revision: 22786

Added:
   trunk/debathena/scripts/daorig
Modified:
   trunk/debathena/scripts/dasource
Log:
Factor out the creation of the orig tarball into a separate script.

* debathena/scripts/daorig: New script to create orig tarball.
* debathena/scripts/dasource: Use daorig.


Added: trunk/debathena/scripts/daorig


Property changes on: trunk/debathena/scripts/daorig
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/debathena/scripts/dasource
===================================================================
--- trunk/debathena/scripts/dasource	2008-03-07 16:33:16 UTC (rev 22785)
+++ trunk/debathena/scripts/dasource	2008-03-10 14:19:47 UTC (rev 22786)
@@ -82,21 +82,8 @@
     ;;
   esac
 
-  # If the version has a debian component then we need an orig archive.
-  if [ $sver != $upver ]; then
-    tarfile=${pkgname}_$upver.orig.tar.gz
-    if [ ! -e $pkgname/$tarfile ]; then
-      aptorig=$(find ${DEBATHENA_APT}*/pool -name $tarfile | head -1)
-      if [ -n "$aptorig" ]; then
-        echo "Copying existing $aptorig to original source"
-        cp $aptorig $pkgname/$tarfile
-      else
-        echo "Creating original source archive"
-        (cd $pkgname && tar --exclude=.svn --exclude=debian $correctname -czf \
-         $tarfile ${pkgname}-$upver)
-      fi
-    fi
-  fi
+  # Create a suitable orig tarball if necessary.
+  (cd $dir && daorig)
 
   # Build an unsigned package, ignoring version control subdirs in the source.
   echo "Creating source package"


home help back first fref pref prev next nref lref last post