Changeset 656 in MondoRescue

Timestamp:

Jun 9, 2006, 12:45:56 AM (18 years ago)

Author:

bcornec

Message:

Debian build continued

Location:

branches/2.0.8/tools

Files:

• build2qemu (modified) (1 diff)
• distro-env (modified) (1 diff)
• mkchangelog.pl (modified) (5 diffs)

branches/2.0.8/tools/build2qemu

@@ -80 +80 @@
         sleep 300
     fi
-    ssh -p $sp root@localhost "perl -pi -e 's|/home/bruno|/users/bruno|' /etc/passwd /home/bruno/.rpmmacros ; mv /home /users; rpm -e tetex tetex-latex passivetex jadetex texinfo xmltex linuxdoc-tools xmlto docbook-utils-pdf subversion tetex-context tetex-dvips docbook-utils"
     rdate=`date "+%m%d%H%M"`
     ssh -p $sp root@localhost "date $rdate"

branches/2.0.8/tools/distro-env

@@ -124 +124 @@
     fi
     mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
+elif [ _"$dtype" = _"deb" ]; then
+    export TOPBUILDDIR=${BASE}/build
+    mkdir -p ${TOPBUILDDIR}
 elif [ _"$dtype" = _"ebuild" ]; then
     export TOPBUILDDIR=${BASE}/build

branches/2.0.8/tools/mkchangelog.pl

@@ -10 +10 @@
 use strict;
 use Date::Manip;
+use File::Basename;
+use English;
 
 my $log = "";
@@ -16 +18 @@
 my $pkg2;
 my $outfile = $ARGV[2];
-my $TOOLHOME = $ENV{TOOLHOME};
 my $chglog = "";
 my $ndate = "";
+my $n2date = "";
 my $tmp = "";
 my $ver = "";
@@ -30 +32 @@
         (not (defined $pkg)) || ($pkg eq "") || 
         (not (defined $outfile)) || ($outfile eq ""));
+
+my $TOOLHOME;
+$tmp = dirname($PROGRAM_NAME);
+if ($tmp =~ /^\//) {
+    $TOOLHOME = $tmp;
+    }
+else {
+    $TOOLHOME = "$ENV{PWD}/$tmp";
+    }
 
 die "TOOLHOME doesn't exist" if (not (defined $TOOLHOME));
@@ -54 +65 @@
 $tmp = <INPUT>;
 $tmp = <INPUT>;
+if ($dtype eq "announce") {
+    print OUTPUT $tmp;
+}
 $tmp = <INPUT>;
+if ($dtype eq "announce") {
+    print OUTPUT $tmp;
+}
 
 # Handle each block separated by newline
@@ -63 +80 @@
     #print "**$date**\n";
     $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
+    $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
     #print "**$ndate**\n";
     if ($dtype eq "rpm") {
         print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
         print OUTPUT "- Updated to $ver\n";
+        }
+    if ($dtype eq "deb") {
+        print OUTPUT "$pkg ($ver) unstable; urgency=low\n";
+        print OUTPUT "\n";
+        }
 
-        $tmp = <INPUT>; 
-        while ($tmp !~ /^$/) {
-            print OUTPUT $tmp;
-            last if (eof(INPUT));
-            $tmp = <INPUT>;
+    $tmp = <INPUT>; 
+    while ($tmp !~ /^$/) {
+        print OUTPUT "  * $tmp";
+        last if (eof(INPUT));
+        $tmp = <INPUT>;
+    }
+    print OUTPUT "\n";
+
+    if ($dtype eq "deb") {
+        print OUTPUT " -- Bruno Cornec <bruno\@mondorescue.org>  $n2date\n\n";
+        print OUTPUT "\n";
         }
-        print OUTPUT "\n";
-        last if (eof(INPUT));
-    }
+
+    last if (eof(INPUT));
+    last if ($dtype eq "announce");
 }
 close(OUTPUT);