[SCM] zita-alsa-pcmi/master: Several fixes to debian/{control,rules}

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d5260a9e2b5e0f5b723b2c2961c414125498adfa
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 31 01:14:23 2012 +0100

    Several fixes to debian/{control,rules}

diff --git a/debian/control b/debian/control
index 2972158..1b1ccea 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,10 @@ Package: libzita-alsa-pcmi-dev
 Section: libdevel
 Architecture: any
 Depends:
+ libfftw3-dev (>= 3.1.2-3.1),
  libzita-alsa-pcmi0 (= ${binary:Version}),
  ${misc:Depends},
- libfftw3-dev (>= 3.1.2-3.1)
+ ${shlibs:Depends}
 Multi-Arch: same
 Description: Development files (headers) for libzita-alsa-pcmi library
  Zita-alsa-pcmi is a C++ wrapper around the ALSA API
@@ -34,8 +35,9 @@ Description: Development files (headers) for libzita-alsa-pcmi library
 Package: libzita-alsa-pcmi0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ wrapper around the ALSA API
@@ -47,13 +49,13 @@ Description: C++ wrapper around the ALSA API
  .
  This package contains the shared library for libzita-alsa-pcmi.
 
-#Package: libzita-alsa-pcmi-utils
-#Architecture: any
-#Depends:
-# libzita-alsa-pcmi0 (= ${binary:Version}),
-# ${misc:Depends},
-# ${shlibs:Depends}
-#Description: Two simple demo programs zita-alsa-pcmi library 
-# Two simple demo programs are provided.
-# alsa_delay a ALSA version of jack_delay.
-# And alsa_loopback
+Package: libzita-alsa-pcmi-utils
+Architecture: any
+Depends:
+ libzita-alsa-pcmi0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Two simple demo programs zita-alsa-pcmi library
+ Two simple demo programs are provided.
+ alsa_delay a ALSA version of jack_delay.
+ And alsa_loopback
diff --git a/debian/rules b/debian/rules
index 5368031..0e547eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,17 @@ export LIBDIR=lib/$(DEB_HOST_MULTIARCH)
 export DESTDIR=$(CURDIR)/debian/tmp
 
 %:
-	dh $@ -Smakefile -Dlibs
+	dh $@ -Smakefile
+
+override_dh_auto_clean:
+	dh_auto_clean
+	$(MAKE) -C libs/ clean
+	$(MAKE) -C apps/ clean
+
+override_dh_auto_install:
+	dh_auto_install
+	$(MAKE) -C libs/ DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C apps/ DESTDIR=$(CURDIR)/debian/tmp install
 
-#override_dh_auto_clean:
-#	dh_auto_clean
-#	$(MAKE) -C apps/ clean
-#
-#override_dh_auto_install:
-#	dh_auto_install
-#	$(MAKE) -C apps/ DESTDIR=$(CURDIR)/debian/tmp
-#	$(MAKE) -C apps/ DESTDIR=$(CURDIR)/debian/tmp install
-#
 override_dh_installchangelogs:
 	dh_installchangelogs README

-- 
zita-alsa-pcmi packaging