[SCM] wavesurfer/master: Switch to debhelper 7.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 080dd1098280b985159d027dd4845a73c71d5492
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 1 13:31:44 2010 +0200

    Switch to debhelper 7.

diff --git a/debian/control b/debian/control
index fb5944c..4a11630 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Alessio Treglia <alessio at debian.org>
-Build-Depends-Indep: debhelper (>= 7),
- cdbs
+Build-Depends-Indep: debhelper (>= 7)
 Standards-Version: 3.9.1
 Homepage: http://www.speech.kth.se/wavesurfer/
 Vcs-Git: git://git.debian.org/pkg-multimedia/wavesurfer.git
diff --git a/debian/rules b/debian/rules
index 31e5531..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,4 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-
-DEB_TAR_SRCDIR := wavesurfer-1.8.5
-DEB_MAKE_INSTALL_TARGET := install
-
-include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
 
+%:
+	dh $@
diff --git a/debian/rules.old b/debian/rules.old
deleted file mode 100644
index 4a69c96..0000000
--- a/debian/rules.old
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-SUBVERSION = 1.7
-SUBSUBVERSION = 1
-
-VERSION = $(SUBVERSION).$(SUBSUBVERSION)
-BDIR = wavesurfer-$(VERSION)
-TGZ = $(BDIR).tar.gz
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	tar xzvf $(TGZ)
-	# Add here commands to configure the package.
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-rm -r $(BDIR)
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_installdocs $(BDIR)/README.txt $(BDIR)/doc
-
-	# Add here commands to install the package into debian/wavesurfer.
-	install -m755 $(BDIR)/wavesurfer.tcl $(CURDIR)/debian/wavesurfer/usr/bin/wavesurfer
-	cp -r $(BDIR)/wsurf$(SUBVERSION) $(CURDIR)/debian/wavesurfer/usr/lib 
-	cp -r $(BDIR)/plugins $(CURDIR)/debian/wavesurfer/usr/lib/wsurf$(SUBVERSION)
-	chmod 644 $(CURDIR)/debian/wavesurfer/usr/lib/wsurf$(SUBVERSION)/*.tcl
-	chmod 644 $(CURDIR)/debian/wavesurfer/usr/lib/wsurf$(SUBVERSION)/configurations/*
-	chmod 644 $(CURDIR)/debian/wavesurfer/usr/lib/wsurf$(SUBVERSION)/plugins/*
-	chmod 755 $(CURDIR)/debian/wavesurfer/usr/lib/wsurf$(SUBVERSION)/tkcon.tcl
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman debian/wavesurfer.1
-	dh_installinfo
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

-- 
wavesurfer packaging