Merged functionality from the release branch

diff --git a/org.glite.security.proxyrenewal/project/version.properties b/org.glite.security.proxyrenewal/project/version.properties
index 80cbe6b..7b09883 100644 (file)
--- a/org.glite.security.proxyrenewal/project/version.properties
+++ b/org.glite.security.proxyrenewal/project/version.properties
@@ -1,2 +1,2 @@
-module.version=1.2.2
+module.version=1.2.3
 module.age=1

diff --git a/org.glite.security.proxyrenewal/src/voms.c b/org.glite.security.proxyrenewal/src/voms.c
index f570fd4..cbeabec 100644 (file)
--- a/org.glite.security.proxyrenewal/src/voms.c
+++ b/org.glite.security.proxyrenewal/src/voms.c
@@ -5,8 +5,7 @@
 #include <openssl/x509.h>
 
 #include "glite/security/voms/voms_apic.h"
-
-#include "newformat.h"
+#include "glite/security/voms/newformat.h"
 
 char * Decode(const char *, int, int *);
 char **listadd(char **, char *, int);