From 81232624586fdac1ce149deedba62b5159e40d70 Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Tue, 31 Oct 2017 18:45:39 +0100 Subject: [PATCH] don't create bareos-vmware-vix-disklib package ... from bareos-vmware-vix-disklib-devel, as this will remove will original version information from the package and set it to the version of the bareos-vmware-plugin. --- CMakeLists.txt | 2 +- debian/control | 22 +++++++++++----------- debian/rules | 3 ++- packaging/bareos-vmware.changes | 7 ++++--- packaging/bareos-vmware.dsc | 4 ++-- packaging/bareos-vmware.spec | 32 ++++++++++++++++---------------- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f6946f..30ffc8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ INCLUDE(GNUInstallDirs) add_subdirectory(vadp_dumper) add_subdirectory(vmware_cbt_tool) add_subdirectory(vmware_plugin) -add_subdirectory(vmware-vix-disklib) +#add_subdirectory(vmware-vix-disklib) # set INSTALL_LIB_DIR automatically to lib or lib64 automatically diff --git a/debian/control b/debian/control index 1d325ef..2d3a628 100644 --- a/debian/control +++ b/debian/control @@ -27,15 +27,15 @@ Description: vStorage APIs for Data Protection Dumper program Uses vStorage API to connect to VMWare and dump data like virtual disks snapshots to be used by other programs. -Package: bareos-vmware-vix-disklib -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: VMware vix disklib distributable libraries - The Virtual Disk Development Kit (VDDK) is a collection of C/C++ libraries, - code samples, utilities, and documentation to help you create and access - VMware virtual disk storage. The VDDK is useful in conjunction with the - vSphere API for writing backup and recovery software, or similar applications. - This package only contains the distributable code to comply with - https://communities.vmware.com/viewwebdoc.jspa?documentID=DOC-10141 +#Package: bareos-vmware-vix-disklib +#Architecture: any +#Section: libs +#Depends: ${shlibs:Depends}, ${misc:Depends} +#Description: VMware vix disklib distributable libraries +# The Virtual Disk Development Kit (VDDK) is a collection of C/C++ libraries, +# code samples, utilities, and documentation to help you create and access +# VMware virtual disk storage. The VDDK is useful in conjunction with the +# vSphere API for writing backup and recovery software, or similar applications. +# This package only contains the distributable code to comply with +# https://communities.vmware.com/viewwebdoc.jspa?documentID=DOC-10141 diff --git a/debian/rules b/debian/rules index 4a758f7..eedba25 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,8 @@ #export DH_VERBOSE=1 override_dh_shlibdeps: - dh_shlibdeps --exclude=vmware-vix-disklib -l/usr/lib/vmware-vix-disklib/lib64/ + #dh_shlibdeps --exclude=vmware-vix-disklib -l/usr/lib/vmware-vix-disklib/lib64/ + dh_shlibdeps -l/usr/lib/vmware-vix-disklib/lib64/ %: dh $@ diff --git a/packaging/bareos-vmware.changes b/packaging/bareos-vmware.changes index d558a49..c6d2b2d 100644 --- a/packaging/bareos-vmware.changes +++ b/packaging/bareos-vmware.changes @@ -1,5 +1,6 @@ -bareos-vmware (14.4.0-1) unstable; urgency=low +bareos-vmware (0-0) unstable; urgency=low - * Initial release (Closes: #nnnn) + * generated from https://github.com/bareos/bareos-vmware.git + + -- Bareos Team Mon, 31 Oct 2017 00:00:00 +0200 - -- root Wed, 15 Apr 2015 13:25:31 +0200 diff --git a/packaging/bareos-vmware.dsc b/packaging/bareos-vmware.dsc index 1f22547..265daa4 100644 --- a/packaging/bareos-vmware.dsc +++ b/packaging/bareos-vmware.dsc @@ -1,9 +1,9 @@ Format: 1.0 Source: bareos-vmware -Binary: bareos-vmware-plugin, bareos-vadp-dumper, bareos-vmware-vix-disklib +Binary: bareos-vmware-plugin, bareos-vadp-dumper Architecture: any Version: 0.0.0 -Maintainer: packager@bareos.com +Maintainer: Bareos Team Homepage: http://www.bareos.org/ Standards-Version: 3.9.3 Build-Depends: cmake (>= 3.0.0), debhelper (>= 8.0.0), libjansson-dev, bareos-vmware-vix-disklib-dev diff --git a/packaging/bareos-vmware.spec b/packaging/bareos-vmware.spec index 2c235a9..6165379 100644 --- a/packaging/bareos-vmware.spec +++ b/packaging/bareos-vmware.spec @@ -49,19 +49,19 @@ full and incremental backup so snapshots. Restore of a snapshot is currently supported to the origin VM. -%package -n bareos-vmware-vix-disklib -Summary: VMware vix disklib distributable libraries -Group: Productivity/Archiving/Backup -Url: https://www.vmware.com/support/developer/vddk/ -License: VMware -AutoReqProv: no -%description -n bareos-vmware-vix-disklib -The Virtual Disk Development Kit (VDDK) is a collection of C/C++ libraries, -code samples, utilities, and documentation to help you create and access -VMware virtual disk storage. The VDDK is useful in conjunction with the -vSphere API for writing backup and recovery software, or similar applications. -This package only contains the distributable code to comply with -https://communities.vmware.com/viewwebdoc.jspa?documentID=DOC-10141 +#%%package -n bareos-vmware-vix-disklib +#Summary: VMware vix disklib distributable libraries +#Group: Productivity/Archiving/Backup +#Url: https://www.vmware.com/support/developer/vddk/ +#License: VMware +#AutoReqProv: no +#%%description -n bareos-vmware-vix-disklib +#The Virtual Disk Development Kit (VDDK) is a collection of C/C++ libraries, +#code samples, utilities, and documentation to help you create and access +#VMware virtual disk storage. The VDDK is useful in conjunction with the +#vSphere API for writing backup and recovery software, or similar applications. +#This package only contains the distributable code to comply with +#https://communities.vmware.com/viewwebdoc.jspa?documentID=DOC-10141 @@ -109,13 +109,13 @@ make %files -n bareos-vmware-plugin %defattr(-,root,root) -%{_libdir}/bareos/ +#%%{_libdir}/bareos/ %{plugin_dir}/ %{_sbindir}/vmware_cbt_tool.py %doc AUTHORS LICENSE README.md -%files -n bareos-vmware-vix-disklib -/usr/lib/vmware-vix-disklib/lib64 +#%%files -n bareos-vmware-vix-disklib +#/usr/lib/vmware-vix-disklib/lib64