r78 - devmapper/trunk/debian

Bastian Blank pkg-lvm-maintainers@lists.alioth.debian.org
Mon, 14 Mar 2005 14:01:25 +0100 

Author: waldi
Date: Mon Mar 14 14:01:24 2005
New Revision: 78

Added:
   devmapper/trunk/debian/libdevmapper1.01.README.Debian
      - copied unchanged from r39, devmapper/trunk/debian/README.Debian
Removed:
   devmapper/trunk/debian/README.Debian
   devmapper/trunk/debian/devmapper-dev.dirs
   devmapper/trunk/debian/dmsetup-udeb.dirs
   devmapper/trunk/debian/dmsetup.dirs
   devmapper/trunk/debian/dmsetup.manpages
   devmapper/trunk/debian/libdevmapper-dev.dirs
   devmapper/trunk/debian/libdevmapper-dev.docs
   devmapper/trunk/debian/libdevmapper1.01.dirs
   devmapper/trunk/debian/libdevmapper1.01.docs
Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/debian/control
   devmapper/trunk/debian/devmapper-dev.install
   devmapper/trunk/debian/dmsetup-udeb.install
   devmapper/trunk/debian/dmsetup.docs
   devmapper/trunk/debian/dmsetup.install
   devmapper/trunk/debian/libdevmapper-dev.install
   devmapper/trunk/debian/libdevmapper1.01-udeb.install
   devmapper/trunk/debian/libdevmapper1.01.install
   devmapper/trunk/debian/rules
Log:
* debian/changelog: Update.
* debian/control
  - Remove cdbs and other unneeded build-dependencies, add newer debhelper.
  - Mark udebs correctly.
* debian/devmapper-dev.install, debian/dmsetup-udeb.install,
  debian/dmsetup.install, debian/libdevmapper-dev.install,
  debian/libdevmapper1.01-udeb.install, debian/libdevmapper1.01.install:
  Fix.
* debian/dmsetup.docs: Remove unneeded entries.
* debian/libdevmapper1.01.README.Debian: Move from debian/README.Debian.
* debian/rules: Convert to plain debhelper.
* debian/devmapper-dev.dirs, debian/dmsetup-udeb.dirs, debian/dmsetup.dirs
  debian/dmsetup.manpages, debian/libdevmapper-dev.dirs,
  debian/libdevmapper-dev.docs, debian/libdevmapper1.01.dirs,
  debian/libdevmapper1.01.docs: Remove, unneeded.


Modified: devmapper/trunk/debian/changelog
==============================================================================
--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Mon Mar 14 14:01:24 2005
@@ -1,3 +1,10 @@
+devmapper (2:1.01.00-3) UNRELEASED; urgency=low
+
+  * Don't longer use cdbs.
+  * Remove many cruft.
+
+ -- Bastian Blank <waldi@debian.org>  Mon, 14 Mar 2005 13:55:47 +0100
+
 devmapper (2:1.01.00-2) unstable; urgency=high
 
   * New maintainer.

Modified: devmapper/trunk/debian/control
==============================================================================
--- devmapper/trunk/debian/control	(original)
+++ devmapper/trunk/debian/control	Mon Mar 14 14:01:24 2005
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Andres Salomon <dilinger@debian.org>
-Build-Depends: cdbs (>= 0.4.20), debhelper (>> 4.1.0), dh-kpatches (>= 0.99.28), linux-kernel-headers, autotools-dev, autoconf (>> 2.50)
+Build-Depends: debhelper (>= 4.2), dh-kpatches (>= 0.99.28), autotools-dev
 Standards-Version: 3.6.1
 
 Package: libdevmapper-dev
 Section: libdevel
 Architecture: any
-Depends: libdevmapper1.01 (= ${Source-Version}), libc6-dev
+Depends: libdevmapper1.01 (= ${Source-Version})
 Description: The Linux Kernel Device Mapper header files
  The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
  Team's implementation of a minimalistic kernel-space driver that handles
@@ -26,7 +26,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Provides: libdevmapper
-Replaces: libdevmapper1.00
 Description: The Linux Kernel Device Mapper userspace library
  The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
  Team's implementation of a minimalistic kernel-space driver that handles
@@ -39,6 +38,7 @@
  consistent interface (as opposed to through kernel ioctls).
 
 Package: libdevmapper1.01-udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -66,6 +66,7 @@
  This package contains a utility for modifying device mappings.
 
 Package: dmsetup-udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}

Modified: devmapper/trunk/debian/devmapper-dev.install
==============================================================================
--- devmapper/trunk/debian/devmapper-dev.install	(original)
+++ devmapper/trunk/debian/devmapper-dev.install	Mon Mar 14 14:01:24 2005
@@ -1,2 +1,2 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
+usr/include
+usr/lib/lib*.a

Modified: devmapper/trunk/debian/dmsetup-udeb.install
==============================================================================
--- devmapper/trunk/debian/dmsetup-udeb.install	(original)
+++ devmapper/trunk/debian/dmsetup-udeb.install	Mon Mar 14 14:01:24 2005
@@ -1 +1 @@
-debian/tmp/sbin/dmsetup
+sbin/dmsetup

Modified: devmapper/trunk/debian/dmsetup.docs
==============================================================================
--- devmapper/trunk/debian/dmsetup.docs	(original)
+++ devmapper/trunk/debian/dmsetup.docs	Mon Mar 14 14:01:24 2005
@@ -1,2 +1 @@
 INTRO
-debian/README.Debian

Modified: devmapper/trunk/debian/dmsetup.install
==============================================================================
--- devmapper/trunk/debian/dmsetup.install	(original)
+++ devmapper/trunk/debian/dmsetup.install	Mon Mar 14 14:01:24 2005
@@ -1 +1,2 @@
-debian/tmp/sbin/dmsetup
+sbin/dmsetup
+usr/share/man/man8/dmsetup.8

Modified: devmapper/trunk/debian/libdevmapper-dev.install
==============================================================================
--- devmapper/trunk/debian/libdevmapper-dev.install	(original)
+++ devmapper/trunk/debian/libdevmapper-dev.install	Mon Mar 14 14:01:24 2005
@@ -1 +1 @@
-debian/tmp/usr/include/libdevmapper.h
+usr/include/libdevmapper.h

Modified: devmapper/trunk/debian/libdevmapper1.01-udeb.install
==============================================================================
--- devmapper/trunk/debian/libdevmapper1.01-udeb.install	(original)
+++ devmapper/trunk/debian/libdevmapper1.01-udeb.install	Mon Mar 14 14:01:24 2005
@@ -1 +1 @@
-debian/tmp/lib/libdevmapper.so.*
+lib/libdevmapper.so.*

Modified: devmapper/trunk/debian/libdevmapper1.01.install
==============================================================================
--- devmapper/trunk/debian/libdevmapper1.01.install	(original)
+++ devmapper/trunk/debian/libdevmapper1.01.install	Mon Mar 14 14:01:24 2005
@@ -1 +1 @@
-debian/tmp/lib/libdevmapper.so.*
+lib/libdevmapper.so.*

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Mon Mar 14 14:01:24 2005
@@ -1,14 +1,87 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
-		--libdir=/lib --sbindir=/sbin           \
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+config.status:
+	dh_testdir
+
+	cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess autoconf
+	./configure \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--libdir=/lib --sbindir=/sbin \
 		--enable-compat                         
-DEB_AC_AUX_DIR := $(DEB_SRCDIR)/autoconf
-DEB_UPDATE_RCD_PARAMS_libdevmapper1.01 := "start 25 S ."
-DEB_INSTALL_CHANGELOGS_ALL := WHATS_NEW
-DEB_AUTO_UPDATE_AUTOCONF := "2.50"
-DEB_INSTALL_DOCS_ALL =
 
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
+
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f *-stamp
+
+	-$(MAKE) distclean
+	-rm autoconf/config.guess autoconf/config.sub
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+	dh_install --sourcedir=debian/tmp
+
+# Build architecture-independent files here.
+binary-indep:
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+#	dh_installdebconf -a
+	dh_installdocs -a
+#	dh_installexamples -a
+#	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installemacsen -a
+#	dh_installpam -a
+#	dh_installmime -a
+	dh_installinit -a -- start 25 S .
+#	dh_installcron -a
+#	dh_installman -a
+#	dh_installinfo -a
+#	dh_undocumented -a
+	dh_installchangelogs WHATS_NEW -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+#	dh_perl -a
+	dh_python -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure