r84 - lvm2/trunk/debian

Bastian Blank pkg-lvm-maintainers@lists.alioth.debian.org
Fri, 01 Apr 2005 10:19:07 +0000 

Author: waldi
Date: Fri Apr  1 10:19:06 2005
New Revision: 84

Removed:
   lvm2/trunk/debian/clvm.postinst
   lvm2/trunk/debian/clvm.postrm
   lvm2/trunk/debian/lvm2-udeb.dirs
   lvm2/trunk/debian/lvm2.dirs
   lvm2/trunk/debian/lvm2.manpages
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/clvm.install
   lvm2/trunk/debian/control
   lvm2/trunk/debian/lvm2-udeb.install
   lvm2/trunk/debian/lvm2.install
   lvm2/trunk/debian/rules
Log:
Convert to debhelper.

* debian/changelog: Update.
* debian/control
  - Remove cdbs from build-dependencies, add newer debhelper.
  - Mark udebs correctly.
* debian/rules: Convert to plain debhelper.
* debian/clvm.install, debian/lvm2-udeb.install, debian/lvm2.install: Fix.
* debian/clvm.postinst, debian/clvm.postrm, debian/lvm2-udeb.dirs,
  debian/lvm2.dirs, debian/lvm2.manpages: Remove, unneeded.


Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Fri Apr  1 10:19:06 2005
@@ -1,3 +1,10 @@
+lvm2 (2.01.04-3unreleased.1) UNRELEASED; urgency=low
+
+  * Don't longer use cdbs.
+  * Remove cruft.
+
+ -- Bastian Blank <waldi@debian.org>  Fri, 01 Apr 2005 12:09:29 +0200
+
 lvm2 (2.01.04-3) unstable; urgency=high
 
   * Workaround missing O_NOATIME. (closes: #297010)

Modified: lvm2/trunk/debian/clvm.install
==============================================================================
--- lvm2/trunk/debian/clvm.install	(original)
+++ lvm2/trunk/debian/clvm.install	Fri Apr  1 10:19:06 2005
@@ -1,3 +1,3 @@
-debian/tmp/lib/liblvm2* lib/lvm2
-debian/tmp/lib/lvm-200/clvmd sbin
-debian/tmp/usr/share/man/man8/clvmd*
+lib/liblvm2* lib/lvm2
+sbin/clvmd
+usr/share/man/man8/clvmd*

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	(original)
+++ lvm2/trunk/debian/control	Fri Apr  1 10:19:06 2005
@@ -3,7 +3,7 @@
 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.16), libdevmapper-dev (>= 2:1.00.07-1), libreadline4-dev, autotools-dev, libdlm-dev (>= 0.trunk20050206-2)
+Build-Depends: debhelper (>> 4.2), libdevmapper-dev (>= 2:1.00.07-1), autotools-dev, libdlm-dev (>= 0.trunk20050206-2)
 Standards-Version: 3.6.1
 
 Package: lvm2
@@ -23,6 +23,7 @@
  kernel 2.4 or later
 
 Package: lvm2-udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}

Modified: lvm2/trunk/debian/lvm2-udeb.install
==============================================================================
--- lvm2/trunk/debian/lvm2-udeb.install	(original)
+++ lvm2/trunk/debian/lvm2-udeb.install	Fri Apr  1 10:19:06 2005
@@ -1,4 +1,4 @@
-debian/lvm2/etc/lvm/lvm.conf etc/lvm
-debian/lvm2/lib/lvm-200/lv* sbin
-debian/lvm2/lib/lvm-200/pv* sbin
-debian/lvm2/lib/lvm-200/vg* sbin
+etc/lvm/lvm.conf
+sbin/lv*
+sbin/pv*
+sbin/vg*

Modified: lvm2/trunk/debian/lvm2.install
==============================================================================
--- lvm2/trunk/debian/lvm2.install	(original)
+++ lvm2/trunk/debian/lvm2.install	Fri Apr  1 10:19:06 2005
@@ -1,8 +1,6 @@
-debian/tmp/etc/* etc
-debian/tmp/lib/lvm-200/lv* lib/lvm-200
-debian/tmp/lib/lvm-200/pv* lib/lvm-200
-debian/tmp/lib/lvm-200/vg* lib/lvm-200
-debian/tmp/usr/share/man/man8/lv* usr/share/man/man8
-debian/tmp/usr/share/man/man8/pv* usr/share/man/man8
-debian/tmp/usr/share/man/man8/vg* usr/share/man/man8
-debian/tmp/usr/share/man/man5/* usr/share/man/man5
+etc/lvm/lvm.conf
+sbin/lv* sbin/pv* sbin/vg* lib/lvm-200/
+usr/share/man/man8/lv*
+usr/share/man/man8/pv*
+usr/share/man/man8/vg*
+usr/share/man/man5

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Fri Apr  1 10:19:06 2005
@@ -1,31 +1,98 @@
 #!/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
 
-ifeq ($(DEB_ARCH),mips)
-	DEB_CONFIGURE_EXTRA_FLAGS := --disable-o_direct
-endif
-ifeq ($(DEB_ARCH),mipsel)
-	DEB_CONFIGURE_EXTRA_FLAGS := --disable-o_direct
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -g
 endif
-ifeq ($(DEB_ARCH),hppa)
-	DEB_CONFIGURE_EXTRA_FLAGS := --disable-o_direct
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
 endif
-ifeq ($(DEB_ARCH),arm)
-        DEB_CONFIGURE_EXTRA_FLAGS := --disable-o_direct
+
+CONFIGURE_FLAGS = \
+	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr \
+	--exec-prefix= \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info \
+	--with-confdir=\$${exec_prefix}/etc \
+	--with-clvmd=cman --with-cluster=shared
+
+ifneq (,$(findstring $(DEB_HOST_ARCH), arm hpp mips mipsel))
+CONFIGURE_FLAGS += --disable-o_direct
 endif
 
-CFLAGS += -I$(CURDIR)/debian/include/$(DEB_ARCH)
+CFLAGS += -I$(CURDIR)/debian/include/$(DEB_HOST_ARCH)
+
+config.status:
+	dh_testdir
 
-DEB_CONFIGURE_PREFIX = /
-DEB_CONFIGURE_MANDIR = "\$${prefix}/usr/share/man"
-DEB_CONFIGURE_INFODIR = "\$${prefix}/usr/share/info"
-DEB_CONFIGURE_EXTRA_FLAGS += --with-confdir=/etc/lvm
-DEB_CONFIGURE_EXTRA_FLAGS += --with-clvmd=cman --with-cluster=shared
-DEB_AC_AUX_DIR := $(DEB_SRCDIR)/autoconf
-DEB_INSTALL_CHANGELOGS_ALL = WHATS_NEW
-DEB_INSTALL_DOCS_ALL =
+	cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess autoconf
+	./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS)
 
-DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sbindir=$(DEB_DESTDIR)/lib/lvm-200 confdir=$(DEB_DESTDIR)/etc/lvm
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
+
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	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
+#	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_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