[Pkg-voip-commits] r5955 - in /asterisk/trunk/debian: changelog rules

[msp at alioth.debian.org]

Author: msp
Date: Wed Jul 16 10:35:23 2008
New Revision: 5955

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5955
Log:
Call dh_lintian lintian-cleanup: package-contains-empty-directory

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5955&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed Jul 16 10:35:23 2008
@@ -9,7 +9,7 @@
   [ Mark Purcell ]
   * Conflicts:/ Replaces: asterisk (<< 1:1.4.21.1~dfsg-1)
   * lintian cleanup: debian-copyright-line-too-long
-  * lintian-cleanup: package-contains-empty-directory
+  * Call dh_lintian lintian-cleanup: package-contains-empty-directory
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 30 Jun 2008 20:46:07 +0300
 

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=5955&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Wed Jul 16 10:35:23 2008
@@ -151,6 +151,7 @@
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) DESTDIR=$(CURDIR)/debian/tmp install
 
 	dh_install -s --sourcedir=debian/tmp
+	dh_lintian -s
 
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/streamplayer
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/stereorize
@@ -165,9 +166,7 @@
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) DESTDIR=$(CURDIR)/debian/tmp install samples
 
 	dh_install -i --sourcedir=debian/tmp
-
-	install -m 0644 -D $(CURDIR)/debian/asterisk-config.lintian-overrides \
-		$(CURDIR)/debian/asterisk-config/usr/share/lintian/overrides/asterisk-config
+	dh_lintian -i
 
 	# create a simple config
 	echo "; please read doc/manager.txt" > $(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d/README.conf