From 41d4988935d167d7708a10814f060f6a841f421f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 13 Feb 2006 02:05:31 +0000 Subject: [PATCH] 2006-02-12 Dan Williams * vpn-daemons/pptp/src/pppd/patchlevel.h * vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c - Rename VERSION -> PPPD_VERSION to avoid conflict with the Makefile-defined VERSION git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1464 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c | 2 +- vpn-daemons/pptp/src/pppd/patchlevel.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dd6e8cdd2..592b8e9e16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-12 Dan Williams + + * vpn-daemons/pptp/src/pppd/patchlevel.h + * vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c + - Rename VERSION -> PPPD_VERSION to avoid conflict with the + Makefile-defined VERSION + 2006-02-09 Dan Williams Patch from: Vinay A R diff --git a/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c b/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c index db6d7776f0..2bd8efc1f4 100644 --- a/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c +++ b/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c @@ -39,7 +39,7 @@ #include "nm-pptp-service.h" #include "nm-utils.h" -char pppd_version[] = VERSION; +char pppd_version[] = PPPD_VERSION; static void pptp_ip_up(void *opaque, int arg); static void pptp_ip_down(void *opaque, int arg); diff --git a/vpn-daemons/pptp/src/pppd/patchlevel.h b/vpn-daemons/pptp/src/pppd/patchlevel.h index f36d37f9cf..d9aaa4a702 100644 --- a/vpn-daemons/pptp/src/pppd/patchlevel.h +++ b/vpn-daemons/pptp/src/pppd/patchlevel.h @@ -1,4 +1,4 @@ /* $Id$ */ -#define VERSION "2.4.3" +#define PPPD_VERSION "2.4.3" #define DATE "13 November 2004"