[Pkg-vsquare-changes] r230 - in vde2/trunk/debian: . network/if-pre-up.d

[Filippo Giunchedi]

Author: filippo
Date: 2009-08-30 20:02:55 +0000 (Sun, 30 Aug 2009)
New Revision: 230

Modified:
   vde2/trunk/debian/changelog
   vde2/trunk/debian/control
   vde2/trunk/debian/libvde-dev.copyright
   vde2/trunk/debian/libvde0.copyright
   vde2/trunk/debian/network/if-pre-up.d/vde2
   vde2/trunk/debian/vde2-cryptcab.copyright
Log:
* Update to S-V 3.8.3, no changes needed
* Point copyright files to GPL-2

Modified: vde2/trunk/debian/changelog
===================================================================
--- vde2/trunk/debian/changelog	2009-08-30 19:30:52 UTC (rev 229)
+++ vde2/trunk/debian/changelog	2009-08-30 20:02:55 UTC (rev 230)
@@ -1,4 +1,4 @@
-vde2 (2.2.3-1) unreleased; urgency=low
+vde2 (2.2.3-1) unstable; urgency=low
 
   [ Luca Bigliardi ]
   * Change Luca Bigliardi's e-mail address.
@@ -7,8 +7,10 @@
   * New upstream version
   * Rename libvdemgmt in libvde and ship mgmt, snmp and hist there
   * Remove transitional vde package
+  * Update to S-V 3.8.3, no changes needed
+  * Point copyright files to GPL-2
 
- -- Filippo Giunchedi <filippo at debian.org>  Sun, 30 Aug 2009 20:25:18 +0100
+ -- Filippo Giunchedi <filippo at debian.org>  Sun, 30 Aug 2009 21:02:19 +0100
 
 vde2 (2.2.2-3) unstable; urgency=low
 

Modified: vde2/trunk/debian/control
===================================================================
--- vde2/trunk/debian/control	2009-08-30 19:30:52 UTC (rev 229)
+++ vde2/trunk/debian/control	2009-08-30 20:02:55 UTC (rev 230)
@@ -8,7 +8,7 @@
 Vcs-Svn: svn://svn.debian.org/pkg-vsquare/vde2/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vsquare/vde2/trunk/
 Homepage: http://vde.sourceforge.net
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 
 Package: vde2
 Section: net

Modified: vde2/trunk/debian/libvde-dev.copyright
===================================================================
--- vde2/trunk/debian/libvde-dev.copyright	2009-08-30 19:30:52 UTC (rev 229)
+++ vde2/trunk/debian/libvde-dev.copyright	2009-08-30 20:02:55 UTC (rev 230)
@@ -21,5 +21,5 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License can be
-found in `/usr/share/common-licenses/GPL'.
+found in `/usr/share/common-licenses/GPL-2'.
 

Modified: vde2/trunk/debian/libvde0.copyright
===================================================================
--- vde2/trunk/debian/libvde0.copyright	2009-08-30 19:30:52 UTC (rev 229)
+++ vde2/trunk/debian/libvde0.copyright	2009-08-30 20:02:55 UTC (rev 230)
@@ -21,5 +21,5 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License can be
-found in `/usr/share/common-licenses/GPL'.
+found in `/usr/share/common-licenses/GPL-2'.
 

Modified: vde2/trunk/debian/network/if-pre-up.d/vde2
===================================================================
--- vde2/trunk/debian/network/if-pre-up.d/vde2	2009-08-30 19:30:52 UTC (rev 229)
+++ vde2/trunk/debian/network/if-pre-up.d/vde2	2009-08-30 20:02:55 UTC (rev 230)
@@ -4,6 +4,7 @@
 VDE_PLUG=/usr/bin/vde_plug
 SLIRPVDE=/usr/bin/slirpvde
 DPIPE=/usr/bin/dpipe
+RUNDIR=/var/run/vde2
 
 USER=vde2-net
 GROUP=vde2-net
@@ -17,20 +18,21 @@
   exit 0
 fi
 
+
 # Create directory if missing
-if [ ! -d /var/run/vde2 ]; then
-    mkdir -p /var/run/vde2
-    chown vde2-net:vde2-net /var/run/vde2
-    chmod 2770 /var/run/vde2
+if [ ! -d $RUNDIR ]; then
+    mkdir -p $RUNDIR
+    chown vde2-net:vde2-net $RUNDIR
+    chmod 2770 $RUNDIR
 fi
 
 # vde2-switch [-|<args>]
 if [ -n "$IF_VDE2_SWITCH" ]; then
     set -- $IF_VDE2_SWITCH
     test "$1" = "-" && shift
-    PIDFILE="/var/run/vde2/$IFACE.pid"
-    CTLDIR="/var/run/vde2/$IFACE.ctl"
-    MGMTFILE="/var/run/vde2/$IFACE.mgmt"
+    PIDFILE="$RUNDIR/$IFACE.pid"
+    CTLDIR="$RUNDIR/$IFACE.ctl"
+    MGMTFILE="$RUNDIR/$IFACE.mgmt"
 
     if [ "$METHOD" = "manual" ]; then
         TAPOPTS=""
@@ -47,8 +49,8 @@
 # vde2-plug <dpipe_cmd2>
 if [ -n "$IF_VDE2_PLUG" ]; then
     set -- $IF_VDE2_PLUG
-    PIDFILE="/var/run/vde2/$IFACE-plug.pid"
-    CTLDIR="/var/run/vde2/$IFACE.ctl"
+    PIDFILE="$RUNDIR/$IFACE-plug.pid"
+    CTLDIR="$RUNDIR/$IFACE.ctl"
 
     start-stop-daemon --start --quiet --pidfile $PIDFILE \
         --make-pidfile --background \
@@ -59,8 +61,8 @@
 if [ -n "$IF_VDE2_SLIRP" ]; then
     set -- $IF_VDE2_SLIRP
     test "$1" = "-" && shift
-    PIDFILE="/var/run/vde2/$IFACE-slirp.pid"
-    CTLDIR="/var/run/vde2/$IFACE.ctl"
+    PIDFILE="$RUNDIR/$IFACE-slirp.pid"
+    CTLDIR="$RUNDIR/$IFACE.ctl"
 
     start-stop-daemon --start --quiet --pidfile $PIDFILE \
         --chuid $USER \

Modified: vde2/trunk/debian/vde2-cryptcab.copyright
===================================================================
--- vde2/trunk/debian/vde2-cryptcab.copyright	2009-08-30 19:30:52 UTC (rev 229)
+++ vde2/trunk/debian/vde2-cryptcab.copyright	2009-08-30 20:02:55 UTC (rev 230)
@@ -24,4 +24,4 @@
    that compiling, linking, and/or using OpenSSL is allowed.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.