Changeset 219 in MondoRescue for trunk/mondo

Timestamp:

Dec 15, 2005, 2:54:19 AM (18 years ago)

Author:

bcornec

Message:

merge -r176:218 $SVN_M/branches/2.05

Location:

trunk/mondo

Files:

• configure.in (modified) (2 diffs, 1 prop)
• mondo.spec (modified) (1 diff)
• mondo/common/newt-specific.c (modified) (2 diffs)
• mondo/mondoarchive/main.c (modified) (1 diff)
• mondo/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/mondorestore/mondo-restore.c (modified) (2 diffs)

trunk/mondo/configure.in

@@ -7 +7 @@
 dnl $Id$
 dnl
-AC_INIT([Mondo Rescue],[2.05_berlios],[mondo-devel@lists.sourceforge.net])
+define(MONDO_VER,2.05)
+define(MONDO_REV,m4_normalize(esyscmd(echo '$Rev$' | awk '{print r$2}')))
+define(MONDO_TAG,MONDO_VER-MONDO_REV)
+AC_INIT([Mondo Rescue],MONDO_TAG,[mondo-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([mondo/mondoarchive/main.c])
 AM_CONFIG_HEADER(config.h)
@@ -15 +18 @@
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE([mondo], [2.05_berlios])
+AM_INIT_AUTOMAKE([mondo], MONDO_VER)
 AM_MAINTAINER_MODE
 

trunk/mondo/mondo.spec

@@ -45 +45 @@
 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
 %ifarch ia64
-Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
+Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
 %else
-Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
+Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
 %endif
 

trunk/mondo/mondo/common/newt-specific.c

@@ -34 +34 @@
     extern char *g_tmpfs_mountpt;
     extern char *g_mondo_home;
-
-    extern char g_version[];
 
     extern void set_signals(int);
@@ -314 +312 @@
         system
             ("gzip -9c "MONDO_LOGFILE" > /tmp/MA.log.gz 2> /dev/null");
-        if (!strstr(g_version, "cvs") && !strstr(g_version, "svn")) {
-            printf("Please try the latest SVN version ");
-            printf
-                ("to see if that fixes the problem.\nPlease don't bother the mailing list with");
-            printf
-                ("your problem UNTIL you've tried the snapshot.\nThe snapshot contains bugfixes");
-            printf
-                ("which might help you.\nGo to http://mondorescue.berlios.de");
-            printf(" for more information.\n");
-            log_msg(0,
-                    "Please DON'T contact the mailing list. Try the SNAPSHOTS.");
-        } else {
-            printf
+        printf
                 ("If you require technical support, please contact the mailing list.\n");
-            printf("See http://www.mondorescue.org for details.\n");
-            printf
+        printf("See http://www.mondorescue.org for details.\n");
+        printf
                 ("The list's members can help you, if you attach that file to your e-mail.\n");
-        }
         printf("Log file: %s\n", MONDO_LOGFILE);
-        //  printf("VERSION=%s\n", g_version);
         if (does_file_exist("/tmp/MA.log.gz")) {
             printf

trunk/mondo/mondo/mondoarchive/main.c

@@ -21 +21 @@
 #include "../common/libmondo.h"
 #include "mondo-cli-EXT.h"
-
-#ifndef VERSION
-#define VERSION AUX_VER
-#endif
-
-
-char g_version[] = VERSION;
-
 
 // for CVS

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -14 +14 @@
 #include <pthread.h>
 #endif
-
-#ifndef VERSION
-#define VERSION AUX_VER
-#endif
-
 
 //static char cvsid[] = "$Id$";

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -401 +401 @@
 #define g_ISO_restore_mode __mondorestore_g_ISO_restore_mode
 #endif
-
-#ifndef VERSION
-#define VERSION AUX_VER
-#endif
-
-char g_version[] = VERSION;
-
 
 //static char cvsid[] = "$Id$";
@@ -3197 +3190 @@
     char *tmp;
 
-#ifndef VERSION
-#define VERSION "1.7x_cvs"
-#endif
-
     struct mountlist_itself *mountlist;
     struct raidlist_itself *raidlist;