[Pkg-vsquare-changes] r217 - in vde2/trunk/debian: . patches

[filippo at alioth.debian.org]

Author: filippo
Date: 2008-10-21 21:45:48 +0000 (Tue, 21 Oct 2008)
New Revision: 217

Added:
   vde2/trunk/debian/patches/dont_use_installpath.patch
Modified:
   vde2/trunk/debian/changelog
   vde2/trunk/debian/examples
Log:
* Add debian/patches/dont_use_installpath.patch to ignore INSTALLPATH for
  now (Closes: #502442)
* Install doc/vdecmd in examples

Modified: vde2/trunk/debian/changelog
===================================================================
--- vde2/trunk/debian/changelog	2008-10-19 15:03:30 UTC (rev 216)
+++ vde2/trunk/debian/changelog	2008-10-21 21:45:48 UTC (rev 217)
@@ -1,9 +1,15 @@
 vde2 (2.2.2-3) UNRELEASED; urgency=low
 
+  [ Ludovico Gardenghi ]
   * Fix wrong postinst check for /sbin/MAKEDEV. (Closes: #502708)
 
- -- Ludovico Gardenghi <garden at acheronte.it>  Sun, 19 Oct 2008 17:01:10 +0200
+  [ Filippo Giunchedi ]
+  * Add debian/patches/dont_use_installpath.patch to ignore INSTALLPATH for
+    now (Closes: #502442)
+  * Install doc/vdecmd in examples
 
+ -- Filippo Giunchedi <filippo at debian.org>  Tue, 21 Oct 2008 23:43:24 +0200
+
 vde2 (2.2.2-2) unstable; urgency=low
 
   * Add DM-Upload-Allowed field

Modified: vde2/trunk/debian/examples
===================================================================
--- vde2/trunk/debian/examples	2008-10-19 15:03:30 UTC (rev 216)
+++ vde2/trunk/debian/examples	2008-10-21 21:45:48 UTC (rev 217)
@@ -1,3 +1,4 @@
 src/vde_switch/plugins/pdump.c
 src/vde_switch/plugins/dump.c
 include/vdeplugin.h
+doc/vdecmd

Added: vde2/trunk/debian/patches/dont_use_installpath.patch
===================================================================
--- vde2/trunk/debian/patches/dont_use_installpath.patch	                        (rev 0)
+++ vde2/trunk/debian/patches/dont_use_installpath.patch	2008-10-21 21:45:48 UTC (rev 217)
@@ -0,0 +1,34 @@
+diff --git a/src/lib/libvdemgmt.c b/src/lib/libvdemgmt.c
+index 959f94b..f9173c0 100644
+--- a/src/lib/libvdemgmt.c
++++ b/src/lib/libvdemgmt.c
+@@ -31,10 +31,10 @@
+ #include <libvdemgmt.h>
+ 
+ 
+-#define OPENMACHINE_RC INSTALLPATH"/etc/vde2/libvdemgmt/openmachine.rc"
+-#define CLOSEMACHINE_RC INSTALLPATH"/etc/vde2/libvdemgmt/closemachine.rc"
+-#define SENDCMD_RC INSTALLPATH"/etc/vde2/libvdemgmt/sendcmd.rc"
+-#define ASYNCRECV_RC INSTALLPATH"/etc/vde2/libvdemgmt/asyncrecv.rc"
++#define OPENMACHINE_RC "/etc/vde2/libvdemgmt/openmachine.rc"
++#define CLOSEMACHINE_RC "/etc/vde2/libvdemgmt/closemachine.rc"
++#define SENDCMD_RC "/etc/vde2/libvdemgmt/sendcmd.rc"
++#define ASYNCRECV_RC "/etc/vde2/libvdemgmt/asyncrecv.rc"
+ 
+ #define DEBUGADD "debug/add"
+ #define DEBUGDEL "debug/del"
+diff --git a/src/unixcmd.c b/src/unixcmd.c
+index b91d150..f028c60 100644
+--- a/src/unixcmd.c
++++ b/src/unixcmd.c
+@@ -31,8 +31,8 @@
+ #include <vde.h>
+ #include <vdecommon.h>
+ 
+-#define STD_SOCK_DIR INSTALLPATH"/var/run"
+-#define STD_RC_DIR INSTALLPATH"/etc/vde2"
++#define STD_SOCK_DIR "/var/run"
++#define STD_RC_DIR "/etc/vde2"
+ 
+ void usage(char *progname){
+ 	/* TODO: write it better */