Changeset 219 for trunk/mondo


Ignore:
Timestamp:
Dec 15, 2005, 2:54:19 AM (13 years ago)
Author:
bcornec
Message:

merge -r176:218 $SVN_M/branches/2.05

Location:
trunk/mondo
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/configure.in

    • Property svn:keywords changed from Id to Id Rev
    r183 r219  
    77dnl $Id$
    88dnl
    9 AC_INIT([Mondo Rescue],[2.05_berlios],[mondo-devel@lists.sourceforge.net])
     9define(MONDO_VER,2.05)
     10define(MONDO_REV,m4_normalize(esyscmd(echo '$Rev$' | awk '{print r$2}')))
     11define(MONDO_TAG,MONDO_VER-MONDO_REV)
     12AC_INIT([Mondo Rescue],MONDO_TAG,[mondo-devel@lists.sourceforge.net])
    1013AC_CONFIG_SRCDIR([mondo/mondoarchive/main.c])
    1114AM_CONFIG_HEADER(config.h)
     
    1518AC_ARG_PROGRAM
    1619
    17 AM_INIT_AUTOMAKE([mondo], [2.05_berlios])
     20AM_INIT_AUTOMAKE([mondo], MONDO_VER)
    1821AM_MAINTAINER_MODE
    1922
  • trunk/mondo/mondo.spec

    r198 r219  
    4545BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
    4646%ifarch ia64
    47 Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
     47Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
    4848%else
    49 Requires:   mindi >= 1.04_berlios, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
     49Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
    5050%endif
    5151
  • trunk/mondo/mondo/common/newt-specific.c

    r171 r219  
    3434    extern char *g_tmpfs_mountpt;
    3535    extern char *g_mondo_home;
    36 
    37     extern char g_version[];
    3836
    3937    extern void set_signals(int);
     
    314312        system
    315313            ("gzip -9c "MONDO_LOGFILE" > /tmp/MA.log.gz 2> /dev/null");
    316         if (!strstr(g_version, "cvs") && !strstr(g_version, "svn")) {
    317             printf("Please try the latest SVN version ");
    318             printf
    319                 ("to see if that fixes the problem.\nPlease don't bother the mailing list with");
    320             printf
    321                 ("your problem UNTIL you've tried the snapshot.\nThe snapshot contains bugfixes");
    322             printf
    323                 ("which might help you.\nGo to http://mondorescue.berlios.de");
    324             printf(" for more information.\n");
    325             log_msg(0,
    326                     "Please DON'T contact the mailing list. Try the SNAPSHOTS.");
    327         } else {
    328             printf
     314        printf
    329315                ("If you require technical support, please contact the mailing list.\n");
    330             printf("See http://www.mondorescue.org for details.\n");
    331             printf
     316        printf("See http://www.mondorescue.org for details.\n");
     317        printf
    332318                ("The list's members can help you, if you attach that file to your e-mail.\n");
    333         }
    334319        printf("Log file: %s\n", MONDO_LOGFILE);
    335         //  printf("VERSION=%s\n", g_version);
    336320        if (does_file_exist("/tmp/MA.log.gz")) {
    337321            printf
  • trunk/mondo/mondo/mondoarchive/main.c

    r197 r219  
    2121#include "../common/libmondo.h"
    2222#include "mondo-cli-EXT.h"
    23 
    24 #ifndef VERSION
    25 #define VERSION AUX_VER
    26 #endif
    27 
    28 
    29 char g_version[] = VERSION;
    30 
    3123
    3224// for CVS
  • trunk/mondo/mondo/mondoarchive/mondo-cli.c

    r171 r219  
    1414#include <pthread.h>
    1515#endif
    16 
    17 #ifndef VERSION
    18 #define VERSION AUX_VER
    19 #endif
    20 
    2116
    2217//static char cvsid[] = "$Id$";
  • trunk/mondo/mondo/mondorestore/mondo-restore.c

    r181 r219  
    401401#define g_ISO_restore_mode __mondorestore_g_ISO_restore_mode
    402402#endif
    403 
    404 #ifndef VERSION
    405 #define VERSION AUX_VER
    406 #endif
    407 
    408 char g_version[] = VERSION;
    409 
    410403
    411404//static char cvsid[] = "$Id$";
     
    31973190    char *tmp;
    31983191
    3199 #ifndef VERSION
    3200 #define VERSION "1.7x_cvs"
    3201 #endif
    3202 
    32033192    struct mountlist_itself *mountlist;
    32043193    struct raidlist_itself *raidlist;
Note: See TracChangeset for help on using the changeset viewer.