Use Thomas Goirand's packaging files rather than mine

diff --git a/README.Debian b/README.Debian
deleted file mode 100644 (file)
index ef5f7c0..0000000
--- a/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-blktap for Debian
------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Jon Ludlam <jonathan.ludlam@eu.citrix.com>  Thu, 07 Jul 2011 00:41:03 +0100

diff --git a/README.source b/README.source
deleted file mode 100644 (file)
index e477c50..0000000
--- a/README.source
+++ /dev/null
@@ -1,9 +0,0 @@
-blktap for Debian
------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-

diff --git a/blktap-doc.docs b/blktap-doc.docs
deleted file mode 100644 (file)
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 (file)
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 (file)
index 03369f0..0000000
--- a/blktap.install
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc
-/usr
-/lib

diff --git a/changelog b/changelog
index 171d5aaa0785b0cdae7af435403a922b5a7092c4..512c122dbb0851ad6d8bbf4f11b6260df406a431 100644 (file)
--- 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)  <nnnn is the bug number of your ITP>
+  * Initial release. (Closes: #XXXXXX)
 
- -- Jon Ludlam <jonathan.ludlam@eu.citrix.com>  Thu, 07 Jul 2011 00:41:03 +0100
+ -- Thomas Goirand <zigo@debian.org>  Thu, 21 Jul 2011 17:08:44 +0000

diff --git a/control b/control
index 8dd33c56a19ab1bfa64242ff2e61a5414e64399e..7d1b5419c3a3eac457759c25e89b912f694c3be8 100644 (file)
--- a/control
+++ b/control
@@ -1,20 +1,35 @@
 Source: blktap
-Section: unknown
+Section: libs
 Priority: extra
-Maintainer: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
-Build-Depends: debhelper (>= 8.0.0), uuid-dev, libaio-dev
+Maintainer: Thomas Goirand <zigo@debian.org>
+Build-Depends: debhelper (>= 8)
 Standards-Version: 3.9.2
-Homepage: <insert the upstream URL, if relevant>
-#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: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+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
- <insert long description, indented with spaces>
+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 74aa3433951d401852209c9ee01b67287a6af2c4..39802f6428047a6881d60cc21775c8daf1708107 100644 (file)
--- a/copyright
+++ b/copyright
@@ -1,36 +1 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: blktap
-Source: <url://example.com>
-
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
-
-# 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 <jonathan.ludlam@eu.citrix.com>
-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 <http://www.gnu.org/licenses/>
- .
- 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 (file)
index e845566..0000000
--- a/docs
+++ /dev/null
@@ -1 +0,0 @@
-README

diff --git a/rules b/rules
index c259a57df09baa95b2594b50908339318fd4a6bd..6b07f3c7722f4e96dec246f95dd9df63b99d752e 100755 (executable)
--- 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 163aaf8d82b6c54f23c45f32895dbdfdcc27b047..d3827e75a5cadb9fe4a27e1cb9b6d192e7323120 100644 (file)
--- a/source/format
+++ b/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0