[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/1.2.7-1-10-ga4eec3f

[Iustin Pop]

The following commit has been merged in the master branch:
commit 512a9b8057abc4b41633a5fee37405f607eea116
Author: Iustin Pop <iusty at k1024.org>
Date:   Mon Jul 13 20:39:23 2009 +0200

    Move from cdbs to debhelper

diff --git a/debian/control b/debian/control
index 2141aa9..9441fc7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Debian Ganeti Team <pkg-ganeti-devel at lists.alioth.debian.org>
 Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iusty at k1024.org>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), patchutils
+Build-Depends: debhelper (>= 5), patchutils
 Build-Depends-Indep: docbook-utils, python-simplejson, python-pyparsing, python-openssl, python-support (>= 0.6)
 Standards-Version: 3.8.1
 Homepage: http://code.google.com/p/ganeti/
diff --git a/debian/docs b/debian/docs
index e845566..9eafbe1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
 README
+NEWS
diff --git a/debian/ganeti.examples b/debian/ganeti.examples
deleted file mode 100644
index f607f96..0000000
--- a/debian/ganeti.examples
+++ /dev/null
@@ -1 +0,0 @@
-doc/examples/batcher-instances.json
diff --git a/debian/ganeti.dirs b/debian/ganeti2.dirs
similarity index 100%
rename from debian/ganeti.dirs
rename to debian/ganeti2.dirs
diff --git a/debian/rules b/debian/rules
index 1bb84e0..2b26f59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,97 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-# Add here any variable or target overrides you need.
-DEB_CONFIGURE_EXTRA_FLAGS = \
-  --prefix=/usr \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --with-export-dir=/var/lib/ganeti/export \
-  --with-iallocator-search-path=/usr/local/lib/ganeti/iallocators,/usr/lib/ganeti/iallocators \
-  --with-os-search-path=/srv/ganeti/os,/usr/local/lib/ganeti/os,/usr/lib/ganeti/os,/usr/share/ganeti/os
-
-#DEB_DH_INSTALLINIT_ARGS = --no-start
-
-clean::
-	rm -f debian/ganeti.init
-	rm -f debian/ganeti.cron.d
-
-build/ganeti::
-	cp doc/examples/ganeti.cron debian/ganeti.cron.d
-	cp doc/examples/ganeti.initd debian/ganeti.init
-
-install/ganeti::
-	dh_pysupport -pganeti
-	install -m 0755 doc/examples/dumb-allocator debian/ganeti/usr/lib/ganeti/iallocators/dumb
-	rmdir debian/ganeti/var/run/ganeti
-	rmdir debian/ganeti/var/run
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess.
+#
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	./configure \
+	  --prefix=/usr \
+	  --localstatedir=/var \
+	  --sysconfdir=/etc \
+	  --with-export-dir=/var/lib/ganeti/export \
+	  --with-iallocator-search-path=/usr/local/lib/ganeti/iallocators,/usr/lib/ganeti/iallocators \
+	  --with-os-search-path=/srv/ganeti/os,/usr/local/lib/ganeti/os,/usr/lib/ganeti/os,/usr/share/ganeti/os \
+	  --docdir=/usr/share/doc/ganeti2
+
+	#$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	#$(MAKE) clean
+	#$(MAKE) distclean
+
+	rm -f debian/ganeti2.init
+	rm -f debian/ganeti2.ganeti.cron.d
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# Add here commands to install the package into debian/<packagename>.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/`dh_listpackages`
+	cp $(CURDIR)/doc/examples/ganeti.initd $(CURDIR)/debian/ganeti2.ganeti.init
+	cp $(CURDIR)/doc/examples/ganeti.cron $(CURDIR)/debian/ganeti2.ganeti.cron.d
+	mv $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti2
+	install -m 0755 $(CURDIR)/doc/examples/dumb-allocator \
+	  $(CURDIR)/debian/ganeti2/usr/lib/ganeti/iallocators/dumb
+	install -m 0644 $(CURDIR)/doc/examples/bash_completion \
+	  $(CURDIR)/debian/ganeti2/etc/bash_completion.d/ganeti
+	rmdir debian/ganeti2/var/run/ganeti
+	rmdir debian/ganeti2/var/run
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+#	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installcatalogs
+#	dh_installpam
+#	dh_installmime
+	dh_installinit --name=ganeti --error-handler=true -- defaults 20 80
+	dh_installcron --name=ganeti
+#	dh_installinfo
+#	dh_installwm
+#	dh_installudev
+#	dh_lintian
+#	dh_bugfiles
+#	dh_undocumented
+	dh_installman
+	dh_link
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_pysupport
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

-- 
Ganeti packaging