Changeset 764 in MondoRescue for trunk/tools/svn2build

Timestamp:

Aug 8, 2006, 12:34:37 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r728:763 $SVN_M/branches/stable

File:

• trunk/tools/svn2build (modified) (4 diffs)

trunk/tools/svn2build

@@ -6 +6 @@
 #
 
+(
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -82 +83 @@
             rm -f $TMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
-            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
+            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
         elif [ "$dtype" = "deb" ]; then
             # To be developped
             #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
             cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
+            m4 $TMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
             $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
             if [ $? -ne 0 ]; then
@@ -135 +137 @@
     # Finally creates the tar files
     echo "Creating $p tar files"
-    tar cfhz ${DEST}/$p-$v-$TAG.tar.gz $dest
-    #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
-    #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
+    tar cfphz ${DEST}/$p-$v.tar.gz $dest
+    tar cfphj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
 done
 
@@ -148 +149 @@
 echo "${VER}-$TAG" > ${TOPDIR}/LAST
 exit 0
+) 2>&1 | tee /tmp/svn2build.log