r412 - devmapper/trunk/debian

[Bastian Blank]

Author: waldi
Date: Sat Apr  7 15:01:10 2007
New Revision: 412

Added:
   devmapper/trunk/debian/libdevmapper1.02.1-udeb.install
      - copied unchanged from r211, devmapper/trunk/debian/libdevmapper1.02-udeb.install
   devmapper/trunk/debian/libdevmapper1.02.1.init
      - copied, changed from r366, devmapper/trunk/debian/libdevmapper1.02.init
   devmapper/trunk/debian/libdevmapper1.02.1.install
      - copied unchanged from r211, devmapper/trunk/debian/libdevmapper1.02.install
Removed:
   devmapper/trunk/debian/libdevmapper1.02-udeb.install
   devmapper/trunk/debian/libdevmapper1.02.init
   devmapper/trunk/debian/libdevmapper1.02.install
Modified:
   devmapper/trunk/debian/control
   devmapper/trunk/debian/rules
Log:
* debian/control: Fix package names.
* debian/rules
  - Specify abiname only once.
  - Overwrite abiname.
* debian/libdevmapper1.02.1-udeb.install:
  Move from debian/libdevmapper1.02-udeb.install.
* debian/libdevmapper1.02.1.init: Move from debian/libdevmapper1.02.init.
* debian/libdevmapper1.02.1.install: Move from debian/libdevmapper1.02.install.


Modified: devmapper/trunk/debian/control
==============================================================================
--- devmapper/trunk/debian/control	(original)
+++ devmapper/trunk/debian/control	Sat Apr  7 15:01:10 2007
@@ -21,7 +21,7 @@
  device-mapper; it allow usage of the device-mapper through a clean,
  consistent interface (as opposed to through kernel ioctls).
 
-Package: libdevmapper1.02
+Package: libdevmapper1.02.1
 Section: libs
 Priority: required
 Architecture: any
@@ -38,12 +38,12 @@
  device-mapper; it allows usage of the device-mapper through a clean,
  consistent interface (as opposed to through kernel ioctls).
 
-Package: libdevmapper1.02-udeb
+Package: libdevmapper1.02.1-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}
-Provides: libdevmapper1.02
+Provides: libdevmapper1.02.1
 Description: The Linux Kernel Device Mapper userspace library
  This is a udeb, or a microdeb, for the debian-installer.
  .

Copied: devmapper/trunk/debian/libdevmapper1.02.1.init (from r366, devmapper/trunk/debian/libdevmapper1.02.init)
==============================================================================
--- devmapper/trunk/debian/libdevmapper1.02.init	(original)
+++ devmapper/trunk/debian/libdevmapper1.02.1.init	Sat Apr  7 15:01:10 2007
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=libdevmapper1.02
+NAME=libdevmapper1.02.1
 
 set -e
 

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Sat Apr  7 15:01:10 2007
@@ -10,10 +10,12 @@
 INSTALL_PROGRAM += -s
 endif
 
+LIBDEVMAPPER_ABINAME = 1.02.1
+
 BUILD_DIR = debian/build
 
-PACKAGES_DEB = libdevmapper-dev libdevmapper1.02 dmsetup
-PACKAGES_UDEB = libdevmapper1.02-udeb dmsetup-udeb
+PACKAGES_DEB := libdevmapper-dev libdevmapper$(LIBDEVMAPPER_ABINAME) dmsetup
+PACKAGES_UDEB := libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb dmsetup-udeb
 
 $(BUILD_DIR)/build-deb/config.status: DIR = $(BUILD_DIR)/build-deb
 $(BUILD_DIR)/build-deb/config.status:
@@ -60,7 +62,7 @@
 $(BUILD_DIR)/build-deb-stamp: $(BUILD_DIR)/build-deb/config.status
 	dh_testdir
 
-	$(MAKE) -C $(DIR)
+	$(MAKE) -C $(DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
 
 	touch $@
 
@@ -69,7 +71,7 @@
 $(BUILD_DIR)/build-udeb-stamp: $(BUILD_DIR)/build-udeb/config.status
 	dh_testdir
 
-	$(MAKE) -C $(DIR)
+	$(MAKE) -C $(DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
 
 	touch $@
 
@@ -81,31 +83,32 @@
 
 install: install-deb install-udeb
 
-install-deb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_DEB))
+install-deb: export DH_OPTIONS = $(addprefix -p,$(PACKAGES_DEB))
 install-deb: DIR = $(BUILD_DIR)/build-deb
 install-deb: INSTALL_DIR = $(BUILD_DIR)/install-deb
 install-deb: build-deb
 	dh_testdir
 	dh_testroot
-	dh_clean -k $(DH_OPTIONS)
+	dh_clean -k
 
 	rm -rf $(INSTALL_DIR)
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
 
-	dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR)
+	dh_install --sourcedir=$(INSTALL_DIR)
 
-install-udeb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_UDEB))
+install-udeb: export DH_OPTIONS = $(addprefix -p,$(PACKAGES_UDEB))
 install-udeb: DIR = $(BUILD_DIR)/build-udeb
 install-udeb: INSTALL_DIR = $(BUILD_DIR)/install-udeb
 install-udeb: build-udeb
 	dh_testdir
 	dh_testroot
-	dh_clean -k $(DH_OPTIONS)
+	dh_clean -k
+	echo $(DH_OPTIONS)
 
 	rm -rf $(INSTALL_DIR)
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
 
-	dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR)
+	dh_install --sourcedir=$(INSTALL_DIR)
 
 # Build architecture-independent files here.
 binary-indep:
@@ -121,7 +124,7 @@
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -V 'libdevmapper1.02 (>= 2:1.02.02-2)' --add-udeb 'libdevmapper1.02-udeb'
+	dh_makeshlibs -p 'libdevmapper$(LIBDEVMAPPER_ABINAME)' --add-udeb 'libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb'
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a