From a511d0ae811801ac149de3a3e6592ee091c58a6d Mon Sep 17 00:00:00 2001 From: Jon Ludlam Date: Sun, 24 Jul 2011 00:04:19 +0100 Subject: [PATCH] Use Thomas Goirand's packaging files rather than mine --- README.Debian | 6 ---- README.source | 9 ------ blktap-doc.docs | 1 - blktap-doc.install | 1 - blktap.install | 3 -- changelog | 6 ++-- control | 45 +++++++++++++++++--------- copyright | 37 +--------------------- docs | 1 - rules | 78 ++++++++++++++++++++++++++++++++++------------ source/format | 2 +- 11 files changed, 93 insertions(+), 96 deletions(-) delete mode 100644 README.Debian delete mode 100644 README.source delete mode 100644 blktap-doc.docs delete mode 100644 blktap-doc.install delete mode 100644 blktap.install delete mode 100644 docs diff --git a/README.Debian b/README.Debian deleted file mode 100644 index ef5f7c0..0000000 --- a/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -blktap for Debian ------------------ - - - - -- Jon Ludlam Thu, 07 Jul 2011 00:41:03 +0100 diff --git a/README.source b/README.source deleted file mode 100644 index e477c50..0000000 --- a/README.source +++ /dev/null @@ -1,9 +0,0 @@ -blktap for Debian ------------------ - - - - - - diff --git a/blktap-doc.docs b/blktap-doc.docs deleted file mode 100644 index d4f4542..0000000 --- a/blktap-doc.docs +++ /dev/null @@ -1 +0,0 @@ -#DOCS# diff --git a/blktap-doc.install b/blktap-doc.install deleted file mode 100644 index d4f4542..0000000 --- a/blktap-doc.install +++ /dev/null @@ -1 +0,0 @@ -#DOCS# diff --git a/blktap.install b/blktap.install deleted file mode 100644 index 03369f0..0000000 --- a/blktap.install +++ /dev/null @@ -1,3 +0,0 @@ -/etc -/usr -/lib diff --git a/changelog b/changelog index 171d5aa..512c122 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,5 @@ -blktap (0.1-1) unstable; urgency=low +blktap (1.0.0-1) unstable; urgency=low - * Initial release (Closes: #nnnn) + * Initial release. (Closes: #XXXXXX) - -- Jon Ludlam Thu, 07 Jul 2011 00:41:03 +0100 + -- Thomas Goirand Thu, 21 Jul 2011 17:08:44 +0000 diff --git a/control b/control index 8dd33c5..7d1b541 100644 --- a/control +++ b/control @@ -1,20 +1,35 @@ Source: blktap -Section: unknown +Section: libs Priority: extra -Maintainer: Jon Ludlam -Build-Depends: debhelper (>= 8.0.0), uuid-dev, libaio-dev +Maintainer: Thomas Goirand +Build-Depends: debhelper (>= 8) Standards-Version: 3.9.2 -Homepage: -#Vcs-Git: git://git.debian.org/collab-maint/blktap.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/blktap.git;a=summary +Vcs-Browser: http://git.gplhost.com/gitweb/?p=sbox.git +Vcs-Git: http://git.gplhost.com/sbox.git +Homepage: http://www.gplhost.com/software-sbox.html -Package: blktap -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: - +Package: libvhd1.0 +Architecture: i386 +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Xen API blktap shared library + libvhd1 -Package: blktap-doc -Architecture: all -Description: documentation for blktap - +Package: blktap-dev +Section: devel +Architecture: i386 +Depends: ${misc:Depends}, ${shlibs:Depends}, libvhd1.0 (= ${binary:Version}), libvhdio1.0 (= ${binary:Version}) +Description: Xen API blktap shared library (development files) + blktap-dev + +Package: blktap-utils +Section: utils +Architecture: i386 +Depends: ${misc:Depends}, ${shlibs:Depends}, libvhd1.0 (= ${binary:Version}), libvhdio1.0 (= ${binary:Version}) +Description: Xen API blktap shared library (binary utils) + blktap-utils + +Package: libvhdio1.0 +Architecture: i386 +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Xen API blktap shared library (shared library) + libvhdio1 diff --git a/copyright b/copyright index 74aa343..39802f6 100644 --- a/copyright +++ b/copyright @@ -1,36 +1 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: blktap -Source: - -Files: * -Copyright: - -License: - - - . - - -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines -Files: debian/* -Copyright: 2011 Jon Ludlam -License: GPL-2+ - 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; either version 2 of the License, or - (at your option) any later version. - . - 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 program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. +stub diff --git a/docs b/docs deleted file mode 100644 index e845566..0000000 --- a/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/rules b/rules index c259a57..6b07f3c 100755 --- a/rules +++ b/rules @@ -1,21 +1,59 @@ #!/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. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - - -%: - dh $@ + +build: build-arch build-indep +build-arch: build +build-indep: build +build-stamp: + $(MAKE) USE_SYSTEM_LIBRARIES=y DESTDIR=$(CURDIR)/debian/libvhd1.0 + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + $(MAKE) clean + dh_clean + rm -rf debian/libvhd1.0etc debian/libvhd1.0usr debian/libvhd1.0lib + +install: build + dh_testdir + dh_testroot + dh_prep + $(MAKE) install USE_SYSTEM_LIBRARIES=y DESTDIR=$(CURDIR)/debian/libvhd1.0 + + # Move stuff in libvhdio + mkdir -p $(CURDIR)/debian/libvhdio1.0/usr/lib + mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.so.1.0 $(CURDIR)/debian/libvhdio1.0/usr/lib + mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.so.1.0.0 $(CURDIR)/debian/libvhdio1.0/usr/lib + + # Move stuff in the -dev packages + mkdir -p $(CURDIR)/debian/blktap-dev/usr/lib + mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhd.a $(CURDIR)/debian/blktap-dev/usr/lib + mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhd.so $(CURDIR)/debian/blktap-dev/usr/lib + mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.a $(CURDIR)/debian/blktap-dev/usr/lib + mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.so $(CURDIR)/debian/blktap-dev/usr/lib + mv $(CURDIR)/debian/libvhd1.0/usr/include $(CURDIR)/debian/blktap-dev/usr + + # Move things in the blktap-utils package + mkdir -p $(CURDIR)/debian/blktap-utils/usr + mv $(CURDIR)/debian/libvhd1.0/usr/sbin $(CURDIR)/debian/blktap-utils/usr + +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/source/format b/source/format index 163aaf8..d3827e7 100644 --- a/source/format +++ b/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 -- 2.39.5