[Pkg-vsquare-changes] r283 - in vde2/trunk/debian: . patches
Ludovico Gardenghi
garden at alioth.debian.org
Fri Jan 20 18:25:59 UTC 2012
Author: garden
Date: 2012-01-20 18:25:58 +0000 (Fri, 20 Jan 2012)
New Revision: 283
Added:
vde2/trunk/debian/copyright
vde2/trunk/debian/patches/compile_with_kfreebsd.patch
Removed:
vde2/trunk/debian/libvde-dev.copyright
vde2/trunk/debian/libvde0.copyright
vde2/trunk/debian/libvdeplug-dev.copyright
vde2/trunk/debian/libvdeplug2.copyright
vde2/trunk/debian/source.lintian-overrides
vde2/trunk/debian/vde2-cryptcab.copyright
vde2/trunk/debian/vde2.copyright
Modified:
vde2/trunk/debian/changelog
vde2/trunk/debian/libvde-dev.install
vde2/trunk/debian/patches/series
vde2/trunk/debian/rules
vde2/trunk/debian/vde2.install
Log:
Prepare for 2.3.2-2:
* Add patch debian/patches/compile_with_kfreebsd.patch: allow compilation
with kFreeBSD (as for FreeBSD, this removes almost all TUN/TAP support)
- Move TUN/TAP specific files out of *.install files and install them with
dh_install calls in debain/rules
* Put all the copyright files in a single debian/copyright (as suggested by
Jonathan Nieder <jrnieder at gmail.com>)
- Remove the corresponding lintian override
Modified: vde2/trunk/debian/changelog
===================================================================
--- vde2/trunk/debian/changelog 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/changelog 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,3 +1,15 @@
+vde2 (2.3.2-2) unstable; urgency=low
+
+ * Add patch debian/patches/compile_with_kfreebsd.patch: allow compilation
+ with kFreeBSD (as for FreeBSD, this removes almost all TUN/TAP support)
+ - Move TUN/TAP specific files out of *.install files and install them with
+ dh_install calls in debain/rules
+ * Put all the copyright files in a single debian/copyright (as suggested by
+ Jonathan Nieder <jrnieder at gmail.com>)
+ - Remove the corresponding lintian override
+
+ -- Ludovico Gardenghi <garden at debian.org> Fri, 20 Jan 2012 19:17:30 +0100
+
vde2 (2.3.2-1) unstable; urgency=low
* New upstream version
Added: vde2/trunk/debian/copyright
===================================================================
--- vde2/trunk/debian/copyright (rev 0)
+++ vde2/trunk/debian/copyright 2012-01-20 18:25:58 UTC (rev 283)
@@ -0,0 +1,168 @@
+This package was debianized by Ludovico Gardenghi <garden at acheronte.it> on
+Wed, 14 Jun 2006 14:00:17 +0200.
+
+It was downloaded from http://vde.sourceforge.net/
+
+Copyright (C) 2003-2012 Renzo Davoli <renzo at cs.unibo.it> and others
+
+License for the package unless otherwise specified:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ 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-2'.
+
+
+License for libvdeplug2, libvdeplug-dev:
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation version 2.1 of the License, or (at
+ your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+License for vde2-cryptcab:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ This program is released under the GPL with the additional exemption
+ 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-2'.
+
+
+Licences for doc/bochs/ (VDE driver for Bochs):
+
+ Copyright (C) 2003 Renzo Davoli
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+Licenses for some components in src/slirpvde in addition to GPL-2:
+
+ Copyright (c) 1995,1996 Danny Gasparovski. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgment:
+ This product includes software developed by Danny Gasparovski.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ DANNY GASPAROVSKI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ---
+
+ Copyright (c) 2004 Fabrice Bellard
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+ ---
+
+ Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994
+ The Regents of the University of California. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
Deleted: vde2/trunk/debian/libvde-dev.copyright
===================================================================
--- vde2/trunk/debian/libvde-dev.copyright 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/libvde-dev.copyright 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,25 +0,0 @@
-This package was debianized by Ludovico Gardenghi <garden at acheronte.it> on
-Wed, 12 Sep 2007 00:31:49 +0200.
-
-It was downloaded from http://vde.sourceforge.net/
-
-Copyright (C) 2003-2008 Renzo Davoli <renzo at cs.unibo.it> and others
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 2 of the License.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- 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-2'.
-
Modified: vde2/trunk/debian/libvde-dev.install
===================================================================
--- vde2/trunk/debian/libvde-dev.install 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/libvde-dev.install 2012-01-20 18:25:58 UTC (rev 283)
@@ -10,4 +10,3 @@
debian/tmp/usr/lib/libvdesnmp*.a
debian/tmp/usr/lib/libvdesnmp*.so
debian/tmp/usr/lib/pkgconfig/vdesnmp.pc
-debian/tmp/usr/lib/vde2/libvdetap.a
Deleted: vde2/trunk/debian/libvde0.copyright
===================================================================
--- vde2/trunk/debian/libvde0.copyright 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/libvde0.copyright 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,25 +0,0 @@
-This package was debianized by Ludovico Gardenghi <garden at acheronte.it> on
-Wed, 12 Sep 2007 00:31:49 +0200.
-
-It was downloaded from http://vde.sourceforge.net/
-
-Copyright (C) 2003-2008 Renzo Davoli <renzo at cs.unibo.it> and others
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 2 of the License.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- 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-2'.
-
Deleted: vde2/trunk/debian/libvdeplug-dev.copyright
===================================================================
--- vde2/trunk/debian/libvdeplug-dev.copyright 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/libvdeplug-dev.copyright 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,25 +0,0 @@
-This package was debianized by Ludovico Gardenghi <garden at acheronte.it> on
-Wed, 14 Jun 2006 14:00:17 +0200.
-
-It was downloaded from http://vde.sourceforge.net/
-
-Copyright (C) 2003-2008 Renzo Davoli <renzo at cs.unibo.it> and others
-
-License:
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation version 2.1 of the License, or (at
- your option) any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
Deleted: vde2/trunk/debian/libvdeplug2.copyright
===================================================================
--- vde2/trunk/debian/libvdeplug2.copyright 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/libvdeplug2.copyright 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,26 +0,0 @@
-This package was debianized by Ludovico Gardenghi <garden at acheronte.it> on
-Wed, 14 Jun 2006 14:00:17 +0200.
-
-It was downloaded from http://vde.sourceforge.net/
-
-Copyright (C) 2003-2008 Renzo Davoli <renzo at cs.unibo.it> and others
-
-License:
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation version 2.1 of the License, or (at
- your option) any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
Added: vde2/trunk/debian/patches/compile_with_kfreebsd.patch
===================================================================
--- vde2/trunk/debian/patches/compile_with_kfreebsd.patch (rev 0)
+++ vde2/trunk/debian/patches/compile_with_kfreebsd.patch 2012-01-20 18:25:58 UTC (rev 283)
@@ -0,0 +1,79 @@
+Index: vde2-2.3.2/src/vde_l3/vde_buff.h
+===================================================================
+--- vde2-2.3.2.orig/src/vde_l3/vde_buff.h 2012-01-20 17:00:16.000000000 +0100
++++ vde2-2.3.2/src/vde_l3/vde_buff.h 2012-01-20 17:00:33.000000000 +0100
+@@ -27,6 +27,7 @@
+ #define PROTO_UDP 17
+
+ #if defined(VDE_FREEBSD) || defined(VDE_DARWIN)
++# ifndef VDE_KFREEBSD
+ struct iphdr
+ {
+ #if BYTE_ORDER == LITTLE_ENDIAN
+@@ -47,6 +48,7 @@
+ u_int32_t daddr;
+ /*The options start here. */
+ };
++# endif // VDE_KFREEBSD
+ #endif
+
+ struct
+Index: vde2-2.3.2/configure
+===================================================================
+--- vde2-2.3.2.orig/configure 2012-01-20 17:00:16.000000000 +0100
++++ vde2-2.3.2/configure 2012-01-20 17:00:33.000000000 +0100
+@@ -17050,6 +17050,13 @@
+
+ darwin_gcc=yes
+ ;;
++ kfreebsd*)
++
++$as_echo "#define VDE_FREEBSD 1" >>confdefs.h
++
++$as_echo "#define VDE_KFREEBSD 1" >>confdefs.h
++
++ ;;
+ freebsd*)
+
+ $as_echo "#define VDE_FREEBSD 1" >>confdefs.h
+Index: vde2-2.3.2/include/config.h.in
+===================================================================
+--- vde2-2.3.2.orig/include/config.h.in 2012-01-20 17:00:16.000000000 +0100
++++ vde2-2.3.2/include/config.h.in 2012-01-20 17:00:33.000000000 +0100
+@@ -303,9 +303,12 @@
+ /* If defined, this is a Darwin system */
+ #undef VDE_DARWIN
+
+-/* If defined, this is a FreeBSD system */
++/* If defined, this is a FreeBSD/kFreeBSD system */
+ #undef VDE_FREEBSD
+
++/* If defined, this is a kFreeBSD system */
++#undef VDE_KFREEBSD
++
+ /* If defined, this is a Linux system */
+ #undef VDE_LINUX
+
+Index: vde2-2.3.2/src/vde_pcapplug.c
+===================================================================
+--- vde2-2.3.2.orig/src/vde_pcapplug.c 2012-01-20 17:00:16.000000000 +0100
++++ vde2-2.3.2/src/vde_pcapplug.c 2012-01-20 17:06:24.000000000 +0100
+@@ -23,6 +23,10 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <string.h>
++#include <config.h>
++#ifdef VDE_FREEBSD
++#include <net/bpf.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -35,7 +39,6 @@
+ #include <pcap.h>
+ #include <limits.h>
+
+-#include <config.h>
+ #include <vde.h>
+ #include <vdecommon.h>
+ #include <libvdeplug.h>
Modified: vde2/trunk/debian/patches/series
===================================================================
--- vde2/trunk/debian/patches/series 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/patches/series 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,3 +1,4 @@
libvdeplug_dyn_versioned_dlopen.patch
printf_add_format_string.patch
fix_soname_version_info.patch
+compile_with_kfreebsd.patch
Modified: vde2/trunk/debian/rules
===================================================================
--- vde2/trunk/debian/rules 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/rules 2012-01-20 18:25:58 UTC (rev 283)
@@ -7,6 +7,22 @@
DEB_CONFIGURE_EXTRA_FLAGS = --enable-experimental --disable-python
+# TUN/TAP is almost unsupported on kFreeBSD, so install the corresponding files
+# only on Linux.
+binary-install/vde2::
+ if test "x`uname -s`" = "xLinux"; then \
+ dh_install -pvde2 debian/tmp/usr/sbin/vde_tunctl; \
+ dh_install -pvde2 debian/tmp/usr/lib/vde2/libvdetap.so; \
+ dh_install -pvde2 debian/tmp/usr/lib/vde2/vdetap; \
+ dh_installman -pvde2 debian/tmp/usr/share/man/man8/vde_tunctl.8; \
+ dh_installman -pvde2 debian/tmp/usr/share/man/man1/vdetaplib.1; \
+ fi
+
+binary-install/libvde-dev::
+ if test "x`uname -o`" = "xGNU/Linux"; then \
+ dh_install -plibvde-dev debian/tmp/usr/lib/vde2/libvdetap.a; \
+ fi
+
install/vde2::
install -D -m 0755 debian/network/if-pre-up.d/vde2 debian/vde2/etc/network/if-pre-up.d/vde2
install -D -m 0755 debian/network/if-post-down.d/vde2 debian/vde2/etc/network/if-post-down.d/vde2
Deleted: vde2/trunk/debian/source.lintian-overrides
===================================================================
--- vde2/trunk/debian/source.lintian-overrides 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/source.lintian-overrides 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,3 +0,0 @@
-# There is a copyright file for each package, so the debian/copyright file is
-# not needed.
-vde2 source: no-debian-copyright
Deleted: vde2/trunk/debian/vde2-cryptcab.copyright
===================================================================
--- vde2/trunk/debian/vde2-cryptcab.copyright 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/vde2-cryptcab.copyright 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,27 +0,0 @@
-This package was debianized by Ludovico Gardenghi <garden at acheronte.it> on
-Wed, 14 Jun 2006 14:00:17 +0200.
-
-It was downloaded from http://vde.sourceforge.net/
-
-Copyright (C) 2003-2008 Renzo Davoli <renzo at cs.unibo.it> and others
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 2 of the License.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- This program is released under the GPL with the additional exemption
- 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-2'.
Deleted: vde2/trunk/debian/vde2.copyright
===================================================================
--- vde2/trunk/debian/vde2.copyright 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/vde2.copyright 2012-01-20 18:25:58 UTC (rev 283)
@@ -1,154 +0,0 @@
-This package was debianized by Ludovico Gardenghi <garden at acheronte.it> on
-Wed, 14 Jun 2006 14:00:17 +0200.
-
-It was downloaded from http://vde.sourceforge.net/
-
-Copyright (C) 2003-2008 Renzo Davoli <renzo at cs.unibo.it> and others
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 2 of the License.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- 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'.
-
-Other licenses
---------------
-
-bochs/ (VDE driver for Bochs):
-
- Copyright (C) 2003 Renzo Davoli
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-libvdeplug:
-
- Copyright (C) 2006 Renzo Davoli, University of Bologna
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation version 2.1 of the License, or (at
- your option) any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-slirpvde (different licenses in addition to the GNU GPL):
-
- Copyright (c) 1995,1996 Danny Gasparovski. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgment:
- This product includes software developed by Danny Gasparovski.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- DANNY GASPAROVSKI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ---
-
- Copyright (c) 2004 Fabrice Bellard
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
- ---
-
- Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994
- The Regents of the University of California. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
- 4. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-
-vde_cryptcab (GNU GPL with the following addition):
-
- This program is released under the GPL with the additional exemption
- that compiling, linking, and/or using OpenSSL is allowed.
-
Modified: vde2/trunk/debian/vde2.install
===================================================================
--- vde2/trunk/debian/vde2.install 2012-01-20 11:51:55 UTC (rev 282)
+++ vde2/trunk/debian/vde2.install 2012-01-20 18:25:58 UTC (rev 283)
@@ -13,7 +13,6 @@
debian/tmp/usr/bin/vde_switch
debian/tmp/usr/bin/vdeterm
debian/tmp/usr/bin/wirefilter
-debian/tmp/usr/sbin/vde_tunctl
debian/tmp/usr/share/man/man1/dpipe.1
debian/tmp/usr/share/man/man1/slirpvde.1
debian/tmp/usr/share/man/man1/unixcmd.1
@@ -26,15 +25,11 @@
debian/tmp/usr/share/man/man1/vde_plug2tap.1
debian/tmp/usr/share/man/man1/vdeq.1
debian/tmp/usr/share/man/man1/vde_switch.1
-debian/tmp/usr/share/man/man1/vdetaplib.1
debian/tmp/usr/share/man/man1/vdeterm.1
debian/tmp/usr/share/man/man1/wirefilter.1
-debian/tmp/usr/share/man/man8/vde_tunctl.8
-debian/tmp/usr/lib/vde2/libvdetap.so
debian/tmp/usr/lib/vde2/plugins/dump.so
debian/tmp/usr/lib/vde2/plugins/iplog.so
debian/tmp/usr/lib/vde2/plugins/pdump.so
debian/tmp/usr/lib/vde2/vde_l3/bfifo.so
debian/tmp/usr/lib/vde2/vde_l3/pfifo.so
debian/tmp/usr/lib/vde2/vde_l3/tbf.so
-debian/tmp/usr/lib/vde2/vdetap
More information about the Pkg-vsquare-changes
mailing list