r463 - in multipath-tools/trunk/debian: . patches

[Guido Guenther]

Author: agx
Date: Sat Jun  9 15:59:29 2007
New Revision: 463

Log:
split out kpartx


Added:
   multipath-tools/trunk/debian/kpartx.install
   multipath-tools/trunk/debian/kpartx.manpages
   multipath-tools/trunk/debian/kpartx.postinst
Removed:
   multipath-tools/trunk/debian/multipath-tools.manpages
   multipath-tools/trunk/debian/patches/git-40b575955cc189aa993e6a030b66b5fef6bcf288.diff
   multipath-tools/trunk/debian/patches/udev.diff
Modified:
   multipath-tools/trunk/debian/changelog
   multipath-tools/trunk/debian/control
   multipath-tools/trunk/debian/multipath-tools.install
   multipath-tools/trunk/debian/rules

Modified: multipath-tools/trunk/debian/changelog
==============================================================================
--- multipath-tools/trunk/debian/changelog	(original)
+++ multipath-tools/trunk/debian/changelog	Sat Jun  9 15:59:29 2007
@@ -1,11 +1,15 @@
-multipath-tools (0.4.7-3) UNRELEASED; urgency=low
+multipath-tools (0.4.7-3) unstable; urgency=low
 
+  * forward to upstream git as of 178b93111d54828a89ad280c0aaaea0812343a6a
+    (Closes: #427532, #365363)
+  * adjust scsi_id.patch to apply again
+  * drop udev.patch, not needed
   * make sure multipath-tools-init runs after udev so the /dev/mapper/
     entries appear in the correct place
-  * debhelper version 5
-  * mention kpartx in the package description (Closes: #422600)
+  * debhelper version 5 (Closes: #425910)
+  * split out kpartx into a separate package (Closes: #422600)
 
- -- Guido Guenther <agx at sigxcpu.org>  Sat, 26 May 2007 17:52:27 +0200
+ -- Guido Guenther <agx at sigxcpu.org>  Fri, 08 Jun 2007 11:51:00 +0200
 
 multipath-tools (0.4.7-2) unstable; urgency=low
 

Modified: multipath-tools/trunk/debian/control
==============================================================================
--- multipath-tools/trunk/debian/control	(original)
+++ multipath-tools/trunk/debian/control	Sat Jun  9 15:59:29 2007
@@ -8,10 +8,17 @@
 
 Package: multipath-tools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 0.086), initscripts (>= 2.85-16), dmsetup
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 0.086), initscripts (>= 2.85-16), dmsetup,
+ kpartx (>= ${binary:Version})
 Description: Command-line utilities for administering multipath disk access
  These tools are in charge of maintaining the disk multipath device maps and
  react to path and map events.
- .
- The package also contains kpartx which can be used to set up device mappings
- for the partitions on any partitioned device.
+
+Package: kpartx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 0.086), dmsetup
+Replaces: multipath-tools (<< 0.4.7-3)
+Description: create device mappings for partitions
+ Kpartx can be used to set up device mappings for the partitions of any
+ partitioned block device. It is part of the Linux multipath-tools.
+

Added: multipath-tools/trunk/debian/kpartx.install
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/kpartx.install	Sat Jun  9 15:59:29 2007
@@ -0,0 +1,3 @@
+/usr/share/man/man8/kpartx.8.gz
+/etc/udev/kpartx.rules
+/sbin/kpartx

Added: multipath-tools/trunk/debian/kpartx.manpages
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/kpartx.manpages	Sat Jun  9 15:59:29 2007
@@ -0,0 +1 @@
+kpartx/kpartx.8

Added: multipath-tools/trunk/debian/kpartx.postinst
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/kpartx.postinst	Sat Jun  9 15:59:29 2007
@@ -0,0 +1,26 @@
+#! /bin/sh
+# postinst script for kpartx
+
+set -e
+
+case "$1" in
+    configure)
+	if [ -z "$2" ]; then
+	    ln -s ../kpartx.rules /etc/udev/rules.d
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+

Modified: multipath-tools/trunk/debian/multipath-tools.install
==============================================================================
--- multipath-tools/trunk/debian/multipath-tools.install	(original)
+++ multipath-tools/trunk/debian/multipath-tools.install	Sat Jun  9 15:59:29 2007
@@ -1,2 +1,7 @@
-etc
-sbin
+/etc/udev/multipath.rules
+/sbin/multi*
+/sbin/mpath_*
+/sbin/devmap_name
+/usr/share/man/man*/multi*gz
+/usr/share/man/man*/mpath*gz
+/usr/share/man/man*/devmap*gz

Modified: multipath-tools/trunk/debian/rules
==============================================================================
--- multipath-tools/trunk/debian/rules	(original)
+++ multipath-tools/trunk/debian/rules	Sat Jun  9 15:59:29 2007
@@ -13,14 +13,17 @@
 
 	touch $@
 
-clean: unpatch
+clean-tree:
+	-$(MAKE) clean
+
+clean: clean-tree unpatch
 	dh_testdir
 	rm -f build-stamp
 
-	-$(MAKE) clean
+	#-$(MAKE) clean
 	# work around Makefile not cleaning up everything:
-	rm -rf path_priority/pp_hds_modular/
-
+	#rm -rf path_priority/pp_hds_modular/
+	#rm -rf path_priority/pp_hp_sw/
 	dh_clean
 
 install:
@@ -30,7 +33,8 @@
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=$(CURDIR)/debian/tmp
+	dh_install -pmultipath-tools --sourcedir=$(CURDIR)/debian/tmp
+	dh_install -pkpartx --sourcedir=$(CURDIR)/debian/tmp
 
 # Build architecture-independent files here.
 binary-indep: build install