]> xenbits.xensource.com Git - people/dstodden/blktap-debian.git/commitdiff
Make a new package, libblktapctl1.0, include the /etc/udev files in the blktap-utils...
authorJon Ludlam <jonathan.ludlam@eu.citrix.com>
Sat, 23 Jul 2011 23:25:25 +0000 (00:25 +0100)
committerJon Ludlam <jonathan.ludlam@eu.citrix.com>
Sat, 23 Jul 2011 23:25:25 +0000 (00:25 +0100)
control
rules

diff --git a/control b/control
index 7d1b5419c3a3eac457759c25e89b912f694c3be8..3d704c7fb61043158ce565e671c00f9defa3493c 100644 (file)
--- a/control
+++ b/control
@@ -2,7 +2,7 @@ Source: blktap
 Section: libs
 Priority: extra
 Maintainer: Thomas Goirand <zigo@debian.org>
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 8), uuid-dev, libaio-dev
 Standards-Version: 3.9.2
 Vcs-Browser: http://git.gplhost.com/gitweb/?p=sbox.git
 Vcs-Git: http://git.gplhost.com/sbox.git
@@ -33,3 +33,9 @@ Architecture: i386
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Xen API blktap shared library (shared library)
  libvhdio1
+
+Package: libblktapctl1.0
+Architecture: i386
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Xen API blktap shared library (shared library)
+ libblktapctl1
diff --git a/rules b/rules
index 6b07f3c7722f4e96dec246f95dd9df63b99d752e..7bc55d9a97586f173e4143964db101aa7118a8a3 100755 (executable)
--- a/rules
+++ b/rules
@@ -13,13 +13,12 @@ clean:
        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
+       $(MAKE) install USE_SYSTEM_LIBRARIES=y DESTDIR=$(CURDIR)/debian/libvhd1.0/
 
        # Move stuff in libvhdio
        mkdir -p $(CURDIR)/debian/libvhdio1.0/usr/lib
@@ -28,6 +27,7 @@ install: build
 
        # Move stuff in the -dev packages
        mkdir -p $(CURDIR)/debian/blktap-dev/usr/lib
+       mv $(CURDIR)/debian/libvhd1.0/lib/libblktapctl.a $(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
@@ -37,6 +37,12 @@ install: build
        # 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
+       mv $(CURDIR)/debian/libvhd1.0/etc $(CURDIR)/debian/blktap-utils
+
+       # Move things in the libblktapctl1.0 package
+       mkdir -p $(CURDIR)/debian/libblktapctl1.0/usr
+       mv $(CURDIR)/debian/libvhd1.0/lib $(CURDIR)/debian/libblktapctl1.0/usr
+
 
 binary-indep: build install
 binary-arch: build install