[Pkg-vsquare-changes] r268 - in vde2/trunk/debian: . patches
Ludovico Gardenghi
garden at alioth.debian.org
Mon Jan 16 15:37:38 UTC 2012
Author: garden
Date: 2012-01-16 15:37:37 +0000 (Mon, 16 Jan 2012)
New Revision: 268
Added:
vde2/trunk/debian/README.source
vde2/trunk/debian/libvdeplug2.copyright
vde2/trunk/debian/libvdeplug2.install
vde2/trunk/debian/patches/fix_soname_version_info.patch
vde2/trunk/debian/patches/libvdeplug_dyn_versioned_dlopen.patch
vde2/trunk/debian/patches/printf_add_format_string.patch
vde2/trunk/debian/patches/series
vde2/trunk/debian/source.lintian-overrides
Removed:
vde2/trunk/debian/libvde-dev.dirs
vde2/trunk/debian/libvde0.dirs
vde2/trunk/debian/libvdeplug-dev.dirs
vde2/trunk/debian/libvdeplug3.copyright
vde2/trunk/debian/libvdeplug3.dirs
vde2/trunk/debian/libvdeplug3.install
vde2/trunk/debian/vde2-cryptcab.dirs
vde2/trunk/debian/vde2.dirs
Modified:
vde2/trunk/debian/changelog
vde2/trunk/debian/control
vde2/trunk/debian/libvde-dev.install
vde2/trunk/debian/libvde0.install
vde2/trunk/debian/libvdeplug-dev.install
vde2/trunk/debian/rules
vde2/trunk/debian/vde2-cryptcab.install
vde2/trunk/debian/vde2.install
Log:
Prepare to 2.3.2-1:
* New upstream version
* Remove Piotr Roszatycki <dexter at debian.org> from Uploaders
(Closes: #636745)
* Suggest qemu-kvm instead of dummy transitional package kvm
(Closes: #646627)
* Add major version in dlopen in libvdeplug_dyn.h to avoid binary dependency
on -dev package (for additional explanations see the header file itself)
Patch file: debian/patches/libvdeplug_dyn_versioned_dlopen.patch
(Closes: #536373)
* Add patch for fixing missing format string in fprintf() and syslog()
calls. Patch file: debian/patches/printf_add_format_string.patch
* Add patch for fixing "wrong" SONAME for libraries. -version-number had
been used instead of version-info, this gave incorrect SONAMEs and broke
compatibility between this version and the previous ones (althought there
is no actual ABI incompatibility).i
Patch file: debian/patches/fix_soname_version_info.patch
- reset libvdeplug name to libvdeplug2 (w.r.t 2.3.1-1) (Closes: #610933)
* Update Standards-Version to 3.9.2: nothing to do
* Switch to CDBS and quilt
* Remove useless .dirs files
Added: vde2/trunk/debian/README.source
===================================================================
--- vde2/trunk/debian/README.source (rev 0)
+++ vde2/trunk/debian/README.source 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1,8 @@
+This package uses quilt to manage the Debian-specific patches to the VDE
+source code. See
+
+ /usr/share/doc/quilt/README.source
+
+to get more information about how it works.
+
+ -- Ludovico Gardenghi <garden at debian.org> Mon, 16 Jan 2012 13:52:57 +0100
Modified: vde2/trunk/debian/changelog
===================================================================
--- vde2/trunk/debian/changelog 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/changelog 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,3 +1,28 @@
+vde2 (2.3.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Remove Piotr Roszatycki <dexter at debian.org> from Uploaders
+ (Closes: #636745)
+ * Suggest qemu-kvm instead of dummy transitional package kvm
+ (Closes: #646627)
+ * Add major version in dlopen in libvdeplug_dyn.h to avoid binary dependency
+ on -dev package (for additional explanations see the header file itself)
+ Patch file: debian/patches/libvdeplug_dyn_versioned_dlopen.patch
+ (Closes: #536373)
+ * Add patch for fixing missing format string in fprintf() and syslog()
+ calls. Patch file: debian/patches/printf_add_format_string.patch
+ * Add patch for fixing "wrong" SONAME for libraries. -version-number had
+ been used instead of version-info, this gave incorrect SONAMEs and broke
+ compatibility between this version and the previous ones (althought there
+ is no actual ABI incompatibility).i
+ Patch file: debian/patches/fix_soname_version_info.patch
+ - reset libvdeplug name to libvdeplug2 (w.r.t 2.3.1-1) (Closes: #610933)
+ * Update Standards-Version to 3.9.2: nothing to do
+ * Switch to CDBS and quilt
+ * Remove useless .dirs files
+
+ -- Ludovico Gardenghi <garden at debian.org> Mon, 16 Jan 2012 16:13:30 +0100
+
vde2 (2.3.1-1) experimental; urgency=low
* New upstream version
Modified: vde2/trunk/debian/control
===================================================================
--- vde2/trunk/debian/control 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/control 2012-01-16 15:37:37 UTC (rev 268)
@@ -2,19 +2,19 @@
Section: net
Priority: optional
Maintainer: Debian VSquare Team <pkg-vsquare-devel at lists.alioth.debian.org>
-Uploaders: Ludovico Gardenghi <garden at debian.org>, Guido Trotter <ultrotter at debian.org>, Piotr Roszatycki <dexter at debian.org>, Filippo Giunchedi <filippo at debian.org>, Luca Bigliardi <shammash at artha.org>
+Uploaders: Ludovico Gardenghi <garden at debian.org>, Guido Trotter <ultrotter at debian.org>, Filippo Giunchedi <filippo at debian.org>, Luca Bigliardi <shammash at artha.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6.0.7~), libssl-dev, libpcap-dev
+Build-Depends: debhelper (>= 6.0.7~), libssl-dev, libpcap-dev, cdbs, quilt
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.9.1
+Standards-Version: 3.9.2
Package: vde2
Section: net
Architecture: any
Depends: adduser, ${shlibs:Depends}, ${misc:Depends}
-Suggests: vde2-cryptcab, libpcap0.8, kvm, qemu
+Suggests: vde2-cryptcab, libpcap0.8, qemu-kvm, qemu
Replaces: vde
Description: Virtual Distributed Ethernet
VDE is a virtual switch that can connect multiple virtual machines together,
@@ -63,7 +63,7 @@
Architecture: any
Replaces: libvdeplug2-dev
Conflicts: libvdeplug2-dev
-Depends: libvdeplug3 (= ${binary:Version}), ${misc:Depends}
+Depends: libvdeplug2 (= ${binary:Version}), ${misc:Depends}
Description: Virtual Distributed Ethernet - Plug development files
VDE is a virtual switch that can connect multiple virtual machines together,
both local and remote.
@@ -74,11 +74,9 @@
.
This package contains the development files for libvdeplug.
-Package: libvdeplug3
+Package: libvdeplug2
Section: libs
Architecture: any
-Replaces: libvdeplug2
-Conflicts: libvdeplug2
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Virtual Distributed Ethernet - Plug library
VDE is a virtual switch that can connect multiple virtual machines together,
Deleted: vde2/trunk/debian/libvde-dev.dirs
===================================================================
--- vde2/trunk/debian/libvde-dev.dirs 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvde-dev.dirs 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
Modified: vde2/trunk/debian/libvde-dev.install
===================================================================
--- vde2/trunk/debian/libvde-dev.install 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvde-dev.install 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,15 +1,13 @@
-usr/include/libvdemgmt*
-usr/lib/libvdemgmt*.a
-usr/lib/libvdemgmt*.la
-usr/lib/libvdemgmt*.so
-usr/lib/pkgconfig/vdemgmt.pc
-usr/include/libvdehist*
-usr/lib/libvdehist*.a
-usr/lib/libvdehist*.la
-usr/lib/libvdehist*.so
-usr/lib/pkgconfig/vdehist.pc
-usr/include/libvdesnmp*
-usr/lib/libvdesnmp*.a
-usr/lib/libvdesnmp*.la
-usr/lib/libvdesnmp*.so
-usr/lib/pkgconfig/vdesnmp.pc
+debian/tmp/usr/include/libvdemgmt*
+debian/tmp/usr/lib/libvdemgmt*.a
+debian/tmp/usr/lib/libvdemgmt*.so
+debian/tmp/usr/lib/pkgconfig/vdemgmt.pc
+debian/tmp/usr/include/libvdehist*
+debian/tmp/usr/lib/libvdehist*.a
+debian/tmp/usr/lib/libvdehist*.so
+debian/tmp/usr/lib/pkgconfig/vdehist.pc
+debian/tmp/usr/include/libvdesnmp*
+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.dirs
===================================================================
--- vde2/trunk/debian/libvde0.dirs 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvde0.dirs 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,2 +0,0 @@
-usr/lib
-etc/vde2
Modified: vde2/trunk/debian/libvde0.install
===================================================================
--- vde2/trunk/debian/libvde0.install 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvde0.install 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,4 +1,4 @@
-usr/lib/libvdemgmt*.so.*
-etc/vde2/libvdemgmt/*
-usr/lib/libvdehist*.so.*
-usr/lib/libvdesnmp*.so.*
+debian/tmp/usr/lib/libvdemgmt*.so.*
+debian/tmp/etc/vde2/libvdemgmt/*
+debian/tmp/usr/lib/libvdehist*.so.*
+debian/tmp/usr/lib/libvdesnmp*.so.*
Deleted: vde2/trunk/debian/libvdeplug-dev.dirs
===================================================================
--- vde2/trunk/debian/libvdeplug-dev.dirs 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvdeplug-dev.dirs 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
Modified: vde2/trunk/debian/libvdeplug-dev.install
===================================================================
--- vde2/trunk/debian/libvdeplug-dev.install 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvdeplug-dev.install 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,5 +1,4 @@
-usr/include/libvdeplug*
-usr/lib/libvdeplug*.a
-usr/lib/libvdeplug*.la
-usr/lib/libvdeplug*.so
-usr/lib/pkgconfig/vdeplug.pc
+debian/tmp/usr/include/libvdeplug*
+debian/tmp/usr/lib/libvdeplug*.a
+debian/tmp/usr/lib/libvdeplug*.so
+debian/tmp/usr/lib/pkgconfig/vdeplug.pc
Added: vde2/trunk/debian/libvdeplug2.copyright
===================================================================
--- vde2/trunk/debian/libvdeplug2.copyright (rev 0)
+++ vde2/trunk/debian/libvdeplug2.copyright 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1,26 @@
+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/libvdeplug2.install
===================================================================
--- vde2/trunk/debian/libvdeplug2.install (rev 0)
+++ vde2/trunk/debian/libvdeplug2.install 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libvdeplug*.so.*
Deleted: vde2/trunk/debian/libvdeplug3.copyright
===================================================================
--- vde2/trunk/debian/libvdeplug3.copyright 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvdeplug3.copyright 2012-01-16 15:37:37 UTC (rev 268)
@@ -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'.
-
Deleted: vde2/trunk/debian/libvdeplug3.dirs
===================================================================
--- vde2/trunk/debian/libvdeplug3.dirs 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvdeplug3.dirs 2012-01-16 15:37:37 UTC (rev 268)
@@ -1 +0,0 @@
-usr/lib
Deleted: vde2/trunk/debian/libvdeplug3.install
===================================================================
--- vde2/trunk/debian/libvdeplug3.install 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/libvdeplug3.install 2012-01-16 15:37:37 UTC (rev 268)
@@ -1 +0,0 @@
-usr/lib/libvdeplug*.so.*
Added: vde2/trunk/debian/patches/fix_soname_version_info.patch
===================================================================
--- vde2/trunk/debian/patches/fix_soname_version_info.patch (rev 0)
+++ vde2/trunk/debian/patches/fix_soname_version_info.patch 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1,47 @@
+Index: vde2-2.3.2/src/lib/Makefile.am
+===================================================================
+--- vde2-2.3.2.orig/src/lib/Makefile.am 2011-11-23 17:41:17.000000000 +0100
++++ vde2-2.3.2/src/lib/Makefile.am 2012-01-16 15:49:37.166791413 +0100
+@@ -17,16 +17,16 @@
+ # read before touching http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+
+ libvdemgmt_la_LIBADD = $(LIBADD)
+-libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
++libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:1:0 -export-dynamic
+
+ libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/libvdemgmt.la
+-libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
++libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:1:0 -export-dynamic
+
+ libvdeplug_la_LIBADD = $(LIBADD)
+-libvdeplug_la_LDFLAGS = $(AM_LDFLAGS) -version-number 3:0:1 -export-dynamic
++libvdeplug_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:2:1 -export-dynamic
+
+ libvdehist_la_LIBADD = $(LIBADD)
+-libvdehist_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
++libvdehist_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:1:0 -export-dynamic
+
+ if ENABLE_PYTHON
+ SUBDIRS += . python
+Index: vde2-2.3.2/src/lib/Makefile.in
+===================================================================
+--- vde2-2.3.2.orig/src/lib/Makefile.in 2011-11-23 17:42:07.000000000 +0100
++++ vde2-2.3.2/src/lib/Makefile.in 2012-01-16 15:49:56.479132165 +0100
+@@ -320,13 +320,13 @@
+
+ # read before touching http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+ libvdemgmt_la_LIBADD = $(LIBADD)
+-libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
++libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:1:0 -export-dynamic
+ libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/libvdemgmt.la
+-libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
++libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:1:0 -export-dynamic
+ libvdeplug_la_LIBADD = $(LIBADD)
+-libvdeplug_la_LDFLAGS = $(AM_LDFLAGS) -version-number 3:0:1 -export-dynamic
++libvdeplug_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:1 -export-dynamic
+ libvdehist_la_LIBADD = $(LIBADD)
+-libvdehist_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
++libvdehist_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:1:0 -export-dynamic
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = vdesnmp.pc vdemgmt.pc vdeplug.pc vdehist.pc
+ all: all-recursive
Added: vde2/trunk/debian/patches/libvdeplug_dyn_versioned_dlopen.patch
===================================================================
--- vde2/trunk/debian/patches/libvdeplug_dyn_versioned_dlopen.patch (rev 0)
+++ vde2/trunk/debian/patches/libvdeplug_dyn_versioned_dlopen.patch 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1,39 @@
+Index: vde2-2.3.2/include/libvdeplug_dyn.h
+===================================================================
+--- vde2-2.3.2.orig/include/libvdeplug_dyn.h 2012-01-15 20:53:00.000000000 +0100
++++ vde2-2.3.2/include/libvdeplug_dyn.h 2012-01-15 20:53:11.000000000 +0100
+@@ -57,6 +57,25 @@
+ #include <dlfcn.h>
+ #define LIBVDEPLUG_INTERFACE_VERSION 1
+
++/*
++ * Define the dlopen default filename as the versioned shared object name
++ * instead than the plain ".so" filename. This is needed on Debian as the
++ * unversioned symlink (e.g. "libvdeplug.so") is not included in the binary
++ * package but only in the development one.
++ *
++ * libvdeplug can work flawlessly without specifying the SONAME as the interface
++ * is meant to be always backwards-compatible; however, the Debian policy is
++ * against putting .so symlinks in the binary packages as in general is not safe
++ * to link or dlopen unversioned shared objects.
++ *
++ * If this header file is used to generate binaries meant to be used on other
++ * distributions, it could be safe to redefine LIBVDEPLUG_DLOPEN_FILENAME with
++ * the unversioned name.
++ */
++#ifndef LIBVDEPLUG_DLOPEN_FILENAME
++#define LIBVDEPLUG_DLOPEN_FILENAME "libvdeplug.so.3"
++#endif
++
+ struct vdeconn;
+ typedef struct vdeconn VDECONN;
+
+@@ -113,7 +132,7 @@
+ typedef void (* VDESTREAM_CLOSE_T)(VDESTREAM *vdestream);
+
+ #define libvdeplug_dynopen(x) ({ \
+- (x).dl_handle=dlopen("libvdeplug.so",RTLD_NOW); \
++ (x).dl_handle=dlopen(LIBVDEPLUG_DLOPEN_FILENAME,RTLD_NOW); \
+ if ((x).dl_handle) { \
+ (x).vde_open_real=(VDE_OPEN_REAL_T) dlsym((x).dl_handle,"vde_open_real"); \
+ (x).vde_recv=(VDE_RECV_T) dlsym((x).dl_handle,"vde_recv"); \
Added: vde2/trunk/debian/patches/printf_add_format_string.patch
===================================================================
--- vde2/trunk/debian/patches/printf_add_format_string.patch (rev 0)
+++ vde2/trunk/debian/patches/printf_add_format_string.patch 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1,33 @@
+Index: vde2-2.3.2/src/common/cmdparse.c
+===================================================================
+--- vde2-2.3.2.orig/src/common/cmdparse.c 2012-01-15 21:19:09.000000000 +0100
++++ vde2-2.3.2/src/common/cmdparse.c 2012-01-15 21:20:41.000000000 +0100
+@@ -284,13 +284,13 @@
+ int i;
+ for (i=0;i<argc;i++) {
+ if (i) fprintf(mf," ");
+- fprintf(mf,argv[i]);
++ fprintf(mf, "%s", argv[i]);
+ }
+ } else {
+ int num=atoi(t);
+ while (*t >='0' && *t <= '9') t++;
+ if (num < argc)
+- fprintf(mf,argv[num]);
++ fprintf(mf, "%s", argv[num]);
+ }
+ } else
+ fprintf(mf,"%c",*t);
+Index: vde2-2.3.2/src/vde_switch/plugins/iplog.c
+===================================================================
+--- vde2-2.3.2.orig/src/vde_switch/plugins/iplog.c 2012-01-15 21:20:47.000000000 +0100
++++ vde2-2.3.2/src/vde_switch/plugins/iplog.c 2012-01-15 21:19:09.000000000 +0100
+@@ -214,7 +214,7 @@
+ ctime_r(&ntime,stime);
+ writev(logfilefd,iov,3);
+ } else if (logfilefd != -1)
+- syslog(LOG_INFO, msg);
++ syslog(LOG_INFO, "%s", msg);
+ DBGOUT(D_LOGIP_NEWIP,"%s",msg);
+ }
+ }
Added: vde2/trunk/debian/patches/series
===================================================================
--- vde2/trunk/debian/patches/series (rev 0)
+++ vde2/trunk/debian/patches/series 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1,3 @@
+libvdeplug_dyn_versioned_dlopen.patch
+printf_add_format_string.patch
+fix_soname_version_info.patch
Modified: vde2/trunk/debian/rules
===================================================================
--- vde2/trunk/debian/rules 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/rules 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,141 +1,12 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/buildcore.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-experimental --disable-python
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-# Apply patches to the package
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- @patches=debian/patches/*.patch; for patch in $$patches; do \
- test -f $$patch || continue; \
- echo "Applying $$patch"; \
- patch -stuN -p1 < $$patch || exit 1; \
- done
- touch $@
-
-# Remove patches from the package
-unpatch:
- dh_testdir
- @if test -f patch-stamp; then \
- patches=debian/patches/*.patch; \
- for patch in $$patches; do \
- reversepatches="$$patch $$reversepatches"; \
- done; \
- for patch in $$reversepatches; do \
- test -f $$patch || continue; \
- echo "Reversing $$patch"; \
- patch -suRf -p1 < $$patch || exit 1; \
- done; \
- rm -f patch-stamp; \
- fi
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --libexecdir=\$${prefix}/lib/vde2 \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --enable-experimental \
- CFLAGS="$(CFLAGS)"
-
-
-build: patch build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean || true
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp
- cat $(CURDIR)/debian/vde2-cryptcab.install | while read file; do rm -f $(CURDIR)/debian/vde2/$$file; done
- rm $(CURDIR)/debian/vde2/usr/lib/vde2/plugins/*.la
- rm $(CURDIR)/debian/vde2/usr/lib/vde2/vde_l3/*.la
- rm $(CURDIR)/debian/vde2/usr/lib/vde2/libvdetap.la
- rm $(CURDIR)/debian/libvde-dev/usr/lib/libvdemgmt.la
- rm $(CURDIR)/debian/libvde-dev/usr/lib/libvdehist.la
- rm $(CURDIR)/debian/libvde-dev/usr/lib/libvdesnmp.la
- rm $(CURDIR)/debian/libvdeplug-dev/usr/lib/libvdeplug.la
- rm -f $(CURDIR)/debian/vde2/usr/bin/kvde_switch
- dh_installman
- dh_lintian
- dh_link
- dh_strip
- dh_compress
+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
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps -L libvdeplug3 -l debian/libvdeplug3/usr/bin
- dh_gencontrol
- dh_md5sums
- dh_builddeb -- -D
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Added: vde2/trunk/debian/source.lintian-overrides
===================================================================
--- vde2/trunk/debian/source.lintian-overrides (rev 0)
+++ vde2/trunk/debian/source.lintian-overrides 2012-01-16 15:37:37 UTC (rev 268)
@@ -0,0 +1,3 @@
+# 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.dirs
===================================================================
--- vde2/trunk/debian/vde2-cryptcab.dirs 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/vde2-cryptcab.dirs 2012-01-16 15:37:37 UTC (rev 268)
@@ -1 +0,0 @@
-usr/bin
Modified: vde2/trunk/debian/vde2-cryptcab.install
===================================================================
--- vde2/trunk/debian/vde2-cryptcab.install 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/vde2-cryptcab.install 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,2 +1,2 @@
-usr/bin/*cryptcab*
-usr/share/man/man1/*cryptcab*
+debian/tmp/usr/bin/*cryptcab*
+debian/tmp/usr/share/man/man1/*cryptcab*
Deleted: vde2/trunk/debian/vde2.dirs
===================================================================
--- vde2/trunk/debian/vde2.dirs 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/vde2.dirs 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib
-usr/lib/vde2
Modified: vde2/trunk/debian/vde2.install
===================================================================
--- vde2/trunk/debian/vde2.install 2012-01-15 17:45:49 UTC (rev 267)
+++ vde2/trunk/debian/vde2.install 2012-01-16 15:37:37 UTC (rev 268)
@@ -1,5 +1,40 @@
-usr/bin/*
-usr/sbin/*
-usr/share/man/man*
-usr/lib/vde2/*
-etc/vde2/vdecmd
+debian/tmp/etc/vde2/vdecmd
+debian/tmp/usr/bin/dpipe
+debian/tmp/usr/bin/slirpvde
+debian/tmp/usr/bin/unixcmd
+debian/tmp/usr/bin/unixterm
+debian/tmp/usr/bin/vde_autolink
+debian/tmp/usr/bin/vde_l3
+debian/tmp/usr/bin/vde_over_ns
+debian/tmp/usr/bin/vde_pcapplug
+debian/tmp/usr/bin/vde_plug
+debian/tmp/usr/bin/vde_plug2tap
+debian/tmp/usr/bin/vdeq
+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
+debian/tmp/usr/share/man/man1/unixterm.1
+debian/tmp/usr/share/man/man1/vde_autolink.1
+debian/tmp/usr/share/man/man1/vde_l3.1
+debian/tmp/usr/share/man/man1/vde_over_ns.1
+debian/tmp/usr/share/man/man1/vde_pcapplug.1
+debian/tmp/usr/share/man/man1/vde_plug.1
+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