[Pkg-vsquare-changes] r247 - vde2/trunk/debian

[Filippo Giunchedi]

Author: filippo
Date: 2010-07-03 16:44:12 +0000 (Sat, 03 Jul 2010)
New Revision: 247

Modified:
   vde2/trunk/debian/rules
Log:
reformat/improve debian/rules

Modified: vde2/trunk/debian/rules
===================================================================
--- vde2/trunk/debian/rules	2010-07-03 16:41:40 UTC (rev 246)
+++ vde2/trunk/debian/rules	2010-07-03 16:44:12 UTC (rev 247)
@@ -24,15 +24,6 @@
 	CFLAGS += -O2
 endif
 
-# shared library versions, option 1
-version=2.1
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
 # Apply patches to the package
 patch: patch-stamp
 patch-stamp:
@@ -63,11 +54,18 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libexecdir=\$${prefix}/lib/vde2 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-experimental CFLAGS="$(CFLAGS)" 
-	#LDFLAGS="-Wl,-z,defs"
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--libexecdir=\$${prefix}/lib/vde2 \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--localstatedir=/var \
+		--sysconfdir=/etc \
+		--enable-experimental \
+		CFLAGS="$(CFLAGS)"
 
 
-build: patch build-stamp 
+build: patch build-stamp
 build-stamp:  config.status
 	dh_testdir
 
@@ -79,7 +77,7 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean || true
@@ -92,20 +90,17 @@
 endif
 
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	# Temporary fix for broken INSTALLPATH in vde2 2.2.3:
-	mv $(CURDIR)/debian/tmp/usr/etc $(CURDIR)/debian/tmp/
 
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -114,7 +109,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp
@@ -124,8 +119,7 @@
 	rm $(CURDIR)/debian/vde2/usr/lib/vde2/libvdetap.la
 	rm -f $(CURDIR)/debian/vde2/usr/bin/kvde_switch
 	dh_installman
-	# fix for lintian warning, will be fixed in next upstream version
-	sed -i 's/^\.\.\./\\\&.../' $(CURDIR)/debian/vde2/usr/share/man/man1/dpipe.1 
+	dh_lintian
 	dh_link
 	dh_strip
 	dh_compress
@@ -134,10 +128,10 @@
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps -L libvdeplug2 -l debian/libvdeplug2/usr/bin
+	dh_shlibdeps -L libvdeplug3 -l debian/libvdeplug3/usr/bin
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb -- -D
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install